diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b2cc61a4f5b..876d76610d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,6 +69,10 @@ jobs:
             extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
             coverage: none
             os: ubuntu-latest
+          - php: 8.4
+            extensions: apcu, curl, dom, imagick, intl, mbstring, mcrypt, memcached
+            coverage: none
+            os: ubuntu-latest
 
     steps:
       - name: Generate french locale.
diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml
index e80550119d0..b29e36b5456 100644
--- a/.github/workflows/ci-mssql.yml
+++ b/.github/workflows/ci-mssql.yml
@@ -31,6 +31,8 @@ jobs:
             mssql: server:2022-latest
           - php: 8.3
             mssql: server:2022-latest
+          - php: 8.4
+            mssql: server:2022-latest
 
     services:
       mssql:
diff --git a/.github/workflows/ci-mysql.yml b/.github/workflows/ci-mysql.yml
index 4e0f651aae9..c4a98556972 100644
--- a/.github/workflows/ci-mysql.yml
+++ b/.github/workflows/ci-mysql.yml
@@ -19,19 +19,9 @@ jobs:
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
-        php:
-          - 7.4
-          - 8.0
-          - 8.1
-          - 8.2
-          - 8.3
-
-        mysql:
-          - 5.7
-          - latest
+        os: [ubuntu-latest]
+        php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
+        mysql: [5.7, latest]
 
     services:
       mysql:
diff --git a/.github/workflows/ci-oracle.yml b/.github/workflows/ci-oracle.yml
index be139ff540c..42f12dbbcd3 100644
--- a/.github/workflows/ci-oracle.yml
+++ b/.github/workflows/ci-oracle.yml
@@ -20,11 +20,8 @@ jobs:
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
-        php:
-          - 7.4
+        os: [ubuntu-latest]
+        php: [7.4]
 
     services:
       oci:
diff --git a/.github/workflows/ci-pgsql.yml b/.github/workflows/ci-pgsql.yml
index ba0217e2212..c1af0205684 100644
--- a/.github/workflows/ci-pgsql.yml
+++ b/.github/workflows/ci-pgsql.yml
@@ -19,23 +19,9 @@ jobs:
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
-        php:
-          - 7.4
-          - 8.0
-          - 8.1
-          - 8.2
-          - 8.3
-
-        pgsql:
-          - 10
-          - 11
-          - 12
-          - 13
-          - 14
-          - 15
+        os: [ubuntu-latest]
+        php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
+        pgsql: [10, 11, 12, 13, 14, 15]
 
     services:
       postgres:
diff --git a/.github/workflows/ci-sqlite.yml b/.github/workflows/ci-sqlite.yml
index 707ecb1b9aa..03648262d99 100644
--- a/.github/workflows/ci-sqlite.yml
+++ b/.github/workflows/ci-sqlite.yml
@@ -20,15 +20,8 @@ jobs:
 
     strategy:
         matrix:
-            os:
-              - ubuntu-latest
-
-            php:
-              - 7.4
-              - 8.0
-              - 8.1
-              - 8.2
-              - 8.3
+            os: [ubuntu-latest]
+            php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
 
     steps:
       - name: Checkout.