diff --git a/Dockerfile b/Dockerfile
index 29d9a99..aa1786b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,10 +67,10 @@ RUN \
   fi && \
   echo "**** grab buildx plugin ****" && \
   curl -fo \
-    /root-layer/docker-bins/buildx_x86_64 -L \
+    /root-layer/docker-bins/docker-buildx_x86_64 -L \
     "https://github.com/docker/buildx/releases/download/${BUILDX_RELEASE}/buildx-${BUILDX_RELEASE}.linux-amd64" && \
   curl -fo \
-    /root-layer/docker-bins/buildx_aarch64 -L \
+    /root-layer/docker-bins/docker-buildx_aarch64 -L \
     "https://github.com/docker/buildx/releases/download/${BUILDX_RELEASE}/buildx-${BUILDX_RELEASE}.linux-arm64" && \
   chmod +x /root-layer/docker-bins/* && \
   rm -rf /tmp/*
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/run
index 835a264..0cee12c 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/run
@@ -10,7 +10,7 @@ if [[ -d "/docker-bins" ]] ; then
   echo "Copying over docker and docker-compose binaries"
   mkdir -p /usr/local/lib/docker/cli-plugins
   mv "/docker-bins/docker-compose_${ARCH}" /usr/local/lib/docker/cli-plugins/docker-compose
-  mv "/docker-bins/buildx_${ARCH}" /usr/local/lib/docker/cli-plugins/docker-buildx
+  mv "/docker-bins/docker-buildx_${ARCH}" /usr/local/lib/docker/cli-plugins/docker-buildx
   mv "/docker-bins/docker_${ARCH}" /usr/local/bin/docker
   mv "/docker-bins/compose-switch_${ARCH}" /usr/local/bin/docker-compose
   rm -rf /docker-bins