diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4e1ea0047..6a336a600 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,6 @@ on: [push]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-
   # This job builds wheels for Windows x86_64 arch
   build-windows-x86_64:
     runs-on: windows-latest
@@ -67,7 +66,7 @@ jobs:
         with: 
           python-version: ${{ matrix.python-version }}
       - name: Append build hash if not a tagged commit
-        if: github.ref != 'refs/tags/*'
+        if: startsWith(github.ref, 'refs/tags/v') != true
         run: echo '::set-env name=BUILD_COMMIT_HASH::${{github.sha}}'
       - name: Install dependencies
         run: |
@@ -195,7 +194,7 @@ jobs:
 
   # Deploy to PyPi. Only when a commit is tagged
   deploy-pypi:
-    if: github.ref == 'refs/tags/*'
+    if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     needs: tests
     steps: