diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c442651..e6540da 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,7 +4,6 @@ env:
     EXTNAME: rmcgirr83/activity24hours # Your extension vendor/package name
     SNIFF: 1            # Run code sniffer on your code? 1 or 0
     IMAGE_ICC: 1        # Run icc profile sniffer on your images? 1 or 0
-    EPV: 1              # Run EPV (Extension Pre Validator) on your code? 1 or 0
     EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
     PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
 
@@ -19,7 +18,7 @@ on:
             - develop
 
 jobs:
-    # START Basic Checks Job (EPV, code sniffer, images check, etc.)
+    # START Basic Checks Job (code sniffer, images check, etc.)
     basic-checks:
         runs-on: ubuntu-24.04
         strategy:
@@ -59,11 +58,6 @@ jobs:
               run: .github/setup-phpbb.sh $DB $PHP_VERSION $NOTESTS
               working-directory: ./phpBB3
 
-            - name: Setup EPV
-              if: ${{ env.EPV != 0 }}
-              run: composer require phpbb/epv:dev-master --dev --no-interaction --ignore-platform-reqs
-              working-directory: ./phpBB3/phpBB
-
             - name: Run code sniffer
               if: ${{ env.SNIFF != 0 }}
               env:
@@ -80,9 +74,11 @@ jobs:
               if: ${{ env.EXECUTABLE_FILES != 0 }}
               run: .github/ext-check-executable-files.sh ./ $EXTNAME
               working-directory: ./phpBB3
-
-            - name: Run EPV
-              if: ${{ env.EPV != 0 }}
-              run: phpBB/vendor/bin/EPV.php run --dir="phpBB/ext/$EXTNAME/"
-              working-directory: ./phpBB3
     # END Basic Checks Job
+
+    # EPV (Extension Pre Validator), failing on any Fatal or Error finding not
+    # listed in .github/epv-allowed.txt
+    epv:
+        uses: phpbbmodders/.github/.github/workflows/epv.yml@v1
+        with:
+            EXTNAME: rmcgirr83/activity24hours