diff --git a/.woodpecker.yml b/.woodpecker.yml
index 619b81c..7805856 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -5,7 +5,7 @@ steps:
       repo: ${FORGE_NAME}/${CI_REPO}
       registry: 
         from_secret: container_registry
-      tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
+      tags: latest,${CI_COMMIT_SHA}
       username: 
         from_secret: container_registry_username
       password: 
@@ -30,7 +30,7 @@ steps:
     commands:
       - export GOPATH=/woodpecker/go   # the export is required, otherwise trivy will not consider the variable
       - HOME=/home/`id -nu`
-      - TAG="${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
+      - TAG=${$CI_COMMIT_SHA}
       - |
         trivy image \
               --server $TRIVY_URL \