diff --git a/.drone.yml b/.drone.yml
index efaeb8057..8746a5899 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -307,7 +307,7 @@ depends_on:
 
 platform:
   os: linux
-  arch: arm
+  arch: arm64
 
 trigger:
   ref:
@@ -351,6 +351,42 @@ steps:
       ref:
         - "refs/tags/**"
 
+  - name: docker-latest-arm64
+    image: plugins/docker:linux-arm64
+    pull: true
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: vikunja/frontend
+      auto_tag: true
+      auto_tag_suffix: linux-arm64
+      build_args:
+        - USE_RELEASE=true
+        - RELEASE_VERSION=master
+    when:
+      ref:
+        - refs/heads/master
+
+  - name: docker-version-arm64
+    image: plugins/docker:linux-arm64
+    pull: true
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: vikunja/frontend
+      auto_tag: true
+      auto_tag_suffix: linux-arm64
+      build_args:
+        - USE_RELEASE=true
+        - RELEASE_VERSION=${DRONE_TAG##v}
+    when:
+      ref:
+        - "refs/tags/**"
+
 ---
 kind: pipeline
 type: docker
diff --git a/docker-manifest.tmpl b/docker-manifest.tmpl
index 4d12a36a7..d12a95525 100644
--- a/docker-manifest.tmpl
+++ b/docker-manifest.tmpl
@@ -11,6 +11,11 @@ manifests:
     platform:
       architecture: amd64
       os: linux
+  -
+    image: vikunja/frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    platform:
+      architecture: arm64
+      os: linux
   -
     image: vikunja/frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform: