diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7c97169c..14c51f43 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,23 +21,23 @@ jobs:
 
       - name: Build image
         if: success()
-        run: docker build -t sakpaas/backend:release-${GITHUB_REF} .
+        run: docker build -t sakpaas/backend:release-${GITHUB_REF##*/} .
 
       - name: Tag image
         if: success()
-        run: docker tag sakpaas/backend:release-${GITHUB_REF} sakpaas/backend:latest
+        run: docker tag sakpaas/backend:release-${GITHUB_REF##*/} sakpaas/backend:latest
 
       - name: Push <image>:release-<tag>
         if: success()
         uses: actions-hub/docker@master
         with:
-          args: push sakpaas/backend:${GITHUB_REF}
+          args: push sakpaas/backend:${GITHUB_REF##*/}
 
       - name: Push <image>:latest
         if: success()
         uses: actions-hub/docker@master
         with:
-          args: push sakpaas/backend:release-${GITHUB_REF}
+          args: push sakpaas/backend:release-${GITHUB_REF##*/}
 
 
   deploy:
@@ -55,7 +55,7 @@ jobs:
         uses: stefanprodan/kube-tools@v1
         with:
           kustomize: 3.4.0
-          command: "cd backend/production && kustomize edit set image sakpaas/backend=sakpaas/backend:release-${GITHUB_REF}"
+          command: "cd backend/production && kustomize edit set image sakpaas/backend=sakpaas/backend:release-${GITHUB_REF##*/}"
 
       - name: Deploy
         uses: actions-hub/kubectl@master