diff --git a/environments/site/tofu/control.tf b/environments/site/tofu/control.tf
index 87da2f784..6c9dd7156 100644
--- a/environments/site/tofu/control.tf
+++ b/environments/site/tofu/control.tf
@@ -105,9 +105,8 @@ resource "openstack_compute_instance_v2" "control" {
       - [LABEL=state, ${var.state_dir}]
       %{if var.home_volume_provisioning != "none"}
       - [LABEL=home, /exports/home]
-      %{endif}
+      %{endif}%{if var.additional_cloud_config != ""}
 
-    %{if var.additional_cloud_config != ""}
     ${templatestring(var.additional_cloud_config, var.additional_cloud_config_vars)}
     %{endif}
   EOF
diff --git a/environments/site/tofu/node_group/nodes.tf b/environments/site/tofu/node_group/nodes.tf
index 455cd1004..fa7e81ffc 100644
--- a/environments/site/tofu/node_group/nodes.tf
+++ b/environments/site/tofu/node_group/nodes.tf
@@ -202,9 +202,9 @@ resource "openstack_compute_instance_v2" "compute" {
 
   user_data = <<-EOF
     #cloud-config
-    fqdn: ${local.fqdns[each.key]}
+    fqdn: ${local.fqdns[each.key]}%{if var.additional_cloud_config != ""}
+
 
-    %{if var.additional_cloud_config != ""}
     ${templatestring(var.additional_cloud_config, var.additional_cloud_config_vars)}
     %{endif}
   EOF