diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsightsGeoMap.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsightsGeoMap.json
index 22293a52d2f..22a592f2a6f 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsightsGeoMap.json
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/appInsightsGeoMap.json
@@ -822,7 +822,7 @@
         "options": [],
         "query": {
           "grafanaTemplateVariableFn": {
-            "kind": "MetricDefinitionsQuery",
+            "kind": "MetricNamespaceQuery",
             "rawQuery": "Namespaces($sub, $rg)",
             "resourceGroup": "$rg",
             "subscription": "$sub"
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/networkInsightsDashboard.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/networkInsightsDashboard.json
index 9b197005f47..ac863dd08b7 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/networkInsightsDashboard.json
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/networkInsightsDashboard.json
@@ -1870,7 +1870,7 @@
         "options": [],
         "query": {
           "grafanaTemplateVariableFn": {
-            "kind": "MetricDefinitionsQuery",
+            "kind": "MetricNamespaceQuery",
             "rawQuery": "namespaces($sub,$rg)",
             "resourceGroup": "$rg",
             "subscription": "$sub"
@@ -1898,7 +1898,7 @@
         "options": [],
         "query": {
           "grafanaTemplateVariableFn": {
-            "kind": "MetricDefinitionsQuery",
+            "kind": "MetricNamespaceQuery",
             "rawQuery": "namespaces($sub,$rg)",
             "resourceGroup": "$rg",
             "subscription": "$sub"
@@ -1926,7 +1926,7 @@
         "options": [],
         "query": {
           "grafanaTemplateVariableFn": {
-            "kind": "MetricDefinitionsQuery",
+            "kind": "MetricNamespaceQuery",
             "rawQuery": "namespaces($sub,$rg)",
             "resourceGroup": "$rg",
             "subscription": "$sub"
@@ -1954,7 +1954,7 @@
         "options": [],
         "query": {
           "grafanaTemplateVariableFn": {
-            "kind": "MetricDefinitionsQuery",
+            "kind": "MetricNamespaceQuery",
             "rawQuery": "namespaces($sub,$rg)",
             "resourceGroup": "$rg",
             "subscription": "$sub"
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/grafanaTemplateVariableFns.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/grafanaTemplateVariableFns.ts
index 8bf3b908350..24b3894d3b3 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/grafanaTemplateVariableFns.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/grafanaTemplateVariableFns.ts
@@ -287,6 +287,9 @@ const migrateGrafanaTemplateVariableFn = (query: AzureMonitorQuery) => {
     case 'MetricNamespaceQuery':
       migratedQuery.queryType = AzureQueryType.NamespacesQuery;
       break;
+    case 'MetricDefinitionsQuery':
+      migratedQuery.queryType = AzureQueryType.NamespacesQuery;
+      break;
     case 'MetricNamesQuery':
       migratedQuery.queryType = AzureQueryType.MetricNamesQuery;
       break;
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/templateVariables.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/templateVariables.ts
index 94938af4b70..2f1fba584b0 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/templateVariables.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/templateVariables.ts
@@ -43,6 +43,14 @@ export interface MetricNamespaceQuery extends BaseGrafanaTemplateVariableQuery {
   metricNamespace?: string;
   resourceName?: string;
 }
+/** @deprecated Use MetricNamespaceQuery instead */
+export interface MetricDefinitionsQuery extends BaseGrafanaTemplateVariableQuery {
+  kind: 'MetricDefinitionsQuery';
+  subscription: string;
+  resourceGroup: string;
+  metricNamespace?: string;
+  resourceName?: string;
+}
 export interface MetricNamesQuery extends BaseGrafanaTemplateVariableQuery {
   kind: 'MetricNamesQuery';
   subscription: string;
@@ -62,6 +70,7 @@ export type GrafanaTemplateVariableQuery =
   | ResourceGroupsQuery
   | ResourceNamesQuery
   | MetricNamespaceQuery
+  | MetricDefinitionsQuery
   | MetricNamesQuery
   | WorkspacesQuery
   | UnknownQuery;