diff --git a/brancher/branch.php b/brancher/branch.php
index ee23133..593bb3d 100644
--- a/brancher/branch.php
+++ b/brancher/branch.php
@@ -20,6 +20,7 @@
 	'nextcloud/app_api',
 	'nextcloud/bruteforcesettings',
 	'nextcloud/circles',
+	'nextcloud/dbdoctor',
 	'nextcloud/documentation',
 	'nextcloud/example-files',
 	'nextcloud/files_downloadlimit',
diff --git a/label-updater/config.json b/label-updater/config.json
index ddf53d9..ba3b325 100644
--- a/label-updater/config.json
+++ b/label-updater/config.json
@@ -9,6 +9,7 @@
     "bruteforcesettings",
     "circles",
     "data_request",
+    "dbdoctor",
     "documentation",
     "end_to_end_encryption",
     "external",
diff --git a/milestoneupdater/config.json b/milestoneupdater/config.json
index 4ebe541..2288709 100644
--- a/milestoneupdater/config.json
+++ b/milestoneupdater/config.json
@@ -6,6 +6,7 @@
     "app_api",
     "bruteforcesettings",
     "circles",
+    "dbdoctor",
     "documentation",
     "example-files",
     "files_downloadlimit",
diff --git a/tagger/tag.php b/tagger/tag.php
index 34cc72b..b910115 100644
--- a/tagger/tag.php
+++ b/tagger/tag.php
@@ -21,12 +21,15 @@
 }
 
 switch($originalBranch) {
-	case 'stable21':
+	case 'stable22':
+	case 'stable23':
+	case 'stable24':
 		// keep them in sync with the ones from brancher/branch.php
 		$repositories = [
 			'nextcloud/server',
 			'nextcloud/3rdparty',
 			'nextcloud/activity',
+			'nextcloud/circles',
 			'nextcloud/example-files',
 			'nextcloud/files_pdfviewer',
 			'nextcloud/files_rightclick',
@@ -47,19 +50,18 @@
 			'nextcloud-gmbh/support',
 		];
 		break;
-	case 'stable22':
-	case 'stable23':
-	case 'stable24':
-		// keep them in sync with the ones from brancher/branch.php
+	case 'stable25':
+	case 'stable26':
+	case 'stable27':
 		$repositories = [
 			'nextcloud/server',
 			'nextcloud/3rdparty',
 			'nextcloud/activity',
+			'nextcloud/bruteforcesettings',
 			'nextcloud/circles',
 			'nextcloud/example-files',
 			'nextcloud/files_pdfviewer',
 			'nextcloud/files_rightclick',
-			'nextcloud/files_videoplayer',
 			'nextcloud/firstrunwizard',
 			'nextcloud/logreader',
 			'nextcloud/nextcloud_announcements',
@@ -68,17 +70,18 @@
 			'nextcloud/photos',
 			'nextcloud/privacy',
 			'nextcloud/recommendations',
+			'nextcloud/related_resources',
 			'nextcloud/serverinfo',
 			'nextcloud/survey_client',
+			'nextcloud/suspicious_login',
 			'nextcloud/text',
+			'nextcloud/twofactor_totp',
 			'nextcloud/updater',
 			'nextcloud/viewer',
 			'nextcloud-gmbh/support',
 		];
 		break;
-	case 'stable25':
-	case 'stable26':
-	case 'stable27':
+	case 'stable28':
 		$repositories = [
 			'nextcloud/server',
 			'nextcloud/3rdparty',
@@ -87,7 +90,6 @@
 			'nextcloud/circles',
 			'nextcloud/example-files',
 			'nextcloud/files_pdfviewer',
-			'nextcloud/files_rightclick',
 			'nextcloud/firstrunwizard',
 			'nextcloud/logreader',
 			'nextcloud/nextcloud_announcements',
@@ -107,14 +109,16 @@
 			'nextcloud-gmbh/support',
 		];
 		break;
-	case 'stable28':
+	case 'stable29':
 		$repositories = [
 			'nextcloud/server',
 			'nextcloud/3rdparty',
 			'nextcloud/activity',
+			'nextcloud/app_api',
 			'nextcloud/bruteforcesettings',
 			'nextcloud/circles',
 			'nextcloud/example-files',
+			'nextcloud/files_downloadlimit',
 			'nextcloud/files_pdfviewer',
 			'nextcloud/firstrunwizard',
 			'nextcloud/logreader',
@@ -135,7 +139,10 @@
 			'nextcloud-gmbh/support',
 		];
 		break;
-	case 'stable29':
+	case 'stable30':
+	case 'stable31':
+	case 'stable32':
+	case 'stable33':
 		$repositories = [
 			'nextcloud/server',
 			'nextcloud/3rdparty',
@@ -143,6 +150,7 @@
 			'nextcloud/app_api',
 			'nextcloud/bruteforcesettings',
 			'nextcloud/circles',
+			'nextcloud/documentation',
 			'nextcloud/example-files',
 			'nextcloud/files_downloadlimit',
 			'nextcloud/files_pdfviewer',
@@ -159,16 +167,14 @@
 			'nextcloud/survey_client',
 			'nextcloud/suspicious_login',
 			'nextcloud/text',
+			'nextcloud/twofactor_nextcloud_notification',
 			'nextcloud/twofactor_totp',
 			'nextcloud/updater',
 			'nextcloud/viewer',
 			'nextcloud-gmbh/support',
 		];
 		break;
-	case 'stable30':
-	case 'stable31':
-	case 'stable32':
-	case 'stable33':
+	case 'stable34':
 		$repositories = [
 			'nextcloud/server',
 			'nextcloud/3rdparty',
@@ -180,10 +186,12 @@
 			'nextcloud/example-files',
 			'nextcloud/files_downloadlimit',
 			'nextcloud/files_pdfviewer',
+			'nextcloud/files_lock',
 			'nextcloud/firstrunwizard',
 			'nextcloud/logreader',
 			'nextcloud/nextcloud_announcements',
 			'nextcloud/notifications',
+			'nextcloud/office',
 			'nextcloud/password_policy',
 			'nextcloud/photos',
 			'nextcloud/privacy',
@@ -200,7 +208,7 @@
 			'nextcloud-gmbh/support',
 		];
 		break;
-	case 'stable34':
+	case 'stable35':
 	case 'master':
 		$repositories = [
 			'nextcloud/server',
@@ -209,6 +217,7 @@
 			'nextcloud/app_api',
 			'nextcloud/bruteforcesettings',
 			'nextcloud/circles',
+			'nextcloud/dbdoctor',
 			'nextcloud/documentation',
 			'nextcloud/example-files',
 			'nextcloud/files_downloadlimit',