diff --git a/infrastructure/output.tf b/infrastructure/output.tf
index e9a82a6f581..0b1d51aca1b 100644
--- a/infrastructure/output.tf
+++ b/infrastructure/output.tf
@@ -1,3 +1,3 @@
 output "microserviceName" {
-  value = "${var.component}"
+  value = var.component
 }
diff --git a/infrastructure/prod.tfvars b/infrastructure/prod.tfvars
index 114f35717d0..09893e694db 100644
--- a/infrastructure/prod.tfvars
+++ b/infrastructure/prod.tfvars
@@ -1,5 +1,5 @@
 docmosis_subscription_id = "00b9a00a-20eb-4173-b7b6-468e00836a33"
-docmosis_resource_group = "docmosis-iaas-prod-rg"
-docmosis_vault = "docmosisiaasprodkv"
-enable_alerts = true
+docmosis_resource_group  = "docmosis-iaas-prod-rg"
+docmosis_vault           = "docmosisiaasprodkv"
+enable_alerts            = true
 
diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf
index 0e7f75d38a2..5abfda94309 100644
--- a/infrastructure/variables.tf
+++ b/infrastructure/variables.tf
@@ -16,7 +16,7 @@ variable "env" {
 }
 
 variable "common_tags" {
-  type = map
+  type = map(any)
 }
 
 variable "tenant_id" {