diff --git a/.github/workflows/integration-mariadb.yml b/.github/workflows/integration-mariadb.yml
index f2f059520d0..c55c6a56aa8 100644
--- a/.github/workflows/integration-mariadb.yml
+++ b/.github/workflows/integration-mariadb.yml
@@ -54,11 +54,11 @@ jobs:
       matrix:
         test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
-        server-versions: ['master']
-        guests-versions: ['master']
-        circles-versions: ['master']
+        server-versions: ['stable30']
+        guests-versions: ['stable30']
+        circles-versions: ['stable30']
         call-summary-bot-versions: ['main']
-        notifications-versions: ['master']
+        notifications-versions: ['stable30']
 
     services:
       mariadb:
@@ -124,7 +124,7 @@ jobs:
           coverage: none
           ini-file: development
           # Temporary workaround for missing pcntl_* in PHP 8.3: ini-values: apc.enable_cli=on
-          ini-values: apc.enable_cli=on, disable_functions=          
+          ini-values: apc.enable_cli=on, disable_functions=
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -150,7 +150,7 @@ jobs:
           ./occ config:system:set debug --value=true --type=boolean
           ./occ config:system:set hashing_default_password --value=true --type=boolean
           ./occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
-          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"          
+          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
           ./occ app:enable --force ${{ env.APP_NAME }}
           ./occ app:enable --force call_summary_bot
           ./occ app:enable --force circles
diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml
index 43ea845410b..d15282ea7b3 100644
--- a/.github/workflows/integration-mysql.yml
+++ b/.github/workflows/integration-mysql.yml
@@ -54,11 +54,11 @@ jobs:
       matrix:
         test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
-        server-versions: ['master']
-        guests-versions: ['master']
-        circles-versions: ['master']
+        server-versions: ['stable30']
+        guests-versions: ['stable30']
+        circles-versions: ['stable30']
         call-summary-bot-versions: ['main']
-        notifications-versions: ['master']
+        notifications-versions: ['stable30']
 
     services:
       mysql:
@@ -124,7 +124,7 @@ jobs:
           coverage: none
           ini-file: development
           # Temporary workaround for missing pcntl_* in PHP 8.3: ini-values: apc.enable_cli=on
-          ini-values: apc.enable_cli=on, disable_functions=          
+          ini-values: apc.enable_cli=on, disable_functions=
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -150,7 +150,7 @@ jobs:
           ./occ config:system:set debug --value=true --type=boolean
           ./occ config:system:set hashing_default_password --value=true --type=boolean
           ./occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
-          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"          
+          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
           ./occ app:enable --force ${{ env.APP_NAME }}
           ./occ app:enable --force call_summary_bot
           ./occ app:enable --force circles
diff --git a/.github/workflows/integration-oci.yml b/.github/workflows/integration-oci.yml
index 4795494f3b9..027c80590c7 100644
--- a/.github/workflows/integration-oci.yml
+++ b/.github/workflows/integration-oci.yml
@@ -54,11 +54,11 @@ jobs:
       matrix:
         test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
-        server-versions: ['master']
-        guests-versions: ['master']
-        circles-versions: ['master']
+        server-versions: ['stable30']
+        guests-versions: ['stable30']
+        circles-versions: ['stable30']
         call-summary-bot-versions: ['main']
-        notifications-versions: ['master']
+        notifications-versions: ['stable30']
 
     services:
       oracle:
@@ -136,7 +136,7 @@ jobs:
           coverage: none
           ini-file: development
           # Temporary workaround for missing pcntl_* in PHP 8.3: ini-values: apc.enable_cli=on
-          ini-values: apc.enable_cli=on, disable_functions=          
+          ini-values: apc.enable_cli=on, disable_functions=
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -157,7 +157,7 @@ jobs:
           ./occ config:system:set debug --value=true --type=boolean
           ./occ config:system:set hashing_default_password --value=true --type=boolean
           ./occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
-          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"          
+          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
           ./occ app:enable --force ${{ env.APP_NAME }}
           ./occ app:enable --force call_summary_bot
           ./occ app:enable --force circles
diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml
index 00691c62bd9..7809a8561dc 100644
--- a/.github/workflows/integration-pgsql.yml
+++ b/.github/workflows/integration-pgsql.yml
@@ -51,11 +51,11 @@ jobs:
       matrix:
         test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.3']
