diff --git a/.github/workflows/pydna_pypi_build_workflow.yml b/.github/workflows/pydna_pypi_build_workflow.yml
index 6602ca2b..96d1810c 100644
--- a/.github/workflows/pydna_pypi_build_workflow.yml
+++ b/.github/workflows/pydna_pypi_build_workflow.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: github.event_name == 'release' && contains(github.ref, '/master')
+    if: github.event.release.target_commitish == 'master'
     steps:
       - uses: actions/checkout@v3
       - name: Build and publish to pypi
diff --git a/.github/workflows/pydna_test_pypi_build_workflow.yml b/.github/workflows/pydna_test_pypi_build_workflow.yml
index bee4cee4..4c484130 100644
--- a/.github/workflows/pydna_test_pypi_build_workflow.yml
+++ b/.github/workflows/pydna_test_pypi_build_workflow.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: github.event_name == 'release' && contains(github.ref, '/testpypi')
+    if: github.event.release.target_commitish == 'testpypi'
     steps:
       - uses: actions/checkout@v3
       - name: Build and publish to pypi