diff --git a/.drone.yml b/.drone.yml
index 8e6e6f19b..1b1330bbf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -50,12 +50,14 @@ steps:
    event: tag
 
 - name: publish:docker
-  image: banzaicloud/drone-kaniko
+  image: plugins/docker
   settings:
     username:
       from_secret: docker_user
     password:
       from_secret: docker_password
+    repo: codercom/code-server
+    dockerfile: scripts/ci.dockerfile
     tags:
       - latest
       - v2
@@ -170,17 +172,19 @@ steps:
    event: tag
 
 - name: publish:docker
-  image: banzaicloud/drone-kaniko
+  image: plugins/docker
   settings:
     username:
       from_secret: docker_user
     password:
       from_secret: docker_password
+    repo: codercom/code-server
+    dockerfile: scripts/ci.dockerfile
     tags:
       - arm64
       - ${DRONE_TAG}-arm64
     build_args:
-      - tag=$DRONE_TAG
+      - tag=${DRONE_TAG}
   when:
     event: tag
 
@@ -289,17 +293,19 @@ steps:
    event: tag
 
 - name: publish:docker
-  image: banzaicloud/drone-kaniko
+  image: plugins/docker
   settings:
     username:
       from_secret: docker_user
     password:
       from_secret: docker_password
+    repo: codercom/code-server
+    dockerfile: scripts/ci.dockerfile
     tags:
       - arm
       - ${DRONE_TAG}-arm
     build_args:
-      - tag=$DRONE_TAG
+      - tag=${DRONE_TAG}
   when:
     event: tag
 
diff --git a/Dockerfile b/Dockerfile
index 8e3a238da..03026566e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,6 @@ COPY . .
 
 RUN yarn \
 	&& DRONE_TAG="$tag" MINIFY=true BINARY=true GITHUB_TOKEN="$githubToken" ./scripts/ci.bash \
-	&& mv /src/binaries/* /src/binaries/code-server \
 	&& rm -r /src/build \
 	&& rm -r /src/source
 
diff --git a/scripts/ci.bash b/scripts/ci.bash
index a9413d56f..4eb6b313f 100755
--- a/scripts/ci.bash
+++ b/scripts/ci.bash
@@ -21,7 +21,7 @@ function main() {
 		mv "vscode-$vscode_version-source" "source/vscode-$vscode_version-source"
 	fi
 
-	# Only minify and package on tags since that's when releases are pushed.
+	# Always minify and package on tags since that's when releases are pushed.
 	if [[ -n ${DRONE_TAG:-} || -n ${TRAVIS_TAG:-} ]] ; then
 		export MINIFY="true"
 		export PACKAGE="true"
@@ -32,8 +32,17 @@ function main() {
 	}
 
 	run-yarn build
-	[[ -n ${PACKAGE:-} || -n ${BINARY:-} ]] && run-yarn binary
-	[[ -n ${PACKAGE:-} ]] && run-yarn package
+	if [[ -n ${PACKAGE:-} || -n ${BINARY:-} ]] ; then
+		run-yarn binary
+	fi
+	if [[ -n ${PACKAGE:-} ]] ; then
+		run-yarn package
+	fi
+
+	# In this case provide a plainly named "code-server" binary.
+	if [[ -n ${BINARY:-} ]] ; then
+		mv binaries/code-server*-vsc* binaries/code-server
+	fi
 }
 
 main "$@"