-        server-versions: ['master']
-        guests-versions: ['master']
-        circles-versions: ['master']
+        server-versions: ['stable30']
+        guests-versions: ['stable30']
+        circles-versions: ['stable30']
         call-summary-bot-versions: ['main']
-        notifications-versions: ['master']
+        notifications-versions: ['stable30']
 
     services:
       postgres:
diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml
index cb7641e3d46..f0ed8b15922 100644
--- a/.github/workflows/integration-sqlite.yml
+++ b/.github/workflows/integration-sqlite.yml
@@ -54,11 +54,11 @@ jobs:
       matrix:
         test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
-        server-versions: ['master']
-        guests-versions: ['master']
-        circles-versions: ['master']
+        server-versions: ['stable30']
+        guests-versions: ['stable30']
+        circles-versions: ['stable30']
         call-summary-bot-versions: ['main']
-        notifications-versions: ['master']
+        notifications-versions: ['stable30']
 
     steps:
       - name: Set app env
@@ -115,7 +115,7 @@ jobs:
           coverage: none
           ini-file: development
           # Temporary workaround for missing pcntl_* in PHP 8.3: ini-values: apc.enable_cli=on
-          ini-values: apc.enable_cli=on, disable_functions=          
+          ini-values: apc.enable_cli=on, disable_functions=
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -136,7 +136,7 @@ jobs:
           ./occ config:system:set debug --value=true --type=boolean
           ./occ config:system:set hashing_default_password --value=true --type=boolean
           ./occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
-          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"          
+          ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
           ./occ app:enable --force ${{ env.APP_NAME }}
           ./occ app:enable --force call_summary_bot
           ./occ app:enable --force circles
diff --git a/.github/workflows/occ-command-documentation.yml b/.github/workflows/occ-command-documentation.yml
index 939592c37b9..92f2f7d9b00 100644
--- a/.github/workflows/occ-command-documentation.yml
+++ b/.github/workflows/occ-command-documentation.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.2']
-        server-versions: ['master']
+        server-versions: ['stable30']
 
     steps:
       - name: Set app env
diff --git a/composer.json b/composer.json
index f86d5406fa1..19b85434b44 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
 		"test:unit": "vendor/bin/phpunit -c tests/php/phpunit.xml --colors=always --fail-on-warning --fail-on-risky"
 	},
 	"require-dev": {
-		"nextcloud/ocp": "dev-master",
+		"nextcloud/ocp": "dev-stable30",
 		"roave/security-advisories": "dev-latest"
 	},
 	"require": {
diff --git a/composer.lock b/composer.lock
index 0ba7bc14b7f..fe41f7eb0b2 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": "47863e9129ef4e6fc6540db30e20cb77",
+    "content-hash": "ad9c34adc441c3e4dceb383db342d592",
     "packages": [
         {
             "name": "bamarni/composer-bin-plugin",
@@ -254,16 +254,16 @@
     "packages-dev": [
         {
             "name": "nextcloud/ocp",
-            "version": "dev-master",
+            "version": "dev-stable30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "161f383f539a05400c7cb4671c2fedaf0f0c17eb"
+                "reference": "2a005250064759f206aa1b5a1ee000dcd808ef5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/161f383f539a05400c7cb4671c2fedaf0f0c17eb",
-                "reference": "161f383f539a05400c7cb4671c2fedaf0f0c17eb",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/2a005250064759f206aa1b5a1ee000dcd808ef5b",
+                "reference": "2a005250064759f206aa1b5a1ee000dcd808ef5b",
                 "shasum": ""
             },
             "require": {
@@ -273,11 +273,10 @@
                 "psr/event-dispatcher": "^1.0",
                 "psr/log": "^1.1.4"
             },
-            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "30.0.0-dev"
+                    "dev-stable30": "30.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -293,9 +292,9 @@
             "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
             "support": {
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
-                "source": "https://github.com/nextcloud-deps/ocp/tree/master"
+                "source": "https://github.com/nextcloud-deps/ocp/tree/stable30"
             },
-            "time": "2024-08-08T00:38:08+00:00"
+            "time": "2024-08-14T08:51:38+00:00"
         },
         {
             "name": "psr/clock",