diff --git a/.drone.yml b/.drone.yml
index 73c085c967..1cdcb69d76 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,6 +15,7 @@ steps:
       from_secret: gcloud_auth
   commands:
   - dapper ci
+  - echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags
   volumes:
   - name: docker
     path: /var/run/docker.sock
@@ -109,6 +110,7 @@ steps:
       from_secret: gcloud_auth
   commands:
   - dapper ci
+  - echo "${DRONE_TAG}-arm64" | sed -e 's/+/-/g' >.tags
   volumes:
   - name: docker
     path: /var/run/docker.sock
@@ -186,6 +188,7 @@ steps:
       from_secret: gcloud_auth
   commands:
   - dapper ci
+  - echo "${DRONE_TAG}-arm" | sed -e 's/+/-/g' >.tags
   volumes:
   - name: docker
     path: /var/run/docker.sock
diff --git a/scripts/package-image b/scripts/package-image
index 1a434a16cc..5acece1f0d 100755
--- a/scripts/package-image
+++ b/scripts/package-image
@@ -12,4 +12,3 @@ IMAGE_NAME=${IMAGE_NAME:-k3s}
 IMAGE=${REPO}/${IMAGE_NAME}:${TAG}
 docker build -t ${IMAGE} -f package/Dockerfile .
 echo Built ${IMAGE}
-echo ${VERSION_TAG}-${ARCH} >.tags