diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
index cbcd78e41..462e847a0 100644
--- a/.github/workflows/acceptance.yml
+++ b/.github/workflows/acceptance.yml
@@ -61,8 +61,8 @@ jobs:
     - name: Init Behat
       run: |
         export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
-        $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose exec -T webserver sh -c "php admin/tool/behat/cli/init.php"
+         $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose exec -T webserver sh -c "php admin/tool/behat/cli/init.php --parallel=8 --optimize-runs='@app&&$BEHAT_TAGS'"
     - name: Run Behat tests
       run: |
         export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
-        $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --verbose --tags='@app&&$BEHAT_TAGS' --auto-rerun"
+        $GITHUB_WORKSPACE/moodle-docker/bin/moodle-docker-compose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --verbose --tags='@app&&$BEHAT_TAGS' --auto-rerun=3"
diff --git a/.github/workflows/update_behat_plugin.yml b/.github/workflows/update_behat_plugin.yml
index 5699c45bb..d0d2a85ed 100644
--- a/.github/workflows/update_behat_plugin.yml
+++ b/.github/workflows/update_behat_plugin.yml
@@ -4,6 +4,7 @@ on: ['push']
 
 jobs:
   update:
+    if: github.repository == 'moodlehq/moodleapp' || github.repository == 'moodlemobile/moodleapp'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2