diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25996fc5..71c98dfa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,6 +35,12 @@ jobs:
           - php: 8.3
             moodle-branch: main
             database: mariadb
+          - php: 8.3
+            moodle-branch: MOODLE_500_STABLE
+            database: pgsql
+          - php: 8.3
+            moodle-branch: MOODLE_405_STABLE
+            database: pgsql
           - php: 8.3
             moodle-branch: MOODLE_404_STABLE
             database: pgsql
@@ -50,36 +56,21 @@ jobs:
             moodle-branch: MOODLE_401_STABLE
             database: pgsql
 
-          - php: 8.0
-            moodle-branch: MOODLE_400_STABLE
-            database: pgsql
-            # The following line is only needed if you're going to run php8 jobs and your
-            # plugin needs xmlrpc services.
-            extensions: xmlrpc-beta
-          - php: 8.0
-            moodle-branch: MOODLE_311_STABLE
-            database: pgsql
-            # The following line is only needed if you're going to run php8 jobs and your
-            # plugin needs xmlrpc services.
-            extensions: xmlrpc-beta
-
-          - php: 7.4
-            moodle-branch: MOODLE_310_STABLE
-            database: pgsql
-          - php: 7.4
-            moodle-branch: MOODLE_39_STABLE
-            database: pgsql
-          - php: 7.4
-            moodle-branch: MOODLE_38_STABLE
-            database: pgsql
 
           # Lowest php versions supported by each branch (with main always being tested twice).
-          - php: 8.1
+          - php: 8.2
             moodle-branch: main
             database: pgsql
-          - php: 8.1
+          - php: 8.2
             moodle-branch: main
             database: mariadb
+          - php: 8.2
+            moodle-branch: MOODLE_500_STABLE
+            database: pgsql
+
+          - php: 8.1
+            moodle-branch: MOODLE_405_STABLE
+            database: pgsql
           - php: 8.1
             moodle-branch: MOODLE_404_STABLE
             database: pgsql