diff --git a/alb-internal.tf b/alb-internal.tf
index 61ddcac..e370a31 100644
--- a/alb-internal.tf
+++ b/alb-internal.tf
@@ -27,8 +27,7 @@ resource "aws_lb" "ecs_internal" {
   tags = merge(
     var.tags,
     {
-      "Terraform" = true,
-      Name        = "ecs-${var.name}-internal"
+      Name = "ecs-${var.name}-internal"
     },
   )
 }
@@ -47,12 +46,7 @@ resource "aws_lb_listener" "ecs_https_internal" {
     target_group_arn = aws_lb_target_group.ecs_default_https_internal[0].arn
   }
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = var.tags
 }
 
 resource "aws_lb_listener" "ecs_test_https_internal" {
@@ -69,12 +63,7 @@ resource "aws_lb_listener" "ecs_test_https_internal" {
     #target_group_arn = aws_lb_target_group.ecs_replacement_https[0].arn
     target_group_arn = aws_lb_target_group.ecs_default_https_internal[0].arn
   }
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = var.tags
 }
 
 # Generate a random string to add it to the name of the Target Group
@@ -92,17 +81,9 @@ resource "aws_lb_target_group" "ecs_default_https_internal" {
   port     = 80
   protocol = "HTTP"
   vpc_id   = var.vpc_id
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags     = var.tags
 
   lifecycle {
     create_before_destroy = true
   }
 }
-
-
-
diff --git a/alb.tf b/alb.tf
index 258e5bd..f11f981 100644
--- a/alb.tf
+++ b/alb.tf
@@ -24,13 +24,9 @@ resource "aws_lb" "ecs" {
     }
   }
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true,
-      "Name"      = "ecs-${var.name}"
-    },
-  )
+  tags = merge(var.tags, {
+    "Name" = "ecs-${var.name}"
+  })
 }
 
 resource "aws_lb_listener" "ecs_https" {
@@ -47,12 +43,7 @@ resource "aws_lb_listener" "ecs_https" {
     target_group_arn = aws_lb_target_group.ecs_default_https[0].arn
   }
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = var.tags
 }
 
 resource "aws_lb_listener" "ecs_http_redirect" {
@@ -71,12 +62,7 @@ resource "aws_lb_listener" "ecs_http_redirect" {
       status_code = "HTTP_301"
     }
   }
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = var.tags
 }
 
 resource "aws_lb_listener" "ecs_test_https" {
@@ -93,12 +79,7 @@ resource "aws_lb_listener" "ecs_test_https" {
     #target_group_arn = aws_lb_target_group.ecs_replacement_https[0].arn
     target_group_arn = aws_lb_target_group.ecs_default_https[0].arn
   }
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = var.tags
 }
 
 resource "aws_lb_listener" "ecs_test_http_redirect" {
@@ -117,12 +98,7 @@ resource "aws_lb_listener" "ecs_test_http_redirect" {
       status_code = "HTTP_301"
     }
   }
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = var.tags
 }
 
 # Generate a random string to add it to the name of the Target Group
@@ -140,12 +116,9 @@ resource "aws_lb_target_group" "ecs_default_http" {
   protocol = "HTTP"
   vpc_id   = var.vpc_id
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+    Name = replace(substr("ecs-${var.name}-default-http-${random_string.alb_prefix.result}", 0, 32), "/-+$/", "")
+  })
 
   lifecycle {
     create_before_destroy = true
@@ -160,12 +133,9 @@ resource "aws_lb_target_group" "ecs_default_https" {
   protocol = "HTTP"
   vpc_id   = var.vpc_id
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+    Name = replace(substr("ecs-${var.name}-default-https-${random_string.alb_prefix.result}", 0, 32), "/-+$/", "")
+  })
 
   lifecycle {
     create_before_destroy = true
diff --git a/cloutwatch-alarms-alb.tf b/cloutwatch-alarms-alb.tf
index 8ba70fc..ba89cf8 100644
--- a/cloutwatch-alarms-alb.tf
+++ b/cloutwatch-alarms-alb.tf
@@ -15,12 +15,9 @@ resource "aws_cloudwatch_metric_alarm" "alb_500_errors" {
   insufficient_data_actions = []
   treat_missing_data        = "ignore"
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "${try(data.aws_iam_account_alias.current[0].account_alias, var.alarm_prefix)}-ecs-${var.name}-alb-500-errors"
+  })
   dimensions = {
     LoadBalancer = aws_lb.ecs[0].arn_suffix
   }
@@ -43,12 +40,9 @@ resource "aws_cloudwatch_metric_alarm" "alb_400_errors" {
   insufficient_data_actions = []
   treat_missing_data        = "ignore"
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "${try(data.aws_iam_account_alias.current[0].account_alias, var.alarm_prefix)}-ecs-${var.name}-alb-400-errors"
+  })
   dimensions = {
     LoadBalancer = aws_lb.ecs[0].arn_suffix
   }
@@ -88,10 +82,7 @@ resource "aws_cloudwatch_metric_alarm" "alb_latency" {
     }
   }
 
