diff --git a/.woodpecker.yml b/.woodpecker.yml
index 22b0f38..a432694 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -2,7 +2,7 @@ labels:
   platform: linux/amd64
 
 when:
-  - event: [push, manual]
+  - event: [push, manual, tag]
     branch: main
 
 steps:
@@ -12,7 +12,9 @@ steps:
       platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
       registry: forgejo.venusian.stream
       repo: forgejo.venusian.stream/homelab/caddy
-      tags: latest
+      tags: 
+        - latest
+        - ${CI_COMMIT_TAG}
       username:
         from_secret: DOCKER_USERNAME
       password: