diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
index 4217c43..648e206 100644
--- a/.github/workflows/moodle-ci.yml
+++ b/.github/workflows/moodle-ci.yml
@@ -40,9 +40,6 @@ jobs:
           - php: '8.2'
             moodle-branch: 'MOODLE_403_STABLE'
             database: 'mariadb'
-          - php: '8.1'
-            moodle-branch: 'MOODLE_402_STABLE'
-            database: 'pgsql'
 
     steps:
       - name: Check out repository code
@@ -73,6 +70,7 @@ jobs:
         env:
           DB: ${{ matrix.database }}
           MOODLE_BRANCH: ${{ matrix.moodle-branch }}
+          MUSTACHE_EXCLUDE_NAMES: 'peergrade_start.mustache,peergrade_end.mustache'
           # Uncomment this to run Behat tests using the Moodle App.
           # MOODLE_APP: 'true'
 
@@ -101,10 +99,9 @@ jobs:
         if: ${{ !cancelled() }}
         run: moodle-plugin-ci savepoints
 
-#      Commenting out as we currently have to split templates into parts which fail this test
-#      - name: Mustache Lint
-#        if: ${{ !cancelled() }}
-#        run: moodle-plugin-ci mustache
+      - name: Mustache Lint
+        if: ${{ !cancelled() }}
+        run: moodle-plugin-ci mustache
 
       - name: Grunt
         if: ${{ !cancelled() }}
diff --git a/version.php b/version.php
index bd7364f..12e9180 100644
--- a/version.php
+++ b/version.php
@@ -29,6 +29,7 @@
 $plugin->component = 'mod_peerwork';
 $plugin->maturity = MATURITY_STABLE;
 $plugin->release = '4.2.0';
+$plugin->supported = [403, 405];
 $plugin->dependencies = [
     'peerworkcalculator_webpa' => 2020052200,
 ];