diff --git a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf
index 9296d96cd..89aea9a1a 100644
--- a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf
+++ b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf
@@ -27,7 +27,9 @@ resource "azurerm_resource_group" "main" {
   location = var.location
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
@@ -57,7 +59,9 @@ resource "azurerm_cosmosdb_account" "application" {
   }
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
diff --git a/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf b/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf
index 0ea742f63..5fc7e321a 100644
--- a/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf
+++ b/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf
@@ -27,7 +27,9 @@ resource "azurerm_resource_group" "main" {
   location = var.location
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
@@ -57,7 +59,9 @@ resource "azurerm_cosmosdb_account" "application" {
   }
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
diff --git a/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf b/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf
index 6bc31b396..f14b2b08f 100644
--- a/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf
@@ -52,7 +52,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
diff --git a/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf b/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf
index 4ba44790c..9ea85a693 100644
--- a/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf
@@ -52,7 +52,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
diff --git a/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf b/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf
index 6540f4460..3c1b42972 100644
--- a/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf
@@ -51,7 +51,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf
index 9957000d1..8bc1cf840 100644
--- a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf
@@ -52,7 +52,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf
index 6ba0b798b..0a781ed3a 100644
--- a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf
@@ -52,7 +52,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace_01" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
+    "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
 
@@ -86,7 +88,9 @@ resource "azurerm_eventhub_namespace" "eventhubs_namespace_02" {
   capacity            = 1
 
   tags = {
-    terraform_azure_sample = var.sample_tag_value
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
+    "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
 
diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf
index cd38fd2ab..382215525 100644
--- a/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf
+++ b/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf
@@ -70,8 +70,9 @@ resource "azurerm_key_vault" "kv_account_01" {
   }
 
   tags = {
-    "terraform"                 = "true"
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
@@ -121,8 +122,9 @@ resource "azurerm_key_vault" "kv_account_02" {
   }
 
   tags = {
-    "terraform"                 = "true"
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf
index b11d55555..22d2fd230 100644
--- a/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf
+++ b/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf
@@ -71,6 +71,7 @@ resource "azurerm_key_vault" "kv_account" {
 
   tags = {
     "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
diff --git a/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf b/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf
index 612b4663b..49782f4e2 100644
--- a/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf
@@ -51,6 +51,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace_01" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
@@ -84,6 +86,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace_02" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
diff --git a/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf b/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf
index 77480e35f..4b6dc5a2b 100644
--- a/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf
@@ -49,6 +49,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
index 9a4efec01..aebba3351 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
@@ -49,7 +49,9 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
index 173fa93a0..bd16c4192 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
@@ -49,7 +49,9 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
-    "spring-cloud-azure-sample" = var.sample_tag_value
+    terraform                 = "true"
+    application-name          = var.application_name
+    spring-cloud-azure-sample = var.sample_tag_value
   }
 }
 
diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf
index 8b7c1609a..82f8abb72 100644
--- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf
@@ -55,6 +55,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace_01" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
@@ -94,6 +96,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace_02" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf
index fe8e54b4b..6989ddcca 100644
--- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf
@@ -87,6 +87,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf
index d8e8f86bb..86142a4dd 100644
--- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf
@@ -51,6 +51,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf
index 094688b8e..edf895a17 100644
--- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf
@@ -51,6 +51,8 @@ resource "azurerm_servicebus_namespace" "servicebus_namespace" {
   zone_redundant = false
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
diff --git a/spring-petclinic-microservices/terraform/main.tf b/spring-petclinic-microservices/terraform/main.tf
index 738bca28f..dd37014ca 100644
--- a/spring-petclinic-microservices/terraform/main.tf
+++ b/spring-petclinic-microservices/terraform/main.tf
@@ -27,6 +27,8 @@ resource "azurerm_resource_group" "main" {
   location = var.location
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
@@ -58,6 +60,8 @@ resource "azurerm_cosmosdb_account" "application" {
   }
 
   tags = {
+    "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }
@@ -152,6 +156,7 @@ resource "azurerm_key_vault" "kv_account" {
 
   tags = {
     "terraform"                 = "true"
+    "application-name"          = var.application_name
     "spring-cloud-azure-sample" = var.sample_tag_value
   }
 }