diff --git a/extensions/admin-tool-ext-win/package.json b/extensions/admin-tool-ext-win/package.json
index 6d7efc9f01..b1fe39154b 100644
--- a/extensions/admin-tool-ext-win/package.json
+++ b/extensions/admin-tool-ext-win/package.json
@@ -61,22 +61,22 @@
         {
           "command": "adminToolExtWin.launchSsmsMinGswDialog",
           "when": "isWindows && connectionProvider == MSSQL && nodeType && nodeType == Database && mssql:engineedition != 11",
-          "group": "z-AdminToolExt@1"
+          "group": "x_admin@1"
         },
         {
           "command": "adminToolExtWin.launchSsmsMinPropertiesDialog",
           "when": "isWindows && connectionProvider == MSSQL && serverInfo && !isCloud && nodeType && nodeType == Server && mssql:engineedition != 11",
-          "group": "z-AdminToolExt@2"
+          "group": "x_admin@2"
         },
         {
           "command": "adminToolExtWin.launchSsmsMinPropertiesDialog",
           "when": "isWindows && connectionProvider == MSSQL && serverInfo && nodeType && mssql:engineedition != 11 && nodeType =~ /^(Database|Table|Column|Index|Statistic|View|ServerLevelServerRole|ServerLevelCredential|ServerLevelServerAudit|ServerLevelServerAuditSpecification|StoredProcedure|ScalarValuedFunction|TableValuedFunction|AggregateFunction|Synonym|Assembly|UserDefinedDataType|UserDefinedType|UserDefinedTableType|Sequence|ServerLevelLinkedServer)$/",
-          "group": "z-AdminToolExt@2"
+          "group": "x_admin@2"
         },
         {
           "command": "adminToolExtWin.launchSsmsMinPropertiesDialog",
           "when": "isWindows && connectionProvider == MSSQL && serverInfo && !isCloud && nodeType && mssql:engineedition != 11 && nodeType =~ /^(ServerLevelLogin|User|DatabaseRole|ApplicationRole|Schema|SecurityPolicy)$/",
-          "group": "z-AdminToolExt@2"
+          "group": "x_admin@2"
         }
       ],
       "dataExplorer/context": [
diff --git a/extensions/azurecore/package.json b/extensions/azurecore/package.json
index c34d737b9f..9fd0a57be1 100644
--- a/extensions/azurecore/package.json
+++ b/extensions/azurecore/package.json
@@ -381,7 +381,8 @@
       ],
       "dataGrid/item/context": [
         {
-          "command": "azure.dataGrid.openInAzurePortal"
+          "command": "azure.dataGrid.openInAzurePortal",
+          "group": "y_portal"
         }
       ]
     },
diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json
index aa7ecf43df..5c83026f13 100644
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -528,13 +528,13 @@
         {
           "command": "mssql.objectProperties",
           "when": "connectionProvider == MSSQL && nodeType =~ /^(ServerLevelLogin|User|ServerLevelServerRole|ApplicationRole|DatabaseRole)$/ && config.workbench.enablePreviewFeatures",
-          "group": "z_objectManagement",
+          "group": "z_objectexplorer@3",
           "isDefault": true
         },
         {
           "command": "mssql.objectProperties",
           "when": "connectionProvider == MSSQL && serverInfo && !isCloud && nodeType && nodeType =~ /^(Database|Server)$/ && mssql:engineedition != 11 && isDevelopment",
-          "group": "z_objectManagement"
+          "group": "z_objectexplorer@3"
         },
         {
           "command": "mssql.deleteObject",
@@ -558,7 +558,8 @@
         },
         {
           "command": "mssql.enableGroupBySchema",
-          "when": "connectionProvider == MSSQL && nodeType && nodeType =~ /^(Server|Database)$/ && !config.mssql.objectExplorer.groupBySchema"
+          "when": "connectionProvider == MSSQL && nodeType && nodeType =~ /^(Server|Database)$/ && !config.mssql.objectExplorer.groupBySchema",
+          "group": "z_objectexplorer@0"
         },
         {
           "command": "mssql.disableGroupBySchema",