diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2cdca97..f921bb6 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,7 +8,7 @@ steps:
     image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
-      tags: latest,${CI_COMMIT}
+      tags: latest,${CI_COMMIT_SHA}
       registry: git.van-hemmen.com
       username:
         from_secret: docker_username
@@ -24,7 +24,7 @@ steps:
     image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
-      tags: latest,${CI_TAG}
+      tags: latest,${CI_COMMIT_TAG}
       registry: git.van-hemmen.com
       username:
         from_secret: docker_username