diff --git a/cloud/azure/cosmosdb/modules.tf b/cloud/azure/cosmosdb/modules.tf
index 8af90d2..8ad7f82 100644
--- a/cloud/azure/cosmosdb/modules.tf
+++ b/cloud/azure/cosmosdb/modules.tf
@@ -14,8 +14,7 @@ module "filter-tags-statuscode" {
   environment                 = "${var.environment}"
   resource                    = "azure_cosmosdb"
   filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom          = "${var.filter_tags_custom},statuscode:%s"
+  filter_tags_custom          = "${var.filter_tags_custom}"
   filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
-
-  extra_tags = ["statuscode:%s"]
+  extra_tags                  = ["statuscode:%s"]
 }
diff --git a/cloud/azure/keyvault/modules.tf b/cloud/azure/keyvault/modules.tf
index 81f4ef8..6e6f876 100644
--- a/cloud/azure/keyvault/modules.tf
+++ b/cloud/azure/keyvault/modules.tf
@@ -14,10 +14,9 @@ module "filter-tags-statuscode" {
   environment                 = "${var.environment}"
   resource                    = "azure_keyvault"
   filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom          = "${var.filter_tags_custom},statuscode:%s"
+  filter_tags_custom          = "${var.filter_tags_custom}"
   filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
-
-  extra_tags = ["statuscode:%s"]
+  extra_tags                  = ["statuscode:%s"]
 }
 
 module "filter-tags-activity" {
@@ -26,6 +25,7 @@ module "filter-tags-activity" {
   environment                 = "${var.environment}"
   resource                    = "azure_keyvault"
   filter_tags_use_defaults    = "${var.filter_tags_use_defaults}"
-  filter_tags_custom          = "${var.filter_tags_custom},!activityname:secretlist"
+  filter_tags_custom          = "${var.filter_tags_custom}"
   filter_tags_custom_excluded = "${var.filter_tags_custom_excluded}"
+  extra_tags_excluded         = ["activityname:secretlist"]
 }