diff --git a/terraform/oss-redisbloom-m5-spot-instances/tags.tf b/terraform/oss-redisbloom-m5-spot-instances/tags.tf
index a108572..f19479c 100644
--- a/terraform/oss-redisbloom-m5-spot-instances/tags.tf
+++ b/terraform/oss-redisbloom-m5-spot-instances/tags.tf
@@ -11,6 +11,8 @@ locals {
     github_repo    = "${var.github_repo}"
     github_sha     = "${var.github_sha}"
     timeout_secs   = "${var.timeout_secs}"
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
   }
 
   tags_client = {
@@ -22,6 +24,8 @@ locals {
     github_repo    = "${var.github_repo}"
     github_sha     = "${var.github_sha}"
     timeout_secs   = "${var.timeout_secs}"
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
   }
 }
 
diff --git a/terraform/oss-redisearch-m5-spot-instances/tags.tf b/terraform/oss-redisearch-m5-spot-instances/tags.tf
index a108572..f19479c 100644
--- a/terraform/oss-redisearch-m5-spot-instances/tags.tf
+++ b/terraform/oss-redisearch-m5-spot-instances/tags.tf
@@ -11,6 +11,8 @@ locals {
     github_repo    = "${var.github_repo}"
     github_sha     = "${var.github_sha}"
     timeout_secs   = "${var.timeout_secs}"
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
   }
 
   tags_client = {
@@ -22,6 +24,8 @@ locals {
     github_repo    = "${var.github_repo}"
     github_sha     = "${var.github_sha}"
     timeout_secs   = "${var.timeout_secs}"
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
   }
 }
 
diff --git a/terraform/oss-redisjson-m5-spot-instances/tags.tf b/terraform/oss-redisjson-m5-spot-instances/tags.tf
index a108572..f19479c 100644
--- a/terraform/oss-redisjson-m5-spot-instances/tags.tf
+++ b/terraform/oss-redisjson-m5-spot-instances/tags.tf
@@ -11,6 +11,8 @@ locals {
     github_repo    = "${var.github_repo}"
     github_sha     = "${var.github_sha}"
     timeout_secs   = "${var.timeout_secs}"
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
   }
 
   tags_client = {
@@ -22,6 +24,8 @@ locals {
     github_repo    = "${var.github_repo}"
     github_sha     = "${var.github_sha}"
     timeout_secs   = "${var.timeout_secs}"
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
   }
 }
 
diff --git a/terraform/oss-redistimeseries-m5-spot-instances/tags.tf b/terraform/oss-redistimeseries-m5-spot-instances/tags.tf
index a108572..f19479c 100644
--- a/terraform/oss-redistimeseries-m5-spot-instances/tags.tf
+++ b/terraform/oss-redistimeseries-m5-spot-instances/tags.tf
@@ -11,6 +11,8 @@ locals {
     github_repo    = "${var.github_repo}"
     github_sha     = "${var.github_sha}"
     timeout_secs   = "${var.timeout_secs}"
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
   }
 
   tags_client = {
@@ -22,6 +24,8 @@ locals {
     github_repo    = "${var.github_repo}"
     github_sha     = "${var.github_sha}"
     timeout_secs   = "${var.timeout_secs}"
+    Environment    = "${var.environment}"
+    Project        = "${var.environment}"
   }
 }