diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml
index 943e1f509d335..b5b38cd888b1c 100644
--- a/.github/workflows/update-psalm-baseline.yml
+++ b/.github/workflows/update-psalm-baseline.yml
@@ -1,47 +1,53 @@
 name: Update Psalm baseline
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '5 4 * * *'
 
 jobs:
   update-psalm-baseline:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v2
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        with:
+          submodules: true
+
       - name: Set up php7.4
-        uses: shivammathur/setup-php@master
+        uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
           extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
+
       - name: Composer install
-        run: composer i
+        run: composer install
+
       - name: Psalm
         run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
-      - name: Reset composer.json and composer.lock
+        continue-on-error: true
+
+      - name: Reset composer
         run: |
-          rm -rf lib/composer
-          git checkout -- composer.json composer.lock lib/composer
+          git clean -f lib/composer
+          git checkout composer.json composer.lock lib/composer
+
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          token: ${{ secrets.MACHINE_USER_PAT }}
-          push-to-fork: nextcloud-pr-bot/server
+          token: ${{ secrets.COMMAND_BOT_PAT }}
           commit-message: Update psalm baseline
           committer: GitHub <noreply@github.com>
-          author: Nextcloud-PR-Bot <nextcloud-pr-bot@users.noreply.github.com>
+          author: nextcloud-command <nextcloud-command@users.noreply.github.com>
           signoff: true
           branch: automated/noid/psalm-baseline-update
+          # Make sure we can open multiple PRs
+          branch-suffix: timestamp
           title: '[Automated] Update psalm-baseline.xml'
           body: |
             Auto-generated update psalm-baseline.xml with fixed psalm warnings
           labels: |
             automated pr
-          reviewers: juliushaertl, artonge, kesselb
+            3. to review
+          team-reviewers: server-backend