diff --git a/deb/common/docker-ce-cli.bash-completion b/deb/common/docker-ce-cli.bash-completion
deleted file mode 100644
index 009937f56f..0000000000
--- a/deb/common/docker-ce-cli.bash-completion
+++ /dev/null
@@ -1 +0,0 @@
-cli/contrib/completion/bash/docker
diff --git a/deb/common/rules b/deb/common/rules
index fd7313ffea..60c3e47f98 100755
--- a/deb/common/rules
+++ b/deb/common/rules
@@ -26,7 +26,8 @@ override_dh_auto_build:
 	cd engine && TMP_GOPATH="/go" hack/dockerfile/install/install.sh tini
 	cd engine && TMP_GOPATH="/go" hack/dockerfile/install/install.sh rootlesskit dynamic
 	# Build the CLI
-	cd /go/src/github.com/docker/cli && VERSION=$(VERSION) GITCOMMIT=$(CLI_GITCOMMIT) LDFLAGS='' GO_LINKMODE=dynamic ./scripts/build/binary && DISABLE_WARN_OUTSIDE_CONTAINER=1 LDFLAGS='' make manpages
+	cd /go/src/github.com/docker/cli \
+		&& make DISABLE_WARN_OUTSIDE_CONTAINER=1 VERSION=$(VERSION) GITCOMMIT=$(CLI_GITCOMMIT) LDFLAGS='' dynbinary manpages
 
 	# Build buildx plugin
 	cd /go/src/github.com/docker/buildx \
@@ -68,25 +69,56 @@ override_dh_dwz:
 
 override_dh_auto_install:
 	# docker-ce-cli install
-	install -D -m 0644 cli/contrib/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
-	install -D -m 0644 cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
-	install -D -m 0755 cli/build/docker debian/docker-ce-cli/usr/bin/docker
+	install -D -p -m 0755 cli/build/docker debian/docker-ce-cli/usr/bin/docker
+
+	# docker-ce-cli shell-completion
+	#
+	# We are manually installing bash completions instead of using the "dh_bash-completion"
+	# debhelper (see [1]); dh_bash-completion only supports bash, and none of the other shells,
+	# which meant that we had to install 2 out of 3 manually, which was confusing ("what about
+	# Bash?"). Given that locations to install these completion scripts are well-known, we
+	# can safely use the manual approach for installing  them.
+	#
+	# In future, can consider using "dh_shell_completions" (see [2]), which supports bash, zsh
+	# and fish. However, "dh_shell_completions" is still really premature, and not available
+	# in stable releases. So, currently, adding it as build-dependency, especially since
+	# these are well-known, may not be a good choice, but we can revisit that in future
+	# if things mature in this area.
+	#
+	# Observant readers may notice that we don't include PowerShell completion in
+	# this list (even though Cobra provides them, and PowerShell *can* be installed
+	# oon Linux). The short story is that there's no well-defined location, nor
+	# a well-defined approach for this.
+	#
+	# The PowerShell maintainers (see [3]) considering that no completion scripts
+	# are needed for anything following the PowerShell specifications, and for
+	# anything else, PowerShell is capable enough to use zsh and bash completions.
+	#
+	# All of the above taken into account; it's fuzzy enough to just leave it as
+	# an exercise for the user to decide what to do.
+	#
+	# [1]: https://manpages.debian.org/bookworm/bash-completion/dh_bash-completion.1.en.html
+	# [2]: https://manpages.debian.org/testing/dh-shell-completions/dh_shell_completions.1.en.html
+	# [3]: https://github.com/PowerShell/PowerShell/issues/17582
+	install -D -p -m 0644 cli/contrib/completion/bash/docker debian/docker-ce-cli/usr/share/bash-completion/completions/docker
+	install -D -p -m 0644 cli/contrib/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
+	install -D -p -m 0644 cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
 
 	# docker-ce install
-	install -D -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/dockerd) debian/docker-ce/usr/bin/dockerd
-	install -D -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/docker-proxy) debian/docker-ce/usr/bin/docker-proxy
-	install -D -m 0755 /usr/local/bin/docker-init debian/docker-ce/usr/libexec/docker/docker-init
+	install -D -p -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/dockerd) debian/docker-ce/usr/bin/dockerd
+	install -D -p -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/docker-proxy) debian/docker-ce/usr/bin/docker-proxy
+	install -D -p -m 0755 /usr/local/bin/docker-init debian/docker-ce/usr/libexec/docker/docker-init
 
 	# docker-buildx-plugin install
-	install -D -m 0755 /usr/libexec/docker/cli-plugins/docker-buildx debian/docker-buildx-plugin/usr/libexec/docker/cli-plugins/docker-buildx
+	install -D -p -m 0755 /usr/libexec/docker/cli-plugins/docker-buildx debian/docker-buildx-plugin/usr/libexec/docker/cli-plugins/docker-buildx
 
 	# docker-compose-plugin install
-	install -D -m 0755 /usr/libexec/docker/cli-plugins/docker-compose debian/docker-compose-plugin/usr/libexec/docker/cli-plugins/docker-compose
+	install -D -p -m 0755 /usr/libexec/docker/cli-plugins/docker-compose debian/docker-compose-plugin/usr/libexec/docker/cli-plugins/docker-compose
 
 	# docker-ce-rootless-extras install
-	install -D -m 0755 /usr/local/bin/rootlesskit debian/docker-ce-rootless-extras/usr/bin/rootlesskit
-	install -D -m 0755 engine/contrib/dockerd-rootless.sh debian/docker-ce-rootless-extras/usr/bin/dockerd-rootless.sh
-	install -D -m 0755 engine/contrib/dockerd-rootless-setuptool.sh debian/docker-ce-rootless-extras/usr/bin/dockerd-rootless-setuptool.sh
+	install -D -p -m 0755 /usr/local/bin/rootlesskit debian/docker-ce-rootless-extras/usr/bin/rootlesskit
+	install -D -p -m 0755 engine/contrib/dockerd-rootless.sh debian/docker-ce-rootless-extras/usr/bin/dockerd-rootless.sh
+	install -D -p -m 0755 engine/contrib/dockerd-rootless-setuptool.sh debian/docker-ce-rootless-extras/usr/bin/dockerd-rootless-setuptool.sh
 	# TODO: how can we install vpnkit?
 
 override_dh_installinit:
diff --git a/rpm/SPECS/docker-ce-cli.spec b/rpm/SPECS/docker-ce-cli.spec
index 6a2faaad5b..baa2f35669 100644
--- a/rpm/SPECS/docker-ce-cli.spec
+++ b/rpm/SPECS/docker-ce-cli.spec
@@ -48,7 +48,7 @@ mkdir -p /go/src/github.com/docker
 rm -f /go/src/github.com/docker/cli
 ln -snf ${RPM_BUILD_DIR}/src/cli /go/src/github.com/docker/cli
 pushd /go/src/github.com/docker/cli
-VERSION=%{_origversion} GITCOMMIT=%{_gitcommit_cli} GO_LINKMODE=dynamic ./scripts/build/binary && DISABLE_WARN_OUTSIDE_CONTAINER=1 make manpages # cli
+make DISABLE_WARN_OUTSIDE_CONTAINER=1 VERSION=%{_origversion} GITCOMMIT=%{_gitcommit_cli} dynbinary manpages
 popd
 
 %check
@@ -57,28 +57,22 @@ ver="$(cli/build/docker --version)"; \
 
 %install
 # install binary
-install -d ${RPM_BUILD_ROOT}%{_bindir}
-install -p -m 755 cli/build/docker ${RPM_BUILD_ROOT}%{_bindir}/docker
+install -D -p -m 755 cli/build/docker ${RPM_BUILD_ROOT}%{_bindir}/docker
 
 # add bash, zsh, and fish completions
-install -d ${RPM_BUILD_ROOT}%{_datadir}/bash-completion/completions
-install -d ${RPM_BUILD_ROOT}%{_datadir}/zsh/vendor-completions
-install -d ${RPM_BUILD_ROOT}%{_datadir}/fish/vendor_completions.d
-install -p -m 644 cli/contrib/completion/bash/docker ${RPM_BUILD_ROOT}%{_datadir}/bash-completion/completions/docker
-install -p -m 644 cli/contrib/completion/zsh/_docker ${RPM_BUILD_ROOT}%{_datadir}/zsh/vendor-completions/_docker
-install -p -m 644 cli/contrib/completion/fish/docker.fish ${RPM_BUILD_ROOT}%{_datadir}/fish/vendor_completions.d/docker.fish
+install -D -p -m 644 cli/contrib/completion/bash/docker ${RPM_BUILD_ROOT}%{_datadir}/bash-completion/completions/docker
+install -D -p -m 644 cli/contrib/completion/zsh/_docker ${RPM_BUILD_ROOT}%{_datadir}/zsh/vendor-completions/_docker
+install -D -p -m 644 cli/contrib/completion/fish/docker.fish ${RPM_BUILD_ROOT}%{_datadir}/fish/vendor_completions.d/docker.fish
 
 # install manpages
-install -d ${RPM_BUILD_ROOT}%{_mandir}/man1
-install -p -m 644 cli/man/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 -d ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -p -m 644 cli/man/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
+# Note: we need to create destination dirs first (instead "install -D") due to wildcards used.
+install -d ${RPM_BUILD_ROOT}%{_mandir}/man1 && install -p -m 644 cli/man/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 -d ${RPM_BUILD_ROOT}%{_mandir}/man8 && install -p -m 644 cli/man/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 
 mkdir -p build-docs
 for cli_file in LICENSE MAINTAINERS NOTICE README.md; do
-    cp "cli/$cli_file" "build-docs/$cli_file"
+    install -D -p -m 644 "cli/$cli_file" "build-docs/$cli_file"
 done
 
 # list files owned by the package here
diff --git a/rpm/SPECS/docker-ce.spec b/rpm/SPECS/docker-ce.spec
index 659ab88c3e..8589492d02 100644
--- a/rpm/SPECS/docker-ce.spec
+++ b/rpm/SPECS/docker-ce.spec
@@ -82,8 +82,8 @@ install -D -p -m 0755 $(readlink -f engine/bundles/dynbinary-daemon/docker-proxy
 install -D -p -m 0755 /usr/local/bin/docker-init ${RPM_BUILD_ROOT}%{_libexecdir}/docker/docker-init
 
 # install systemd scripts
-install -D -m 0644 engine/contrib/init/systemd/docker.service ${RPM_BUILD_ROOT}%{_unitdir}/docker.service
-install -D -m 0644 engine/contrib/init/systemd/docker.socket ${RPM_BUILD_ROOT}%{_unitdir}/docker.socket
+install -D -p -m 0644 engine/contrib/init/systemd/docker.service ${RPM_BUILD_ROOT}%{_unitdir}/docker.service
+install -D -p -m 0644 engine/contrib/init/systemd/docker.socket ${RPM_BUILD_ROOT}%{_unitdir}/docker.socket
 
 # create the config directory
 mkdir -p ${RPM_BUILD_ROOT}/etc/docker