diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad632e4c7ca..08316c0f125 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.2, 8.3]
+        php: [8.1, 8.2, 8.3, 8.4]
 
     steps:
       - name: Generate french locale.
diff --git a/.github/workflows/ci-mssql.yml b/.github/workflows/ci-mssql.yml
index 74a46ade0ad..da98bd14d51 100644
--- a/.github/workflows/ci-mssql.yml
+++ b/.github/workflows/ci-mssql.yml
@@ -19,22 +19,13 @@ jobs:
 
     strategy:
         matrix:
-            os:
-              - ubuntu-latest
-
-            php:
-              - 8.1
-              - 8.2
-              - 8.3
-
-            mssql:
-              - server:2017-latest
-              - server:2019-latest
-              - server:2022-latest
+            os: [ubuntu-latest]
+            php: [8.1, 8.2, 8.3, 8.4]
+            mssql: [2017-latest, 2019-latest, 2022-latest]
 
     services:
       mssql:
-          image: mcr.microsoft.com/mssql/${{ matrix.mssql }}
+          image: mcr.microsoft.com/mssql/server:${{ matrix.mssql }}
           env:
               SA_PASSWORD: YourStrong!Passw0rd
               ACCEPT_EULA: Y
diff --git a/.github/workflows/ci-mysql.yml b/.github/workflows/ci-mysql.yml
index 034293fed70..b7da4bbc5d1 100644
--- a/.github/workflows/ci-mysql.yml
+++ b/.github/workflows/ci-mysql.yml
@@ -18,17 +18,9 @@ jobs:
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
-        php:
-          - 8.1
-          - 8.2
-          - 8.3
-
-        mysql:
-          - 5.7
-          - latest
+        os: [ubuntu-latest]
+        php: [8.1, 8.2, 8.3, 8.4]
+        mysql: [5.7, latest]
 
     services:
       mysql:
diff --git a/.github/workflows/ci-pgsql.yml b/.github/workflows/ci-pgsql.yml
index 7b9506007e1..3d039a0ae10 100644
--- a/.github/workflows/ci-pgsql.yml
+++ b/.github/workflows/ci-pgsql.yml
@@ -18,21 +18,9 @@ jobs:
 
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-
-        php:
-          - 8.1
-          - 8.2
-          - 8.3
-
-        pgsql:
-          - 10
-          - 11
-          - 12
-          - 13
-          - 14
-          - 15
+        os: [ubuntu-latest]
+        php: [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 b7857e85249..c2e2d364ad2 100644
--- a/.github/workflows/ci-sqlite.yml
+++ b/.github/workflows/ci-sqlite.yml
@@ -19,13 +19,8 @@ jobs:
 
     strategy:
         matrix:
-            os:
-              - ubuntu-latest
-
-            php:
-              - 8.1
-              - 8.2
-              - 8.3
+            os: [ubuntu-latest]
+            php: [8.1, 8.2, 8.3, 8.4]
 
     steps:
       - name: Checkout.