diff --git a/.drone.yml b/.drone.yml
index 24dba466..a4c5202a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -213,10 +213,6 @@ steps:
     NFPM_SIGNING_KEY_FILE: /drone/src/release-private-key.key
   image: ghcr.io/grafana/grafana-build-tools:v0.4.0
   name: test release
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/v*.*.*
 - commands:
   - ./scripts/package/verify-deb-install.sh
   image: docker
@@ -225,10 +221,6 @@ steps:
   volumes:
   - name: docker
     path: /var/run/docker.sock
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/v*.*.*
 - commands:
   - ./scripts/package/verify-rpm-install.sh
   image: docker
@@ -237,10 +229,6 @@ steps:
   volumes:
   - name: docker
     path: /var/run/docker.sock
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/v*.*.*
 - commands:
   - make release
   environment:
@@ -312,6 +300,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: f3e837fc29e4096762e3d698581dce4b67160fa79766910e8898efadf99a6010
+hmac: 5fb7efe6e79672a68aadbece06cb2ab9a879000265c58781d68d0998967ca9bb
 
 ...
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 411dc8b2..993b8915 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -12,7 +12,6 @@ builds:
       - darwin
     goarch:
       - amd64
-      - arm
       - arm64
     ignore:
       - goos: darwin
@@ -59,7 +58,7 @@ nfpms:
         dst: /etc/systemd/system/synthetic-monitoring-agent.service
 
       # Copy k6 as sm-k6 to prevent clashing with k6 if it's installed.
-      - src: ./dist/synthetic-monitoring-agent_{{.Os}}_{{.Arch}}/k6
+      - src: ./dist/synthetic-monitoring-agent_{{.Os}}_{{.Arch}}{{ with .Amd64 }}_{{ . }}{{ end}}/k6
         dst: /usr/bin/sm-k6
     rpm:
       signature:
diff --git a/scripts/configs/drone/main.jsonnet b/scripts/configs/drone/main.jsonnet
index 2c4e89e5..5f072bdd 100644
--- a/scripts/configs/drone/main.jsonnet
+++ b/scripts/configs/drone/main.jsonnet
@@ -271,13 +271,13 @@ local docker_publish(repo, auth, tag, os, arch, version='') =
           NFPM_SIGNING_KEY_FILE: '/drone/src/release-private-key.key',
         },
       },
-      step('test release', [ 'make release-snapshot' ]) + devAndRelease + {
+      step('test release', [ 'make release-snapshot' ]) + {
         environment: {
           NFPM_DEFAULT_PASSPHRASE: { from_secret: 'gpg_passphrase' },
           NFPM_SIGNING_KEY_FILE: '/drone/src/release-private-key.key',
         },
       },
-      step('test deb package', [ './scripts/package/verify-deb-install.sh' ], image='docker') + devAndRelease + {
+      step('test deb package', [ './scripts/package/verify-deb-install.sh' ], image='docker') + {
         volumes: [
           {
             name: 'docker',
@@ -286,7 +286,7 @@ local docker_publish(repo, auth, tag, os, arch, version='') =
         ],
         privileged: true,
       },
-      step('test rpm package', [ './scripts/package/verify-rpm-install.sh' ], image='docker') + devAndRelease + {
+      step('test rpm package', [ './scripts/package/verify-rpm-install.sh' ], image='docker') + {
         volumes: [
           {
             name: 'docker',