-    tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "${try(data.aws_iam_account_alias.current[0].account_alias, var.alarm_prefix)}-ecs-${var.name}-alb-latency"
+  })
 }
diff --git a/cloutwatch-alarms-asg.tf b/cloutwatch-alarms-asg.tf
index 5963ee9..456b267 100644
--- a/cloutwatch-alarms-asg.tf
+++ b/cloutwatch-alarms-asg.tf
@@ -19,10 +19,7 @@ resource "aws_cloudwatch_metric_alarm" "asg_high_cpu" {
     AutoScalingGroupName = aws_autoscaling_group.ecs[0].name
   }
 
-    tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "${try(data.aws_iam_account_alias.current[0].account_alias, var.alarm_prefix)}-ecs-${var.name}-asg-high-cpu"
+  })
 }
diff --git a/cloutwatch-alarms-ecs.tf b/cloutwatch-alarms-ecs.tf
index 48ff9ad..43e7916 100644
--- a/cloutwatch-alarms-ecs.tf
+++ b/cloutwatch-alarms-ecs.tf
@@ -19,12 +19,9 @@ resource "aws_cloudwatch_metric_alarm" "ecs_high_memory" {
     ClusterName = aws_ecs_cluster.ecs.name
   }
 
-    tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "${try(data.aws_iam_account_alias.current[0].account_alias, var.alarm_prefix)}-ecs-${var.name}-high-memory"
+  })
 }
 
 resource "aws_cloudwatch_metric_alarm" "ecs_high_cpu" {
@@ -48,10 +45,7 @@ resource "aws_cloudwatch_metric_alarm" "ecs_high_cpu" {
     ClusterName = aws_ecs_cluster.ecs.name
   }
 
-    tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "${try(data.aws_iam_account_alias.current[0].account_alias, var.alarm_prefix)}-ecs-${var.name}-high-cpu"
+  })
 }
diff --git a/cloutwatch-alarms-efs.tf b/cloutwatch-alarms-efs.tf
index ea7c278..e7505c8 100644
--- a/cloutwatch-alarms-efs.tf
+++ b/cloutwatch-alarms-efs.tf
@@ -19,10 +19,6 @@ resource "aws_cloudwatch_metric_alarm" "efs_credits_low" {
     FileSystemId = aws_efs_file_system.ecs[0].id
   }
 
-    tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+  })
 }
diff --git a/ec2-launch-template.tf b/ec2-launch-template.tf
index 1120c93..34de7ee 100644
--- a/ec2-launch-template.tf
+++ b/ec2-launch-template.tf
@@ -33,12 +33,8 @@ resource "aws_launch_template" "ecs" {
     create_before_destroy = true
   }
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+  })
 }
 
 resource "tls_private_key" "algorithm" {
@@ -53,10 +49,6 @@ resource "aws_key_pair" "generated_key" {
   key_name   = "${var.name}-key"
   public_key = tls_private_key.algorithm[0].public_key_openssh
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+  })
 }
diff --git a/ecs.tf b/ecs.tf
index b0efef3..5b1e3b1 100644
--- a/ecs.tf
+++ b/ecs.tf
@@ -6,15 +6,11 @@ resource "aws_ecs_cluster" "ecs" {
     value = var.container_insights ? "enabled" : "disabled"
   }
 
-  tags = merge(
-    var.tags,
-    {
-      "Terraform" = true
-    },
-  )
+  tags = merge(var.tags, {
+  })
   lifecycle {
     ignore_changes = []
-    
+
   }
 }
 
diff --git a/efs.tf b/efs.tf
index e8f620e..4e5ae81 100644
--- a/efs.tf
+++ b/efs.tf
@@ -21,13 +21,10 @@ resource "aws_efs_file_system" "ecs" {
     }
   }
 
-  tags = merge(
-    var.tags,
-    {
-      Name   = "ecs-${var.name}"
-      Backup = var.backup
-    },
-  )
+  tags = merge(var.tags, {
+    Name   = "ecs-${var.name}"
+    Backup = var.backup
+  })
 
   # lifecycle {
   #   prevent_destroy = true
