diff --git a/.drone.yml b/.drone.yml
index 83a77dc3a..257f0de21 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -95,12 +95,12 @@ steps:
       - git fetch --tags
       - /go/dockerlogin.sh
       - goreleaser release --rm-dist --snapshot
-      - docker push superseriousbusiness/gotosocial:latest-armv6 && 
-      - docker push superseriousbusiness/gotosocial:latest-armv7
-      - docker push superseriousbusiness/gotosocial:latest-arm64v8
-      - docker push superseriousbusiness/gotosocial:latest-amd64
-      - docker manifest create superseriousbusiness/gotosocial:latest superseriousbusiness/gotosocial:latest-armv6 superseriousbusiness/gotosocial:latest-armv7 superseriousbusiness/gotosocial:latest-amd64 superseriousbusiness/gotosocial:latest-arm64v8
-      - docker manifest push superseriousbusiness/gotosocial:latest
+      - docker push superseriousbusiness/gotosocial:snapshot-armv6 && 
+      - docker push superseriousbusiness/gotosocial:snapshot-armv7
+      - docker push superseriousbusiness/gotosocial:snapshot-arm64v8
+      - docker push superseriousbusiness/gotosocial:snapshot-amd64
+      - docker manifest create superseriousbusiness/gotosocial:snapshot superseriousbusiness/gotosocial:snapshot-armv6 superseriousbusiness/gotosocial:snapshot-armv7 superseriousbusiness/gotosocial:snapshot-amd64 superseriousbusiness/gotosocial:snapshot-arm64v8
+      - docker manifest push superseriousbusiness/gotosocial:snapshot
     when:
       event:
         include:
@@ -182,6 +182,6 @@ steps:
 
 ---
 kind: signature
-hmac: 2166c95bd8ba068c928aa4ec8645836a40fc2c99ceb5541b8c365763ee63e3b2
+hmac: 46dd4ce5b5dab76bc64c68f4730663ed0ada81471ffcbfa1bcf935d8e7f6a155
 
 ...
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 573ad91fc..e0ad1e5b1 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -55,6 +55,7 @@ dockers:
     image_templates:
     - "superseriousbusiness/{{ .ProjectName }}:{{ .Version }}-amd64"
     - "superseriousbusiness/{{ .ProjectName }}:latest-amd64"
+    - "superseriousbusiness/{{ .ProjectName }}:snapshot-amd64"
     build_flag_templates:
     - "--platform=linux/amd64"
     - "--label=org.opencontainers.image.created={{.Date}}"
@@ -74,6 +75,7 @@ dockers:
     image_templates:
     - "superseriousbusiness/{{ .ProjectName }}:{{ .Version }}-arm64v8"
     - "superseriousbusiness/{{ .ProjectName }}:latest-arm64v8"
+    - "superseriousbusiness/{{ .ProjectName }}:snapshot-arm64v8"
     build_flag_templates:
     - "--platform=linux/arm64/v8"
     - "--label=org.opencontainers.image.created={{.Date}}"
@@ -94,6 +96,7 @@ dockers:
     image_templates:
     - "superseriousbusiness/{{ .ProjectName }}:{{ .Version }}-armv6"
     - "superseriousbusiness/{{ .ProjectName }}:latest-armv6"
+    - "superseriousbusiness/{{ .ProjectName }}:snapshot-armv6"
     build_flag_templates:
     - "--platform=linux/arm/v6"
     - "--label=org.opencontainers.image.created={{.Date}}"
@@ -114,6 +117,7 @@ dockers:
     image_templates:
     - "superseriousbusiness/{{ .ProjectName }}:{{ .Version }}-armv7"
     - "superseriousbusiness/{{ .ProjectName }}:latest-armv7"
+    - "superseriousbusiness/{{ .ProjectName }}:snapshot-armv7"
     build_flag_templates:
     - "--platform=linux/arm/v7"
     - "--label=org.opencontainers.image.created={{.Date}}"
@@ -139,6 +143,12 @@ docker_manifests:
     - superseriousbusiness/{{ .ProjectName }}:latest-arm64v8
     - superseriousbusiness/{{ .ProjectName }}:latest-armv6
     - superseriousbusiness/{{ .ProjectName }}:latest-armv7
+  - name_template: superseriousbusiness/{{ .ProjectName }}:snapshot
+    image_templates:
+    - superseriousbusiness/{{ .ProjectName }}:snapshot-amd64
+    - superseriousbusiness/{{ .ProjectName }}:snapshot-arm64v8
+    - superseriousbusiness/{{ .ProjectName }}:snapshot-armv6
+    - superseriousbusiness/{{ .ProjectName }}:snapshot-armv7
 archives:
   # https://goreleaser.com/customization/archive/
   -