diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 22b68c3..36850f1 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -3,9 +3,9 @@ steps:
     image: plugins/docker
     commands:
       - docker login docker.io -u $${DOCKERHUB_USERNAME} -p $${DOCKERHUB_PASSWORD}
-      - docker build --rm=true -f Dockerfile -t $${CI_COMMIT_TAG} .
-      - docker push $${DOCKERHUB_USERNAME}/$${CI_REPO_NAME}:$${CI_COMMIT_TAG}
-      - docker tag $${CI_COMMIT_TAG} $${DOCKERHUB_USERNAME}/$${CI_REPO_NAME}:latest
+      - docker build --rm=true -f Dockerfile -t $${CI_COMMIT_REF} .
+      - docker push $${DOCKERHUB_USERNAME}/$${CI_REPO_NAME}:$${CI_COMMIT_REF}
+      - docker tag $${CI_COMMIT_REF} $${DOCKERHUB_USERNAME}/$${CI_REPO_NAME}:latest
       - docker push $${DOCKERHUB_USERNAME}/$${CI_REPO_NAME}:latest
     secrets: [ dockerhub_username, dockerhub_password ]
     volumes: