diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 8df1d8b..be03ba0 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -14,7 +14,7 @@ steps:
       context: frontend
       tags:
         - latest
-        - ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
+        - ${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}}
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -35,7 +35,7 @@ steps:
       context: backend
       tags:
         - latest
-        - ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
+        - ${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}}
       username:
         from_secret: DOCKER_USERNAME
       password: