diff --git a/.github/workflows/monorepo-split.yml b/.github/workflows/monorepo-split.yml
index 2af1e7871..bfbbea88c 100644
--- a/.github/workflows/monorepo-split.yml
+++ b/.github/workflows/monorepo-split.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
 
       - name: Install dependencies
diff --git a/.github/workflows/normalize-composer.yml b/.github/workflows/normalize-composer.yml
index d1219a5b5..1d079020a 100644
--- a/.github/workflows/normalize-composer.yml
+++ b/.github/workflows/normalize-composer.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       php:
-        default: '8.3'
+        default: '8.4'
         type: string
         description: The PHP version to use
         required: false
diff --git a/.github/workflows/subtree-pr-close.yml b/.github/workflows/subtree-pr-close.yml
index eef7eead3..cb1e0e312 100644
--- a/.github/workflows/subtree-pr-close.yml
+++ b/.github/workflows/subtree-pr-close.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
 
       - name: Install dependencies
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 19cbb60dc..7ca6be176 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,12 +7,12 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       max-parallel: 15
       fail-fast: true
       matrix:
-        php-versions: [ '8.1', '8.2', '8.3' ]
+        php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
 
     name: PHP ${{ matrix.php-versions }}
     steps: