diff --git a/cloud/azure/storage/inputs.tf b/cloud/azure/storage/inputs.tf
index b594d82..a1d459e 100644
--- a/cloud/azure/storage/inputs.tf
+++ b/cloud/azure/storage/inputs.tf
@@ -4,23 +4,6 @@ variable "environment" {
   type = "string"
 }
 
-variable "subscription_id" {
-  description = "Azure account id used as filter for monitors"
-  type = "string"
-}
-
-variable "provider" {
-  description = "Cloud provider which the monitor and its based metric depend on"
-  type = "string"
-  default = "azure"
-}
-
-variable "service" {
-  description = "Service monitored by this set of monitors"
-  type = "string"
-  default = "storage"
-}
-
 # Global DataDog
 variable "message" {
   description = "Message sent when a Redis monitor is triggered"
diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index 522a34c..ba2ece6 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -32,7 +32,7 @@ EOF
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["env:${var.environment}","resource:${var.service}","team:${var.provider}"]
+  tags = ["env:${var.environment}","resource:storage","team:azure", "provider:azure"]
 }
 
 resource "datadog_monitor" "successful_requests" {
@@ -61,7 +61,7 @@ EOF
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["env:${var.environment}","resource:${var.service}","team:${var.provider}"]
+  tags = ["env:${var.environment}","resource:storage","team:azure", "provider:azure"]
 }
 
 resource "datadog_monitor" "latency" {
@@ -90,7 +90,7 @@ EOF
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["env:${var.environment}","resource:${var.service}","team:${var.provider}"]
+  tags = ["env:${var.environment}","resource:storage","team:azure", "provider:azure"]
 }
 
 resource "datadog_monitor" "timeout_error_requests" {
@@ -119,7 +119,7 @@ EOF
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["env:${var.environment}","resource:${var.service}","team:${var.provider}"]
+  tags = ["env:${var.environment}","resource:storage","team:azure", "provider:azure"]
 }
 
 
@@ -149,7 +149,7 @@ EOF
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["env:${var.environment}","resource:${var.service}","team:${var.provider}"]
+  tags = ["env:${var.environment}","resource:storage","team:azure", "provider:azure"]
 }
 
 
@@ -179,7 +179,7 @@ EOF
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["env:${var.environment}","resource:${var.service}","team:${var.provider}"]
+  tags = ["env:${var.environment}","resource:storage","team:azure", "provider:azure"]
 }
 
 
@@ -209,7 +209,7 @@ EOF
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["env:${var.environment}","resource:${var.service}","team:${var.provider}"]
+  tags = ["env:${var.environment}","resource:storage","team:azure", "provider:azure"]
 }
 
 
@@ -239,7 +239,7 @@ EOF
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["env:${var.environment}","resource:${var.service}","team:${var.provider}"]
+  tags = ["env:${var.environment}","resource:storage","team:azure", "provider:azure"]
 }
 
 
@@ -269,5 +269,5 @@ EOF
   renotify_interval   = 0
   no_data_timeframe   = 20
 
-  tags = ["env:${var.environment}","resource:${var.service}","team:${var.provider}"]
+  tags = ["env:${var.environment}","resource:storage","team:azure", "provider:azure"]
 }