diff --git a/manifest.tmpl b/manifest.tmpl
index bdef974..fc8f516 100644
--- a/manifest.tmpl
+++ b/manifest.tmpl
@@ -1,4 +1,4 @@
-image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix build.tag "v"}}{{else}}latest{{/if}}
+image: mazzolino/shepherd:{{#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: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}amd64
+    image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
     platform:
       architecture: amd64
       os: linux
   -
-    image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}arm
+    image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
     platform:
       architecture: arm
       os: linux
   -
-    image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}arm64
+    image: mazzolino/shepherd:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
     platform:
       architecture: arm64
       os: linux