diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
index 506c8e5f5..ca16c9990 100644
--- a/.github/workflows/npm-audit-fix.yml
+++ b/.github/workflows/npm-audit-fix.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
+        branches: ['stable7.0']
 
     name: npm-audit-fix-${{ matrix.branches }}
 
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 275c1c357..d229123af 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -20,9 +20,13 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: [ '8.1', '8.2', '8.3' ]
         databases: ['sqlite']
-        server-versions: ['master', 'stable30']
+        server-versions: ['stable31', 'stable30']
+        include:
+          - php-versions: '8.4'
+            databases: 'sqlite'
+            server-versions: 'stable31'
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -86,9 +90,13 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2', '8.3', '8.4']
+        php-versions: ['8.1', '8.2', '8.3']
         databases: ['mysql']
-        server-versions: ['master', 'stable30']
+        server-versions: ['stable31', 'stable30']
+        include:
+          - php-versions: '8.4'
+            databases: 'mysql'
+            server-versions: 'stable31'
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -232,4 +240,4 @@ jobs:
       - name : Mysql test status
         run: if ${{ needs.mysql.result != 'success' && needs.mysql.result != 'skipped' }}; then exit 1; fi
       - name : Pgsql test status
-        run: if ${{ needs.pgsql.result != 'success' && needs.pgsql.result != 'skipped' }}; then exit 1; fi    
\ No newline at end of file
+        run: if ${{ needs.pgsql.result != 'success' && needs.pgsql.result != 'skipped' }}; then exit 1; fi