diff --git a/data/data/openstack/bootstrap/main.tf b/data/data/openstack/bootstrap/main.tf
index 7e3e47110c7..7c456c2a1fe 100644
--- a/data/data/openstack/bootstrap/main.tf
+++ b/data/data/openstack/bootstrap/main.tf
@@ -49,7 +49,7 @@ data "ignition_file" "hostname" {
 
   content {
     content = <<EOF
-bootstrap
+${var.cluster_id}-bootstrap
 EOF
 
   }
diff --git a/data/data/openstack/masters/main.tf b/data/data/openstack/masters/main.tf
index a5430cd5b24..624ec41ee45 100644
--- a/data/data/openstack/masters/main.tf
+++ b/data/data/openstack/masters/main.tf
@@ -15,7 +15,7 @@ data "ignition_file" "hostname" {
 
   content {
     content = <<EOF
-master-${count.index}
+${var.cluster_id}-master-${count.index}
 EOF
 
   }