diff --git a/docker-manifest.tmpl b/docker-manifest.tmpl
index 4561c5f03e..18cf567fe1 100644
--- a/docker-manifest.tmpl
+++ b/docker-manifest.tmpl
@@ -1,4 +1,4 @@
-image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+image: vikunja/api:{{#if build.tag}}{{#equal build.tag "main"}}latest{{else}}{{trimPrefix "v" build.tag}}{{/equal}}{{else}}latest{{/if}}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
@@ -7,17 +7,17 @@ tags:
 {{/if}}
 manifests:
   -
-    image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    image: vikunja/api:{{#if build.tag}}{{#equal build.tag "main"}}{{else}}{{trimPrefix "v" build.tag}}{{/equal}}-{{/if}}linux-amd64
     platform:
       architecture: amd64
       os: linux
   -
-    image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    image: vikunja/api:{{#if build.tag}}{{#equal build.tag "main"}}{{else}}{{trimPrefix "v" build.tag}}{{/equal}}-{{/if}}linux-arm64
     platform:
       architecture: arm64
       os: linux
   -
-    image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
+    image: vikunja/api:{{#if build.tag}}{{#equal build.tag "main"}}{{else}}{{trimPrefix "v" build.tag}}{{/equal}}-{{/if}}linux-arm
     platform:
       architecture: arm
       os: linux