diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 2381227..a774217 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -12,30 +12,26 @@ jobs:
   build:
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
         phpunit: ['8.0', '9.0']
         composer-arg: ['']
-        include:
-          - php: '8.0'
-            phpunit: '9.0'
-            composer-arg: 'ignore-platform-req=php'
         exclude:
           - php: '8.0'
             phpunit: '8.0'
           - php: '7.2'
             phpunit: '9.0'
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.php == '8.0' }}
     name: PHP ${{ matrix.php }}, PHPUnit ${{ matrix.phpunit }}
     
     steps:
     - uses: actions/checkout@v1
       
     - name: Setup PHP
-      uses: shivammathur/setup-php@v1
+      uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
         extensions: mbstring, intl, json
+        ini-values: error_reporting=E_ALL
         coverage: pcov
         tools: composer:v2
     - name: Validate composer.json and composer.lock
diff --git a/.github/workflows/php_coverage.yml b/.github/workflows/php_coverage.yml
index a96b27b..aa8d8c1 100644
--- a/.github/workflows/php_coverage.yml
+++ b/.github/workflows/php_coverage.yml
@@ -12,9 +12,9 @@ jobs:
     - uses: actions/checkout@v1
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v1
+      uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: 8.0
         extensions: mbstring, intl, json
         coverage: pcov
     
@@ -22,7 +22,7 @@ jobs:
       run: composer install --prefer-dist --no-progress --no-suggest
   
     - name: Test & publish code coverage
-      uses: paambaati/codeclimate-action@v2.3.0
+      uses: paambaati/codeclimate-action@v3.0.0
       env:
         CC_TEST_REPORTER_ID: ${{ secrets.codeClimateReporterID }}
       with:
diff --git a/composer.json b/composer.json
index 306670a..91689da 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "softcreatr/jsonpath": "^0.7.2",
+        "softcreatr/jsonpath": "^0.7.2 || ^0.8",
         "justinrainbow/json-schema": "^5.0"
     },
     "conflict": {
diff --git a/phpunit.xml b/phpunit.xml
index 5f5d9b6..829a996 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,6 +6,7 @@
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
+        convertDeprecationsToExceptions="true"
         timeoutForSmallTests="1"
         timeoutForMediumTests="10"
         timeoutForLargeTests="60">