diff --git a/.github/workflows/moodle-ci-dev.yml b/.github/workflows/moodle-ci-dev.yml
index cd0751cd..9dc6aaa5 100644
--- a/.github/workflows/moodle-ci-dev.yml
+++ b/.github/workflows/moodle-ci-dev.yml
@@ -31,11 +31,8 @@ jobs:
       fail-fast: false
       matrix:
         php: ['8.1', '8.2', '8.3']
-        moodle-branch: ['MOODLE_402_STABLE', 'MOODLE_404_STABLE', 'master']
+        moodle-branch: ['MOODLE_404_STABLE', 'MOODLE_405_STABLE', 'master']
         database: [pgsql, mariadb]
-        exclude:
-          - php: 8.3
-            moodle-branch: MOODLE_402_STABLE
 
     steps:
       - name: Check out repository code
diff --git a/.github/workflows/moodle-ci-legacy.yml b/.github/workflows/moodle-ci-legacy.yml
index c26f1125..a1c16c07 100644
--- a/.github/workflows/moodle-ci-legacy.yml
+++ b/.github/workflows/moodle-ci-legacy.yml
@@ -30,9 +30,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4']
-        moodle-branch: ['MOODLE_39_STABLE', 'MOODLE_310_STABLE']
+        php: ['7.4', '8.0']
+        moodle-branch: ['MOODLE_39_STABLE', 'MOODLE_310_STABLE', 'MOODLE_311_STABLE', 'MOODLE_400_STABLE']
         database: [pgsql, mariadb]
+        exclude:
+          - php: '8.0'
+            moodle-branch: MOODLE_39_STABLE
+          - database: '8.0'
+            moodle-branch: MOODLE_310_STABLE
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -114,7 +119,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y valgrind
 
-
       - name: Tests of VPL default "Basic I/O test" for students' programs
         if: ${{ always() }}
         run: ./plugin/tests/vpl_evaluate/test_vpl_evaluate.sh
diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
index ee32e6b6..f6be3f9f 100644
--- a/.github/workflows/moodle-ci.yml
+++ b/.github/workflows/moodle-ci.yml
@@ -30,37 +30,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1']
-        moodle-branch: ['MOODLE_311_STABLE', 'MOODLE_400_STABLE', 'MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE', 'MOODLE_404_STABLE', 'MOODLE_405_STABLE']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_403_STABLE', 'MOODLE_404_STABLE', 'MOODLE_405_STABLE']
         database: [pgsql, mariadb]
-        # Removes incompatible combinations and reduces DB versions
+        # Reduces DB versions
         exclude:
-          - php: 7.4
-            moodle-branch: MOODLE_402_STABLE
-          - php: 7.4
-            moodle-branch: MOODLE_403_STABLE
-          - php: 7.4
-            moodle-branch: MOODLE_404_STABLE
-          - php: 7.4
-            moodle-branch: MOODLE_405_STABLE
-          - php: 8.0
-            moodle-branch: MOODLE_404_STABLE
-          - php: 8.0
-            moodle-branch: MOODLE_405_STABLE
-          - php: 8.1
-            moodle-branch: MOODLE_311_STABLE
-          - php: 8.1
-            moodle-branch: MOODLE_400_STABLE
-          - database: pgsql
-            moodle-branch: MOODLE_311_STABLE
-          - database: pgsql
-            moodle-branch: MOODLE_400_STABLE
-          - database: pgsql
-            moodle-branch: MOODLE_401_STABLE
+          - php: '7.4'
+            moodle-branch: 'MOODLE_403_STABLE'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_404_STABLE'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_405_STABLE'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_404_STABLE'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_404_STABLE'
           - database: pgsql
             moodle-branch: MOODLE_402_STABLE
           - database: pgsql
             moodle-branch: MOODLE_403_STABLE
+          - database: pgsql
+            moodle-branch: MOODLE_404_STABLE
 
     steps:
       - name: Check out repository code