diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
index 3ccb04174..5c9e4ad0a 100644
--- a/.github/workflows/npm-audit-fix.yml
+++ b/.github/workflows/npm-audit-fix.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'stable8.3', 'stable8.5', 'stable8.6']
+        branches: ['main', 'stable8.3', 'stable8.6']
 
     name: npm-audit-fix-${{ matrix.branches }}
 
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index f2d9a62d2..bc6d28509 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -55,10 +55,6 @@ jobs:
         php-versions: ['8.2', '8.3', '8.4', '8.5']
         databases: ['sqlite']
         server-versions: ['master']
-        include:
-          - php-versions: '8.1'
-            databases: 'sqlite'
-            server-versions: 'stable32'
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -131,7 +127,7 @@ jobs:
       matrix:
         php-versions: ['8.4']
         databases: ['mysql']
-        server-versions: ['master', 'stable34', 'stable33', 'stable32']
+        server-versions: ['master', 'stable34', 'stable33']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -208,14 +204,7 @@ jobs:
       matrix:
         php-versions: ['8.5']
         databases: ['pgsql']
-        server-versions: ['master', 'stable34', 'stable33', 'stable32']
-        exclude:
-          - php-versions: '8.5'
-            server-versions: 'stable32'
-        include:
-          - php-versions: '8.1'
-            databases: 'pgsql'
-            server-versions: 'stable32'
+        server-versions: ['master', 'stable34', 'stable33']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
diff --git a/.tx/backport b/.tx/backport
index 1fc990748..93b0d0335 100644
--- a/.tx/backport
+++ b/.tx/backport
@@ -1,3 +1,2 @@
 stable8.3
-stable8.5
 stable8.6
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 9a7a6c71c..a5bcb68a9 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -44,7 +44,7 @@
 
 	<dependencies>
 		<php min-version="8.1" max-version="8.5" />
-		<nextcloud min-version="32" max-version="35" />
+		<nextcloud min-version="33" max-version="35" />
 	</dependencies>
 
 	<background-jobs>
diff --git a/psalm.xml b/psalm.xml
index 3d82906a8..c6462483f 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -12,7 +12,7 @@
 	findUnusedCode="false"
 	findUnusedBaselineEntry="false"
 	findMissingOverrideAttribte="false"
-	phpVersion="8.1"
+	phpVersion="8.2"
 >
 	<projectFiles>
 		<directory name="lib" />
diff --git a/renovate.json b/renovate.json
index c5013a35d..886e963de 100644
--- a/renovate.json
+++ b/renovate.json
@@ -22,7 +22,7 @@
 	"ignoreUnstable": false,
 	"baseBranches": [
 		"main",
-		"stable8.5",
+		"stable8.6",
 		"stable8.3"
 	],
 	"enabledManagers": [