diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index 7c970262a..a3b84a859 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0', '8.1']
-        server-versions: ['master']
+        server-versions: ['stable27']
 
     services:
       mysql:
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index 3744e698e..8927f7c26 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable27']
 
     services:
       oracle:
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index 1acbcc33e..72032e6f7 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable27']
 
     services:
       postgres:
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index f8202637c..b5bf78766 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable27']
 
     steps:
       - name: Set app env
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
new file mode 100644
index 000000000..8080640ff
--- /dev/null
+++ b/.github/workflows/psalm.yml
@@ -0,0 +1,42 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Static analysis
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+      - stable*
+
+concurrency:
+  group: psalm-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  static-analysis:
+    runs-on: ubuntu-latest
+
+    name: Nextcloud
+    steps:
+      - name: Checkout
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+
+      - name: Set up php
+        uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
+        with:
+          php-version: 8.1
+          coverage: none
+          ini-file: development
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install dependencies
+        run: composer i
+
+      - name: Run coding standards check
+        run: composer run psalm
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
deleted file mode 100644
index ed905984d..000000000
--- a/.github/workflows/static-analysis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Static analysis
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  static-psalm-analysis:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        ocp-version: [ 'dev-master' ]
-
-    name: Nextcloud ${{ matrix.ocp-version }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-
-      - name: Set up php
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.0
-          coverage: none
-
-      - name: Install dependencies
-        run: composer i
-
-      - name: Install dependencies
-        run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
-
-      - name: Run coding standards check
-        run: composer run psalm
diff --git a/composer.json b/composer.json
index e992a6020..b7d117bca 100644
--- a/composer.json
+++ b/composer.json
@@ -35,6 +35,6 @@
     "phpunit/phpunit": "^9.5",
     "vimeo/psalm": "^4.22",
     "nextcloud/coding-standard": "^1.0",
-    "nextcloud/ocp": "dev-master"
+    "nextcloud/ocp": "dev-stable27"
   }
 }
diff --git a/composer.lock b/composer.lock
index cf41e39ba..41047fa7b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4202cbee01e48850ef10cf1e6de9f469",
+    "content-hash": "4ae184aa84e590422e78b141442b211e",
     "packages": [],
     "packages-dev": [
         {
@@ -1112,16 +1112,16 @@
         },
         {
             "name": "nextcloud/ocp",
-            "version": "dev-master",
+            "version": "dev-stable27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "0d48464588287f0300fc6b9a8f1cd5f827a0e2e3"
+                "reference": "92f707dc8f36a76ddfed4d52d999d672613a4748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/0d48464588287f0300fc6b9a8f1cd5f827a0e2e3",
-                "reference": "0d48464588287f0300fc6b9a8f1cd5f827a0e2e3",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/92f707dc8f36a76ddfed4d52d999d672613a4748",
+                "reference": "92f707dc8f36a76ddfed4d52d999d672613a4748",
                 "shasum": ""
             },
             "require": {
@@ -1131,7 +1131,6 @@
                 "psr/event-dispatcher": "^1.0",
                 "psr/log": "^1.1"
             },
-            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1153,7 +1152,7 @@
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
                 "source": "https://github.com/nextcloud-deps/ocp/tree/master"
             },
-            "time": "2023-01-31T00:40:45+00:00"
+            "time": "2023-05-17T10:58:24+00:00"
         },
         {
             "name": "nikic/php-parser",