diff --git a/.github/classifier.json b/.github/classifier.json
index d0a2c778997..5f322e25edd 100644
--- a/.github/classifier.json
+++ b/.github/classifier.json
@@ -124,7 +124,7 @@
 		"languages-basic": {"assign": ["aeschli"]},
 		"languages-diagnostics": {"assign": ["jrieken"]},
 		"languages-guessing": {"assign": ["TylerLeonhardt"]},
-		"layout": {"assign": ["sbatten"]},
+		"layout": {"assign": ["benibenj"]},
 		"lcd-text-rendering": {"assign": []},
 		"list-widget": {"assign": ["joaomoreno"]},
 		"live-preview": {"assign": ["andreamah"]},
@@ -249,7 +249,7 @@
 		"timeline": {"assign": ["lramos15"]},
 		"timeline-git": {"assign": ["lszomoru"]},
 		"timeline-local-history": {"assign": ["bpasero"]},
-		"titlebar": {"assign": ["sbatten"]},
+		"titlebar": {"assign": ["benibenj"]},
 		"tokenization": {"assign": ["alexdima"]},
 		"touch/pointer": {"assign": []},
 		"trackpad/scroll": {"assign": []},
@@ -278,7 +278,7 @@
 		"workbench-cli": {"assign": ["bpasero"]},
 		"workbench-diagnostics": {"assign": ["Tyriar"]},
 		"workbench-dnd": {"assign": ["bpasero"]},
-		"workbench-editor-grid": {"assign": ["sbatten"]},
+		"workbench-editor-grid": {"assign": ["benibenj"]},
 		"workbench-editor-groups": {"assign": ["bpasero"]},
 		"workbench-editor-resolver": {"assign": ["lramos15"]},
 		"workbench-editors": {"assign": ["bpasero"]},
@@ -299,11 +299,11 @@
 		"workbench-tabs": {"assign": ["benibenj"]},
 		"workbench-touchbar": {"assign": ["bpasero"]},
 		"workbench-untitled-editors": {"assign": ["bpasero"]},
-		"workbench-views": {"assign": ["sbatten"]},
+		"workbench-views": {"assign": ["benibenj"]},
 		"workbench-welcome": {"assign": ["lramos15"]},
 		"workbench-window": {"assign": ["bpasero"]},
 		"workbench-workspace": {"assign": []},
-		"workbench-zen": {"assign": ["sbatten"]},
+		"workbench-zen": {"assign": ["benibenj"]},
 		"workspace-edit": {"assign": ["jrieken"]},
 		"workspace-symbols": {"assign": []},
 		"workspace-trust": {"assign": ["lszomoru", "sbatten"]},