diff --git a/.github/workflows/on-push-release.yaml b/.github/workflows/on-push-release.yaml
index 84a3796c1..25aec568e 100644
--- a/.github/workflows/on-push-release.yaml
+++ b/.github/workflows/on-push-release.yaml
@@ -22,13 +22,17 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Extract branch name
+        shell: bash
+        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//-/g')" >> $GITHUB_ENV
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./build/Containerfile
           push: true
-          tags: quay.io/kubev2v/forklift-console-plugin:${GITHUB_REF#refs/heads/}
+          tags: quay.io/kubev2v/forklift-console-plugin:${{ env.BRANCH_NAME }}
 
       - name: Logout from Quay.io
         run: docker logout quay.io