diff --git a/.github/workflows/moodle-plugin-ci.yml b/.github/workflows/moodle-plugin-ci.yml
index ddcb8b8..a7e30a4 100644
--- a/.github/workflows/moodle-plugin-ci.yml
+++ b/.github/workflows/moodle-plugin-ci.yml
@@ -30,12 +30,30 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php: ['8.0', '8.1']
+          - php: '8.0'
             moodle-branch: 'MOODLE_402_STABLE'
-            database: [pgsql, mariadb]
-          - php: ['7.4', '8.0']
+            database: pgsql
+          - php: '8.1'
+            moodle-branch: 'MOODLE_402_STABLE'
+            database: pgsql
+          - php: '8.0'
+            moodle-branch: 'MOODLE_402_STABLE'
+            database: mariadb
+          - php: '8.1'
+            moodle-branch: 'MOODLE_402_STABLE'
+            database: mariadb
+          - php: '8.0'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: pgsql
+          - php: '7.4'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: pgsql
+          - php: '8.0'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: mariadb
+          - php: '7.4'
             moodle-branch: 'MOODLE_401_STABLE'
-            database: [pgsql, mariadb]
+            database: mariadb
 
     steps:
       - name: Check out repository code