diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 52eb2c4f4..149436a08 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -20,6 +20,7 @@ jobs:
       matrix:
         php-versions: ['7.3', '7.4']
         databases: ['sqlite']
+        server-versions: ['stable22']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -28,7 +29,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: nextcloud/server
-          ref: ${{ env.GITHUB_BASE_REF }}
+          ref: ${{ matrix.server-versions }}
 
       - name: Checkout submodules
         shell: bash
@@ -80,6 +81,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['mysql']
+        server-versions: ['stable22']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -97,7 +99,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: nextcloud/server
-          ref: ${{ env.GITHUB_BASE_REF }}
+          ref: ${{ matrix.server-versions }}
 
       - name: Checkout submodules
         shell: bash
@@ -149,6 +151,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['pgsql']
+        server-versions: ['stable22']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -168,7 +171,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: nextcloud/server
-          ref: ${{ env.GITHUB_BASE_REF }}
+          ref: ${{ matrix.server-versions }}
 
       - name: Checkout submodules
         shell: bash
@@ -220,6 +223,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['oci']
+        server-versions: ['stable22']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -234,7 +238,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: nextcloud/server
-          ref: ${{ env.GITHUB_BASE_REF }}
+          ref: ${{ matrix.server-versions }}
 
       - name: Checkout submodules
         shell: bash
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 56d47bf27..6a3fa3ae5 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -7,7 +7,7 @@ jobs:
       runs-on: ubuntu-latest
       strategy:
           matrix:
-              ocp-version: [ 'dev-master' ]
+              ocp-version: [ 'dev-stable22' ]
       name: Nextcloud ${{ matrix.ocp-version }}
       steps:
           - name: Checkout