diff --git a/.woodpecker/keycloak.yaml b/.woodpecker/keycloak.yaml
index 168e5e8..01f54ed 100644
--- a/.woodpecker/keycloak.yaml
+++ b/.woodpecker/keycloak.yaml
@@ -42,8 +42,8 @@ steps:
     commands:
       - apk -u add crane
       - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
-      - crane push /woodpecker/images/keycloak.tar $IMAGE_NAME:$KEYCLOAK_VERSION
-  - name: tag-main-and-latest
+      - crane push /woodpecker/images/keycloak.tar $IMAGE_NAME:$CI_COMMIT_BRANCH
+  - name: tag-version-and-latest
     image: alpine
     when:
       - branch: main
@@ -52,5 +52,5 @@ steps:
     commands:
       - apk -u add crane
       - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
-      - crane tag $IMAGE_NAME:$KEYCLOAK_VERSION main
-      - crane tag $IMAGE_NAME:$KEYCLOAK_VERSION latest
+      - crane tag $IMAGE_NAME:$CI_COMMIT_BRANCH $KEYCLOAK_VERSION
+      - crane tag $IMAGE_NAME:$CI_COMMIT_BRANCH latest