diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index b38db2a..8b3d103 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -4,7 +4,7 @@ resource "datadog_monitor" "storage_status" {
   message = coalesce(var.status_message, var.message)
 
   query = <<EOQ
-    ${var.status_time_aggregator}(${var.status_timeframe}):avg:azure.storage.status${module.filter-tags.query_alert} by {resource_group,region,name} < 1
+    ${var.status_time_aggregator}(${var.status_timeframe}):avg:azure.storage.status${module.filter-tags.query_alert} by {region,name} < 1
 EOQ
 
 
@@ -38,7 +38,7 @@ resource "datadog_monitor" "blobservices_availability" {
 
   query = <<EOQ
     ${var.availability_time_aggregator}(${var.availability_timeframe}): (default(
-      avg:azure.storage_storageaccounts_blobservices.availability${module.filter-tags.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_blobservices.availability${module.filter-tags.query_alert} by {name},
     100)) < ${var.availability_threshold_critical}  
 EOQ
 
@@ -75,7 +75,7 @@ resource "datadog_monitor" "fileservices_availability" {
 
 query = <<EOQ
     ${var.availability_time_aggregator}(${var.availability_timeframe}): (default(
-      avg:azure.storage_storageaccounts_fileservices.availability${module.filter-tags.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_fileservices.availability${module.filter-tags.query_alert} by {name},
     100)) < ${var.availability_threshold_critical}
 EOQ
 
@@ -112,7 +112,7 @@ resource "datadog_monitor" "queueservices_availability" {
 
 query = <<EOQ
     ${var.availability_time_aggregator}(${var.availability_timeframe}): (default(
-      avg:azure.storage_storageaccounts_queueservices.availability${module.filter-tags.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_queueservices.availability${module.filter-tags.query_alert} by {name},
     100)) < ${var.availability_threshold_critical}
 EOQ
 
@@ -149,7 +149,7 @@ resource "datadog_monitor" "table_availability" {
 
   query = <<EOQ
     ${var.availability_time_aggregator}(${var.availability_timeframe}): (default(
-      avg:azure.storage_storageaccounts_tableservices.availability${module.filter-tags.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_tableservices.availability${module.filter-tags.query_alert} by {name},
     100)) < ${var.availability_threshold_critical}
 EOQ
 
@@ -186,8 +186,8 @@ resource "datadog_monitor" "blobservices_requests_error" {
 
   query = <<EOQ
       ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
-        100-(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-success.query_alert} by {resource_group,name}.as_count() /
-        sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {resource_group,name}.as_count()
+        100-(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-success.query_alert} by {name}.as_count() /
+        sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_count()
       * 100) > ${var.successful_storage_requests_threshold_critical}
 EOQ
 
@@ -224,8 +224,8 @@ resource "datadog_monitor" "fileservices_requests_error" {
 
 query = <<EOQ
       ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
-        100-(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-success.query_alert} by {resource_group,name}.as_count() /
-        sum:azure.azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {resource_group,name}.as_count()
+        100-(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-success.query_alert} by {name}.as_count() /
+        sum:azure.azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_count()
       * 100) > ${var.successful_storage_requests_threshold_critical}
 EOQ
 
@@ -262,8 +262,8 @@ resource "datadog_monitor" "queueservices_requests_error" {
 
 query = <<EOQ
       ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
-        100-(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-success.query_alert} by {resource_group,name}.as_count() /
-        sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {resource_group,name}.as_count()
+        100-(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-success.query_alert} by {name}.as_count() /
+        sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {name}.as_count()
       * 100) > ${var.successful_storage_requests_threshold_critical}
 EOQ
 
@@ -300,8 +300,8 @@ resource "datadog_monitor" "tableservices_requests_error" {
 
   query = <<EOQ
       ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
-        100-(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-success.query_alert} by {resource_group,name}.as_count() /
-        sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags.query_alert} by {resource_group,name}.as_count()
+        100-(sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-success.query_alert} by {name}.as_count() /
+        sum:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags.query_alert} by {name}.as_count()
       * 100) > ${var.successful_storage_requests_threshold_critical}
 EOQ
 
@@ -338,7 +338,7 @@ resource "datadog_monitor" "blobservices_latency" {
 
   query = <<EOQ
     ${var.latency_time_aggregator}(${var.latency_timeframe}): (default(
-      avg:azure.storage_storageaccounts_blobservices.success_e2_elatency${module.filter-tags.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_blobservices.success_e2_elatency${module.filter-tags.query_alert} by {name},
     0)) > ${var.latency_threshold_critical}
 EOQ
 
@@ -375,7 +375,7 @@ resource "datadog_monitor" "fileservices_latency" {
 
 query = <<EOQ
     ${var.latency_time_aggregator}(${var.latency_timeframe}): (default(
-      avg:azure.storage_storageaccounts_fileservices.success_e2_e_latency${module.filter-tags.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_fileservices.success_e2_e_latency${module.filter-tags.query_alert} by {name},
     0)) > ${var.latency_threshold_critical}
 EOQ
 
@@ -412,7 +412,7 @@ resource "datadog_monitor" "queueservices_latency" {
 
 query = <<EOQ
     ${var.latency_time_aggregator}(${var.latency_timeframe}): (default(
-      avg:azure.storage_storageaccounts_queueservices.success_e2_elatency${module.filter-tags.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_queueservices.success_e2_elatency${module.filter-tags.query_alert} by {name},
     0)) > ${var.latency_threshold_critical}
 EOQ
 
@@ -450,7 +450,7 @@ resource "datadog_monitor" "tableservices_latency" {
 
   query = <<EOQ
     ${var.latency_time_aggregator}(${var.latency_timeframe}): (default(
-      avg:azure.storage_storageaccounts_tableservices.success_e2_elatency${module.filter-tags.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_tableservices.success_e2_elatency${module.filter-tags.query_alert} by {name},
     0)) > ${var.latency_threshold_critical}
 EOQ
 
@@ -488,7 +488,7 @@ resource "datadog_monitor" "blob_timeout_error_requests" {
 
   query = <<EOQ
     ${var.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-timeout-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-timeout-error.query_alert} by {name},
     0)) > ${var.timeout_error_requests_threshold_critical}
 EOQ
 
@@ -525,7 +525,7 @@ resource "datadog_monitor" "file_timeout_error_requests" {
 
 query = <<EOQ
     ${var.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-timeout-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-timeout-error.query_alert} by {name},
     0)) > ${var.timeout_error_requests_threshold_critical}
 EOQ
 
@@ -562,7 +562,7 @@ resource "datadog_monitor" "queue_timeout_error_requests" {
 
 query = <<EOQ
     ${var.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-timeout-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-timeout-error.query_alert} by {name},
     0)) > ${var.timeout_error_requests_threshold_critical}
 EOQ
 
@@ -599,7 +599,7 @@ resource "datadog_monitor" "table_timeout_error_requests" {
 
   query = <<EOQ
     ${var.timeout_error_requests_time_aggregator}(${var.timeout_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-timeout-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-timeout-error.query_alert} by {name},
     0)) > ${var.timeout_error_requests_threshold_critical}
 EOQ
 
@@ -636,7 +636,7 @@ resource "datadog_monitor" "blob_network_error_requests" {
 
   query = <<EOQ
     ${var.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-network-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-network-error.query_alert} by {name},
     0)) > ${var.network_error_requests_threshold_critical}
 EOQ
 
@@ -673,7 +673,7 @@ resource "datadog_monitor" "file_network_error_requests" {
 
 query = <<EOQ
     ${var.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-network-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-network-error.query_alert} by {name},
     0)) > ${var.network_error_requests_threshold_critical}
 EOQ
 
@@ -710,7 +710,7 @@ resource "datadog_monitor" "queue_network_error_requests" {
 
 query = <<EOQ
     ${var.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-network-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-network-error.query_alert} by {name},
     0)) > ${var.network_error_requests_threshold_critical}
 EOQ
 
@@ -748,7 +748,7 @@ resource "datadog_monitor" "table_network_error_requests" {
 
   query = <<EOQ
     ${var.network_error_requests_time_aggregator}(${var.network_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-network-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-network-error.query_alert} by {name},
     0)) > ${var.network_error_requests_threshold_critical}
 EOQ
 
@@ -785,7 +785,7 @@ resource "datadog_monitor" "blob_throttling_error_requests" {
 
   query = <<EOQ
     ${var.throttling_error_requests_time_aggregator}(${var.throttling_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-throttling-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-throttling-error.query_alert} by {name},
     0)) > ${var.throttling_error_requests_threshold_critical}
 EOQ
 
@@ -822,7 +822,7 @@ resource "datadog_monitor" "file_throttling_error_requests" {
 
 query = <<EOQ
     ${var.throttling_error_requests_time_aggregator}(${var.throttling_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-throttling-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-throttling-error.query_alert} by {name},
     0)) > ${var.throttling_error_requests_threshold_critical}
 EOQ
 
@@ -856,7 +856,7 @@ resource "datadog_monitor" "queue_throttling_error_requests" {
 
 query = <<EOQ
     ${var.throttling_error_requests_time_aggregator}(${var.throttling_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-throttling-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-throttling-error.query_alert} by {name},
     0)) > ${var.throttling_error_requests_threshold_critical}
 EOQ
 
@@ -893,7 +893,7 @@ resource "datadog_monitor" "table_throttling_error_requests" {
 
   query = <<EOQ
     ${var.throttling_error_requests_time_aggregator}(${var.throttling_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-throttling-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-throttling-error.query_alert} by {name},
     0)) > ${var.throttling_error_requests_threshold_critical}
 EOQ
 
@@ -930,7 +930,7 @@ resource "datadog_monitor" "blob_server_other_error_requests" {
 
   query = <<EOQ
     ${var.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-server-other-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-server-other-error.query_alert} by {name},
     0)) > ${var.server_other_error_requests_threshold_critical}
 EOQ
 
@@ -967,7 +967,7 @@ resource "datadog_monitor" "file_server_other_error_requests" {
 
 query = <<EOQ
     ${var.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-server-other-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-server-other-error.query_alert} by {name},
     0)) > ${var.server_other_error_requests_threshold_critical}
 EOQ
 
@@ -1004,7 +1004,7 @@ resource "datadog_monitor" "queue_server_other_error_requests" {
 
 query = <<EOQ
     ${var.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-server-other-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-server-other-error.query_alert} by {name},
     0)) > ${var.server_other_error_requests_threshold_critical}
 EOQ
 
@@ -1042,7 +1042,7 @@ resource "datadog_monitor" "table_server_other_error_requests" {
 
   query = <<EOQ
     ${var.server_other_error_requests_time_aggregator}(${var.server_other_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-server-other-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-server-other-error.query_alert} by {name},
     0)) > ${var.server_other_error_requests_threshold_critical}
 EOQ
 
@@ -1079,7 +1079,7 @@ resource "datadog_monitor" "blob_client_other_error_requests" {
 
   query = <<EOQ
     ${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-client-other-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-client-other-error.query_alert} by {name},
     0)) > ${var.client_other_error_requests_threshold_critical}
 EOQ
 
@@ -1116,7 +1116,7 @@ resource "datadog_monitor" "file_client_other_error_requests" {
 
 query = <<EOQ
     ${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-client-other-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-client-other-error.query_alert} by {name},
     0)) > ${var.client_other_error_requests_threshold_critical}
 EOQ
 
@@ -1153,7 +1153,7 @@ resource "datadog_monitor" "queue_client_other_error_requests" {
 
 query = <<EOQ
     ${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-client-other-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-client-other-error.query_alert} by {name},
     0)) > ${var.client_other_error_requests_threshold_critical}
 EOQ
 
@@ -1191,7 +1191,7 @@ resource "datadog_monitor" "table_client_other_error_requests" {
 
   query = <<EOQ
     ${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-client-other-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-client-other-error.query_alert} by {name},
     0)) > ${var.client_other_error_requests_threshold_critical}
 EOQ
 
@@ -1228,7 +1228,7 @@ resource "datadog_monitor" "blob_authorization_error_requests" {
 
   query = <<EOQ
     ${var.authorization_error_requests_time_aggregator}(${var.authorization_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-authorization-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-authorization-error.query_alert} by {name},
     0)) > ${var.authorization_error_requests_threshold_critical}
 EOQ
 
@@ -1265,7 +1265,7 @@ resource "datadog_monitor" "file_authorization_error_requests" {
 
 query = <<EOQ
     ${var.authorization_error_requests_time_aggregator}(${var.authorization_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-authorization-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-authorization-error.query_alert} by {name},
     0)) > ${var.authorization_error_requests_threshold_critical}
 EOQ
 
@@ -1303,7 +1303,7 @@ resource "datadog_monitor" "queue_authorization_error_requests" {
 
 query = <<EOQ
     ${var.authorization_error_requests_time_aggregator}(${var.authorization_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-authorization-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-authorization-error.query_alert} by {name},
     0)) > ${var.authorization_error_requests_threshold_critical}
 EOQ
 
@@ -1340,7 +1340,7 @@ resource "datadog_monitor" "table_authorization_error_requests" {
 
   query = <<EOQ
     ${var.authorization_error_requests_time_aggregator}(${var.authorization_error_requests_timeframe}): (default(
-      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-authorization-error.query_alert} by {resource_group,name},
+      avg:azure.storage_storageaccounts_tableservices.transactions${module.filter-tags-authorization-error.query_alert} by {name},
     0)) > ${var.authorization_error_requests_threshold_critical}
 EOQ