diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e38a0cca..7d6b0393 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,7 +36,7 @@ jobs:
         run: |
           IMAGE_ID=ghcr.io/${{ github.repository }}
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          docker push -a $IMAGE_ID
+          docker push --all-tags $IMAGE_ID
 
   release:
     name: Create new Github release
@@ -50,7 +50,7 @@ jobs:
 
       - name: 🏷️ Get tag
         id: tag
-        run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+        run: echo "tag=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
 
       - name: Create changelog text
         id: changelog
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 2099489c..0fa85224 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -24,7 +24,7 @@ jobs:
       
       - name: 🏷️ Get tag
         id: tag
-        run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+        run: echo "tag=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
   
       - name: 🐋 Build Docker image
         run: |