diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 291985b..270c011 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -9,7 +9,7 @@ steps:
       repo: hexlocation/disseminate
       platforms: linux/amd64
       dockerfile: Dockerfile
-      tags: ["latest","${CI_COMMIT_BRANCH}-${CI_COMMIT_TAG}"]
+      tags: ["${CI_COMMIT_BRANCH-latest}","${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}"]
       username: ${docker_username}
       password:
         from_secret: docker_password