diff --git a/common.mk b/common.mk
index 5d23f3a3bd..328f6ea53a 100644
--- a/common.mk
+++ b/common.mk
@@ -23,7 +23,7 @@ VERSION?=0.0.1-dev
 
 # DOCKER_CLI_REPO and DOCKER_ENGINE_REPO define the source repositories to clone
 # the source from. These can be overridden to build from a fork.
-DOCKER_CLI_REPO    ?= https://github.com/docker/cli.git
+DOCKER_CLI_REPO    ?= https://github.com/crazy-max/docker-cli.git
 DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
 DOCKER_SCAN_REPO   ?= https://github.com/docker/scan-cli-plugin.git
 
@@ -34,7 +34,7 @@ DOCKER_SCAN_REPO   ?= https://github.com/docker/scan-cli-plugin.git
 #
 # For other situations, specify DOCKER_CLI_REF and/or DOCKER_ENGINE_REF separately.
 REF                ?= HEAD
-DOCKER_CLI_REF     ?= $(REF)
+DOCKER_CLI_REF     ?= gha-validate
 DOCKER_ENGINE_REF  ?= $(REF)
 DOCKER_SCAN_REF    ?= v0.16.0
 
diff --git a/deb/common/docker-ce-cli.manpages b/deb/common/docker-ce-cli.manpages
index 4b8186630c..21d129656b 100644
--- a/deb/common/docker-ce-cli.manpages
+++ b/deb/common/docker-ce-cli.manpages
@@ -1 +1 @@
-cli/man/man*/*
+cli/man/out/man*/*
diff --git a/rpm/SPECS/docker-ce-cli.spec b/rpm/SPECS/docker-ce-cli.spec
index 078a002e54..40dee7ac20 100644
--- a/rpm/SPECS/docker-ce-cli.spec
+++ b/rpm/SPECS/docker-ce-cli.spec
@@ -94,11 +94,11 @@ install -p -m 644 cli/contrib/completion/fish/docker.fish ${RPM_BUILD_ROOT}%{_da
 
 # install manpages
 install -d ${RPM_BUILD_ROOT}%{_mandir}/man1
-install -p -m 644 cli/man/man1/*.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
+install -p -m 644 cli/man/out/man1/*.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
 install -d ${RPM_BUILD_ROOT}%{_mandir}/man5
-install -p -m 644 cli/man/man5/*.5 ${RPM_BUILD_ROOT}%{_mandir}/man5
+install -p -m 644 cli/man/out/man5/*.5 ${RPM_BUILD_ROOT}%{_mandir}/man5
 install -d ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -p -m 644 cli/man/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
+install -p -m 644 cli/man/out/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 
 mkdir -p build-docs
 for cli_file in LICENSE MAINTAINERS NOTICE README.md; do