diff --git a/.drone1.yml b/.drone1.yml
index d2598698849..d1af9d7cc1d 100644
--- a/.drone1.yml
+++ b/.drone1.yml
@@ -737,7 +737,7 @@ steps:
     settings:
       tags: latest
       ignore_missing: true
-      spec: docker-manifest.tmpl
+      spec: docker-manifest-latest.tmpl
       password:
         from_secret: docker_password
       username:
diff --git a/docker-manifest-latest.tmpl b/docker-manifest-latest.tmpl
new file mode 100644
index 00000000000..bafecd5e3ca
--- /dev/null
+++ b/docker-manifest-latest.tmpl
@@ -0,0 +1,17 @@
+image: vikunja/api:latest
+manifests:
+  -
+    image: vikunja/api:latest-linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: vikunja/api:latest-linux-arm64
+    platform:
+      architecture: arm64
+      os: linux
+  -
+    image: vikunja/api:latest-linux-arm
+    platform:
+      architecture: arm
+      os: linux
diff --git a/docker-manifest.tmpl b/docker-manifest.tmpl
index 18cf567fe19..4561c5f03e7 100644
--- a/docker-manifest.tmpl
+++ b/docker-manifest.tmpl
@@ -1,4 +1,4 @@
-image: vikunja/api:{{#if build.tag}}{{#equal build.tag "main"}}latest{{else}}{{trimPrefix "v" build.tag}}{{/equal}}{{else}}latest{{/if}}
+image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
@@ -7,17 +7,17 @@ tags:
 {{/if}}
 manifests:
   -
-    image: vikunja/api:{{#if build.tag}}{{#equal build.tag "main"}}{{else}}{{trimPrefix "v" build.tag}}{{/equal}}-{{/if}}linux-amd64
+    image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
     platform:
       architecture: amd64
       os: linux
   -
-    image: vikunja/api:{{#if build.tag}}{{#equal build.tag "main"}}{{else}}{{trimPrefix "v" build.tag}}{{/equal}}-{{/if}}linux-arm64
+    image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
     platform:
       architecture: arm64
       os: linux
   -
-    image: vikunja/api:{{#if build.tag}}{{#equal build.tag "main"}}{{else}}{{trimPrefix "v" build.tag}}{{/equal}}-{{/if}}linux-arm
+    image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
     platform:
       architecture: arm
       os: linux