diff --git a/.github/workflows/merging.yaml b/.github/workflows/merging.yaml
index 8d8d3ab..28e859d 100644
--- a/.github/workflows/merging.yaml
+++ b/.github/workflows/merging.yaml
@@ -6,11 +6,10 @@ on:
 
 env:
   PROJECT_ID: 538e459351a847058fe28f1e6679b87b #Demo project id (under 'Permit.io Tests' workspace), project Demo
-  PR_LABEL: authz
 
 jobs:
   demo-merging:
-    if: ${{ github.event.pull_request.merged == true && github.event.label.name == env.PR_LABEL }}
+    if: ${{ github.event.pull_request.merged == true && contains( github.event.pull_request.labels.*.name, 'authz') }}
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
diff --git a/.github/workflows/new-env.yaml b/.github/workflows/new-env.yaml
index 70300d3..058f62d 100644
--- a/.github/workflows/new-env.yaml
+++ b/.github/workflows/new-env.yaml
@@ -2,16 +2,15 @@ name: demo-new-env
 
 on:
   pull_request:
-    types: [labeled]
+    types: [opened]
 
 env:
   PROJECT_ID: 538e459351a847058fe28f1e6679b87b #Demo project id (under 'Permit.io Tests' workspace), project Demo
-  PR_LABEL: authz
   #PR_NUMBER: ${{ github.event.number }} # PR number optional - cheange ${{ steps.extract_branch.outputs.branch }} with ${{ env.PR_NUMBER }} in the job
 
 jobs:
   demo-new-env:
-    if: ${{ github.event.label.name == 'env.PR_LABEL' }}
+    if: contains( github.event.pull_request.labels.*.name, 'authz')
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
diff --git a/.github/workflows/run-pdp.yaml b/.github/workflows/run-pdp.yaml
index e15768c..4f9f903 100644
--- a/.github/workflows/run-pdp.yaml
+++ b/.github/workflows/run-pdp.yaml
@@ -2,16 +2,14 @@ name: demo-run-pdp-and-tests
 
 on:
   pull_request:
-    branches:
-      - main
+    types: [synchronize]
 
 env:
   PROJECT_ID: 538e459351a847058fe28f1e6679b87b #Demo project id (under 'Permit.io Tests' workspace), project Demo
-  PR_LABEL: authz
 
 jobs:
   demo-run-pdp-and-tests:
-    if: ${{ github.event.label.name == 'env.PR_LABEL' }}
+    if: contains( github.event.pull_request.labels.*.name, 'authz')
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code