diff --git a/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/main.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/main.tf
index cfca8b11..6236fe37 100644
--- a/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/main.tf
+++ b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-s3/main.tf
@@ -1,5 +1,13 @@
 resource "aws_s3_bucket" "state" {
   bucket = local.bucket_name
+
+  tags = merge(
+    {
+      Name        = local.bucket_name
+      Environment = local.environment
+    },
+    local.tags,
+  )
 }
 
 resource "aws_s3_bucket_versioning" "versioning" {
@@ -19,15 +27,3 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "sse" {
     }
   }
 }
-
-resource "aws_s3_bucket_tagging" "default" {
-  bucket = aws_s3_bucket.state.id
-
-  tag_set = [for k, v in merge({
-    Name        = local.bucket_name
-    Environment = local.environment
-  }, local.tags) : {
-    key   = k
-    value = v
-  }]
-}