@@ -54,14 +51,11 @@ resource "aws_security_group" "efs" {
   description = "for EFS to talk to ECS cluster"
   vpc_id      = var.vpc_id
 
-  
-    tags = merge(
-    var.tags,
-    {
-      Name   = "ecs-efs-${var.name}"
-      Backup = var.backup
-    },
-  )
+
+  tags = merge(var.tags, {
+    Name   = "ecs-efs-${var.name}"
+    Backup = var.backup
+  })
 }
 
 resource "aws_security_group_rule" "nfs_from_ecs_to_efs" {
diff --git a/iam-codedeploy.tf b/iam-codedeploy.tf
index 8c0ba0a..aa9e54d 100644
--- a/iam-codedeploy.tf
+++ b/iam-codedeploy.tf
@@ -1,12 +1,8 @@
 resource "aws_iam_role" "codedeploy_service" {
   count = var.code_deploy ? 1 : 0
   name  = "codedeploy-service-${var.name}-${data.aws_region.current.name}"
-  tags = merge(
-    var.tags,
-    {
-      "terraform" = "true"
-    },
-  )
+  tags = merge(var.tags, {
+  })
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
diff --git a/iam-ecs-service.tf b/iam-ecs-service.tf
index 4c653ac..472f93a 100644
--- a/iam-ecs-service.tf
+++ b/iam-ecs-service.tf
@@ -1,11 +1,7 @@
 resource "aws_iam_role" "ecs_service" {
   name = "ecs-service-${var.name}-${data.aws_region.current.name}"
-  tags = merge(
-    var.tags,
-    {
-      "terraform" = "true"
-    },
-  )
+  tags = merge(var.tags, {
+  })
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
diff --git a/iam-ecs-task.tf b/iam-ecs-task.tf
index d1342ab..a3c264c 100644
--- a/iam-ecs-task.tf
+++ b/iam-ecs-task.tf
@@ -1,11 +1,7 @@
 resource "aws_iam_role" "ecs_task" {
   name = "ecs-task-${var.name}-${data.aws_region.current.name}"
-  tags = merge(
-    var.tags,
-    {
-      "terraform" = "true"
-    },
-  )
+  tags = merge(var.tags, {
+  })
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
diff --git a/iam-ecs.tf b/iam-ecs.tf
index 1b908f4..2244be9 100644
--- a/iam-ecs.tf
+++ b/iam-ecs.tf
@@ -7,23 +7,16 @@ resource "aws_iam_instance_profile" "ecs" {
   count = var.fargate_only ? 0 : 1
   name  = "ecs-${var.name}-${data.aws_region.current.name}"
   role  = aws_iam_role.ecs[0].name
-    tags = merge(
-    var.tags,
-    {
-      "terraform" = "true"
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "ecs-${var.name}-${data.aws_region.current.name}"
+  })
 }
 
 resource "aws_iam_role" "ecs" {
   count = var.fargate_only ? 0 : 1
   name  = "ecs-${var.name}-${data.aws_region.current.name}"
-  tags = merge(
-    var.tags,
-    {
-      "terraform" = "true"
-    },
-  )
+  tags = merge(var.tags, {
+  })
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
diff --git a/sg-alb-internal.tf b/sg-alb-internal.tf
index 9c68efb..0a9e3a5 100644
--- a/sg-alb-internal.tf
+++ b/sg-alb-internal.tf
@@ -5,13 +5,9 @@ resource "aws_security_group" "alb_internal" {
   description = "SG for ECS Internal ALB"
   vpc_id      = var.vpc_id
 
-  tags = merge(
-    var.tags,
-    {
-      terraform = "true"
-      Name      = "ecs-${var.name}-lb"
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "ecs-${var.name}-lb"
+  })
 }
 
 resource "aws_security_group_rule" "https_from_world_to_alb_internal" {
diff --git a/sg-alb.tf b/sg-alb.tf
index 14b4641..1e3b3af 100644
--- a/sg-alb.tf
+++ b/sg-alb.tf
@@ -5,13 +5,9 @@ resource "aws_security_group" "alb" {
   description = "SG for ECS ALB"
   vpc_id      = var.vpc_id
 
-  tags = merge(
-    var.tags,
-    {
-      terraform = "true"
-      Name      = "ecs-${var.name}-lb"
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "ecs-${var.name}-lb"
+  })
 }
 
 resource "aws_security_group_rule" "http_from_world_to_alb" {
diff --git a/sg-ecs-nodes.tf b/sg-ecs-nodes.tf
index 21e2b00..a1a7b86 100644
--- a/sg-ecs-nodes.tf
+++ b/sg-ecs-nodes.tf
@@ -3,13 +3,9 @@ resource "aws_security_group" "ecs_nodes" {
   description = "SG for ECS nodes"
   vpc_id      = var.vpc_id
 
-   tags = merge(
-    var.tags,
-    {
-      terraform = "true"
-      Name = "ecs-${var.name}-nodes"
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "ecs-${var.name}-nodes"
+  })
 }
 
 resource "aws_security_group_rule" "all_from_alb_to_ecs_nodes" {
diff --git a/waf.tf b/waf.tf
index d901dc0..7199b21 100644
--- a/waf.tf
+++ b/waf.tf
@@ -56,13 +56,9 @@ resource "aws_wafv2_web_acl" "waf_alb" {
     }
   }
 
-   tags = merge(
-    var.tags,
-    {
-      terraform = "true"
-       Name = "waf-${var.name}-web-application"
-    },
-  )
+  tags = merge(var.tags, {
+    Name = "waf-${var.name}-web-application"
+  })
 
   visibility_config {
     cloudwatch_metrics_enabled = true
@@ -86,4 +82,4 @@ resource "aws_wafv2_web_acl_association" "waf_alb_association" {
   count        = var.alb && var.wafv2_enable ? 1 : 0
   resource_arn = aws_lb.ecs[0].arn
   web_acl_arn  = aws_wafv2_web_acl.waf_alb[0].arn
-}
\ No newline at end of file
+}