diff --git a/modules/nomad-clients/ec2.tf b/modules/nomad-clients/ec2.tf
index c968205..8b6cd13 100644
--- a/modules/nomad-clients/ec2.tf
+++ b/modules/nomad-clients/ec2.tf
@@ -41,7 +41,7 @@ resource "aws_instance" "nomad_client" {
   }))
 
   tags = {
-    Name           = "${var.cluster_name}-client-${var.client_name}-${count.index + 1}"
+    Name           = "${var.client_name}-${count.index + 1}"
     role           = "nomad-client"
     nomad_client   = var.client_name
     nomad_ec2_join = var.nomad_join_tag_value
diff --git a/modules/nomad-clients/launch_template.tf b/modules/nomad-clients/launch_template.tf
index 04b0834..1e07950 100644
--- a/modules/nomad-clients/launch_template.tf
+++ b/modules/nomad-clients/launch_template.tf
@@ -48,7 +48,7 @@ resource "aws_launch_template" "nomad_client" {
     resource_type = "instance"
 
     tags = {
-      Name = "${var.cluster_name}-client-${var.client_name}"
+      Name = var.client_name
     }
   }