diff --git a/.woodpecker.yml b/.woodpecker.yml
index e593cba..170c39b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -22,7 +22,7 @@ steps:
     settings:
       repo: gitea.hottis.de/${CI_REPO}
       registry: https://gitea.hottis.de/v2/
-      tags: latest
+      tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
       username: 
         from_secret: system_container_registry_username
       password: