diff --git a/components/packaging/static/Makefile b/components/packaging/static/Makefile
index dcf05e33cc..37bfb361e6 100644
--- a/components/packaging/static/Makefile
+++ b/components/packaging/static/Makefile
@@ -24,7 +24,7 @@ static: static-linux cross-mac cross-win cross-arm ## create all static packages
 static-linux: static-cli static-engine ## create tgz with linux x86_64 client and server
 	mkdir -p build/linux/docker
 	cp $(CLI_DIR)/build/docker build/linux/docker/
-	for f in dockerd docker-containerd docker-containerd-ctr docker-containerd-shim docker-init docker-proxy docker-runc; do \
+	for f in dockerd containerd ctr containerd-shim docker-init docker-proxy runc; do \
 		cp -L $(ENGINE_DIR)/bundles/binary-daemon/$$f build/linux/docker/$$f; \
 	done
 	tar -C build/linux -c -z -f build/linux/docker-$(STATIC_VERSION).tgz docker
diff --git a/components/packaging/systemd/docker.service b/components/packaging/systemd/docker.service
index 7371b1355c..8f4c7d1177 100644
--- a/components/packaging/systemd/docker.service
+++ b/components/packaging/systemd/docker.service
@@ -25,9 +25,6 @@ StartLimitBurst=3
 # this option work for either version of systemd.
 StartLimitInterval=60s
 
-# /opt/containerd/bin is in front so dockerd grabs the correct runc binary
-Environment="PATH=/opt/containerd/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
 # Having non-zero Limit*s causes performance problems due to accounting overhead
 # in the kernel. We recommend using cgroups to do container-local accounting.
 LimitNOFILE=infinity