diff --git a/.drone.yml b/.drone.yml
index 8ae1d5f45..6a115b1aa 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -36,12 +36,13 @@ steps:
       branch:
         - develop
 
-  - name: test-master
+  - name: test
     commands:
       - docker-compose -f docker-compose.drone.yml exec -T photoprism make all test install migrate
     when:
       branch:
         - master
+        - release
 
   - name: down
     commands:
@@ -119,6 +120,7 @@ name: linux-arm64
 
 trigger:
   branch:
+    - master
     - release
 
 platform:
@@ -126,7 +128,20 @@ platform:
   os: linux
 
 steps:
-  - name: deploy
+  - name: deploy-preview
+    environment:
+      DOCKER_USERNAME:
+        from_secret: docker_username
+      DOCKER_PASSWORD:
+        from_secret: docker_password
+    commands:
+      - scripts/docker-login.sh
+      - make docker-photoprism-arm64-preview
+    when:
+      branch:
+        - master
+
+  - name: deploy-release
     environment:
       DOCKER_USERNAME:
         from_secret: docker_username
@@ -135,6 +150,9 @@ steps:
     commands:
       - scripts/docker-login.sh
       - make docker-photoprism-arm64
+    when:
+      branch:
+        - release
 
   - name: clean
     commands:
diff --git a/Makefile b/Makefile
index 1894a14d2..7c323d8fb 100644
--- a/Makefile
+++ b/Makefile
@@ -174,8 +174,11 @@ docker-photoprism-local:
 	scripts/docker-build.sh photoprism
 docker-photoprism-pull:
 	docker pull photoprism/photoprism:latest
-docker-photoprism-arm64:
+docker-photoprism-arm64-preview:
 	docker pull ubuntu:20.04
+	scripts/docker-build.sh photoprism-arm64
+	scripts/docker-push.sh photoprism-arm64
+docker-photoprism-arm64:
 	scripts/docker-build.sh photoprism-arm64 $(DOCKER_TAG)
 	scripts/docker-push.sh photoprism-arm64 $(DOCKER_TAG)
 docker-demo: