diff --git a/extensions/agent/package.json b/extensions/agent/package.json
index 2554be8171..1df9f53801 100644
--- a/extensions/agent/package.json
+++ b/extensions/agent/package.json
@@ -32,6 +32,7 @@
         "description": "Manage and troubleshoot SQL Agent jobs",
         "provider": "MSSQL",
         "title": "SQL Agent",
+        "group": "administration",
         "when": "connectionProvider == 'MSSQL' && !mssql:iscloud && mssql:engineedition != 11 && dashboardContext == 'server'",
         "container": {
           "controlhost-container": {
@@ -91,7 +92,7 @@
     "vscodetestcover": "github:corivera/vscodetestcover#1.0.5"
   },
   "resolutions": {
-      "esprima": "^4.0.0"
+    "esprima": "^4.0.0"
   },
   "__metadata": {
     "id": "10",
diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json
index 873d738bf8..8c5a707288 100644
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -444,6 +444,7 @@
         "description": "%tab.bigDataClusterDescription%",
         "provider": "MSSQL",
         "title": "%title.bigDataCluster%",
+        "group": "monitoring",
         "when": "connectionProvider == 'MSSQL' && mssql:iscluster && dashboardContext == 'server'",
         "container": {
           "grid-container": [
diff --git a/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts
index 6f2c73ce8d..5c813e4317 100644
--- a/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts
@@ -17,6 +17,7 @@ import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench
 import { values } from 'vs/base/common/collections';
 import { IUserFriendlyIcon } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget';
 import { isValidIcon, createCSSRuleForIcon } from 'sql/workbench/contrib/dashboard/browser/dashboardIconUtil';
+import { IDashboardTabGroup } from 'sql/workbench/services/dashboard/browser/common/interfaces';
 
 export interface IDashboardTabContrib {
 	id: string;
@@ -237,3 +238,30 @@ ExtensionsRegistry.registerExtensionPoint<IDashboardTabContrib | IDashboardTabCo
 		}
 	}
 });
+
+/**
+ * Predefined tab groups
+ */
+const PredefinedTabGroups: IDashboardTabGroup[] = [
+	{
+		id: 'administration',
+		title: localize('administrationTabGroup', "Administration")
+	}, {
+		id: 'monitoring',
+		title: localize('monitoringTabGroup', "Monitoring")
+	}, {
+		id: 'performance',
+		title: localize('performanceTabGroup', "Performance")
+	}, {
+		id: 'security',
+		title: localize('securityTabGroup', "Security")
+	}, {
+		id: 'troubleshooting',
+		title: localize('troubleshootingTabGroup', "Troubleshooting")
+	}, {
+		id: 'settings',
+		title: localize('settingsTabGroup', "Settings")
+	}
+];
+
+PredefinedTabGroups.forEach(tabGroup => registerTabGroup(tabGroup));