diff --git a/.github/classifier.yml b/.github/classifier.yml
index af9e2f84e41..c1c067e5c53 100644
--- a/.github/classifier.yml
+++ b/.github/classifier.yml
@@ -1,43 +1,69 @@
 {
     perform: true,
     alwaysRequireAssignee: false,
-    labelsRequiringAssignee: [ feature-request ],
+    labelsRequiringAssignee: [],
     autoAssignees: {
+        L10N: [],
+        VIM: [],
         api: {
             assignees: [ jrieken ],
             assignLabel: false
         },
-        color-picker: [],
-        css-less-sass: [ aeschli ],
+        cli: [],
+        color-palette: [],
+        config: [],
+        css-less-scss: [ aeschli ],
+        debug-console: [],
         debug: {
             assignees: [ weinand ],
             assignLabel: false
         },
         diff-editor: [],
+        dropdown: [],
         editor: [],
         editor-1000-limit: [],
         editor-autoclosing: [],
         editor-autoindent: [],
         editor-brackets: [],
         editor-clipboard: [],
+        editor-code-actions: [],
+        editor-code-lens: [],
+        editor-color-picker: [],
+        editor-colors: [],
         editor-columnselect: [],
+        editor-commands: [],
         editor-contrib: [],
-        editor-core: [],
-        editor-find-widget: [],
+        editor-drag-and-drop: [],
+        editor-find: [],
         editor-folding: [],
+        editor-hover: [],
         editor-ime: [],
         editor-input: [],
+        editor-ligatures: [],
+        editor-links: [],
         editor-minimap: [],
         editor-multicursor: [],
+        editor-parameter-hints: [],
+        editor-rendering: [],
         editor-smooth: [],
+        editor-symbols: [],
+        editor-textbuffer: [],
         editor-wrapping: [],
         emmet: [ ramya-rao-a ],
         error-list: [],
+        explorer-custom: [],
+        extension-host: [],
         extensions: [],
+        file-decorations: [],
         file-encoding: {
             assignees: [],
             assignLabel: false
         },
+        file-explorer: {
+            assignees: [ isidorn ],
+            assignLabel: false
+        },
+        file-glob: [],
         file-io: {
             assignees: [],
             assignLabel: false
@@ -46,45 +72,73 @@
             assignees: [],
             assignLabel: false
         },
-        file-explorer: {
-            assignees: [ isidorn ],
-            assignLabel: false
-        },
-        format: [],
+        formatting: [],
         git: [ joaomoreno ],
+        grammar: [],
         hot-exit: [ Tyriar ],
         html: [ aeschli ],
-        i18n: [],
         install-update: [],
         integrated-terminal: [ Tyriar ],
+        integration-test: [],
+        intellisense-config: [],
+        issue-reporter: [ RMacfarlane ],
         javascript: [ mjbvz ],
         json: [],
-        keybindings: [],
         keyboard-layout: [],
+        keybindings: [],
+        keybindings-editor: [],
+        lang-diagnostics: [],
         languages basic: [],
+        list: [],
+        log: [],
         markdown: [ mjbvz ],
+        marketplace: [],
+        menus: [],
         merge-conflict: [ chrmarti ],
         multi-root: {
             assignees: [],
             assignLabel: false
         },
+        os-integration: [],
+        outline: [],
+        output: [],
         perf-profile: [],
+        perf-bloat: [],
+        perf-startup: [],
         php: [ roblourens ],
         proxy: [],
+        quick-pick: [ chrmarti ],
+        release-notes: [],
         remote: {
             assignees: [ jrieken ],
             assignLabel: false
         },
+        rename: [],
+        run-as-admin: [],
+        samples: [],
         scm: [],
         search: [ roblourens ],
+        search-replace: [],
+        settings-editor: [],
+        shared-process: [],
+        smart-select: [],
+        smoke-test: [],
         snippets: {
             assignees: [ jrieken ],
             assignLabel: false
         },
+        suggest: [],
         tasks: [ dbaeumer ],
         telemetry: [],
         themes: [],
+        tokenization: [],
+        tree: [],
         typescript: [ mjbvz ],
+        unit-test: [],
+        uri: [],
+        ux: [],
+        vscode-build: [],
+        webview: [],
         workbench: {
             assignees: [],
             assignLabel: false
@@ -109,6 +163,10 @@
             assignees: [],
             assignLabel: false
         },
+        workbench-grid: {
+            assignees: [],
+            assignLabel: false
+        },
         workbench-history: {
             assignees: [],
             assignLabel: false
@@ -145,6 +203,10 @@
             assignees: [],
             assignLabel: false
         },
+        workbench-views: {
+            assignees: [],
+            assignLabel: false
+        },
         workbench-welcome: [ chrmarti ]
     }
 }