diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
index b94248f..4607838 100644
--- a/.github/workflows/goreleaser.yml
+++ b/.github/workflows/goreleaser.yml
@@ -39,19 +39,20 @@ jobs:
         run: |
           ls
           cd dist
-
+      - name: Get current tag
+        run: echo "IMAGE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
       # Build Docker Image
       - name: Build Docker Image
         run: |
           docker build -t samwaf/samwaf:latest .
-          docker tag samwaf/samwaf:latest samwaf/samwaf:${{ github.ref }}
+          docker tag samwaf/samwaf:latest samwaf/samwaf:${{ env.IMAGE_TAG }}
 
       # Push Docker Image to Docker Hub
       - name: Push Docker Image
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
           docker push samwaf/samwaf:latest
-          docker push samwaf/samwaf:${{ github.ref }}
+          docker push samwaf/samwaf:${{ env.IMAGE_TAG }}
 
       # Test the Docker Image
       - name: Test Docker Image