diff --git a/.github/workflows/gateway-ui.yml b/.github/workflows/gateway-ui.yml
index 96896d940..d2c68cdf0 100644
--- a/.github/workflows/gateway-ui.yml
+++ b/.github/workflows/gateway-ui.yml
@@ -30,7 +30,7 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=sha
       - name: Login to Docker Hub
-        if: github.ref == 'refs/heads/master' || (github.ref_type == 'tag' && startsWith(github.ref, 'v'))
+        if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
         uses: docker/login-action@v2
         with:
           username: fedimintui
@@ -39,6 +39,6 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           file: Dockerfile.gateway-ui
-          push: ${{ github.ref == 'refs/heads/master' || (github.ref_type == 'tag' && startsWith(github.ref, 'v')) }}
+          push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/guardian-ui.yml b/.github/workflows/guardian-ui.yml
index a639ba12d..101af5e99 100644
--- a/.github/workflows/guardian-ui.yml
+++ b/.github/workflows/guardian-ui.yml
@@ -29,7 +29,7 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=sha
       - name: Login to Docker Hub
-        if: github.ref == 'refs/heads/master' || (github.ref_type == 'tag' && startsWith(github.ref, 'v'))
+        if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
         uses: docker/login-action@v2
         with:
           username: fedimintui
@@ -38,6 +38,6 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           file: Dockerfile.guardian-ui
-          push: ${{ github.ref == 'refs/heads/master' || (github.ref_type == 'tag' && startsWith(github.ref, 'v')) }}
+          push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}