diff --git a/.github/workflows/cpp20.yml b/.github/workflows/cpp20.yml
index 9f98f97f9..597215fd5 100644
--- a/.github/workflows/cpp20.yml
+++ b/.github/workflows/cpp20.yml
@@ -4,7 +4,7 @@ on:
     branches:
       - 'master'
   pull_request:
-    types: ['labeled']
+    types: ['labeled', 'labeled', 'opened', 'synchronize', 'reopened']
 
 concurrency:
   group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
@@ -17,7 +17,7 @@ jobs:
     env:
       COMPILER: clang
       ENABLE_CPP_20: 1
-    if: github.repository == 'azerothcore/azerothcore-wotlk' && (github.event.label.name == 'file-cpp' || github.event.label.name == 'run-build' || github.ref == 'refs/heads/master')
+    if: github.repository == 'azerothcore/azerothcore-wotlk' && (contains(github.event.pull_request.labels.*.name, 'file-cpp') || github.event.label.name == 'file-cpp' || github.event.label.name == 'run-build' || github.ref == 'refs/heads/master')
     steps:
       - uses: actions/checkout@v2
       - name: Cache