diff --git a/.github/workflows/moodle-plugin-ci.yml b/.github/workflows/moodle-plugin-ci.yml
index 113f7222f5a3f0d5660d6821aebbcbbd2b4f91af..b56a120c1060d2305d55b47a8c1614aeab08c3a1 100644
--- a/.github/workflows/moodle-plugin-ci.yml
+++ b/.github/workflows/moodle-plugin-ci.yml
@@ -4,11 +4,11 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     services:
       postgres:
-        image: postgres:10
+        image: postgres:12
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: plugin
 
@@ -108,4 +108,4 @@ jobs:
 
       - name: Behat features
         if: ${{ always() }}
-        run: moodle-plugin-ci behat --profile chrome --suite=boost_campus
+        run: moodle-plugin-ci behat --profile chrome --auto-rerun 0 --suite=boost_campus
diff --git a/CHANGES.md b/CHANGES.md
index 1d625a4e7b963c88ce7fd2a7e60fbf977f0f4164..57e26ce358d57522277d6910789b7253f01325b4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,10 @@ moodle-theme_boost_campus
 Changes
 -------
 
+### Unreleased
+
+* 2022-11-28 - Updated Moodle Plugin CI to latest upstream recommendations
+
 ### v3.11-r4
 
 * 2022-11-03 - Bugfix: Return Boost Campus favicon as moodle_url instead of string, solves #120.