diff --git a/.woodpecker.yml b/.woodpecker.yml
index 49be00ea..f39fb5c1 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,10 +8,13 @@ steps:
       - REGISTRY="dev.cat-enby.club"
       - MAJOR=$(echo ${CI_COMMIT_TAG} | cut -d '.' -f 1 | tr -d 'v')
       - MINOR=$(echo ${CI_COMMIT_TAG} | cut -d '.' -f 2)
-      - PATCH=$(echo ${CI_COMMIT_TAG} | cut -d '.' -f 3)
+      - PATCH=$(echo ${CI_COMMIT_TAG} | cut -d '.' -f 3 | cut -d '-' -f 1)
       - docker buildx build -t $${REGISTRY}/$${REPO}:v$${MAJOR:-0}.$${MINOR:-0}.$${PATCH-0} -t $${REGISTRY}/$${REPO}:v$${MAJOR:-0}.$${MINOR} -t $${REGISTRY}/$$REPO:v$${MAJOR:-0} -t $${REGISTRY}/$$REPO:latest .
       - docker login --username $USER --password $PASS $${REGISTRY}
       - docker push $${REGISTRY}/$${REPO}:v$${MAJOR:-0}.$${MINOR:-0}.$${PATCH-0}
+      - docker push $${REGISTRY}/$${REPO}:v$${MAJOR:-0}.$${MINOR}
+      - docker push $${REGISTRY}/$${REPO}:v$${MAJOR:-0}
+      - docker push $${REGISTRY}/$${REPO}:latest
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     when: