diff --git a/terraform/cloud-init.tf b/terraform/cloud-init.tf
index 5da7d32..18bffae 100644
--- a/terraform/cloud-init.tf
+++ b/terraform/cloud-init.tf
@@ -1,9 +1,11 @@
 ### Global cloud-init template (for all VMs)
 
 data "template_file" "cloud_init_global" {
-  template = file("${path.module}/files/cloud_init_base.yaml")
+  template = file("${path.module}/files/cloud_init_global.yaml")
 
   vars = {
+    hostname   = "generic"
+    domain     = "home.arpa"
     TS_AUTHKEY = var.TS_AUTHKEY
   }
 }
diff --git a/terraform/files/cloud_init_base.yaml b/terraform/files/cloud_init_base.yaml
index a4d9277..10c89e6 100644
--- a/terraform/files/cloud_init_base.yaml
+++ b/terraform/files/cloud_init_base.yaml
@@ -1,7 +1,4 @@
 #cloud-config
-hostname: ${hostname}
-fqdn: ${hostname}.${domain}
-
 runcmd:
   - curl -fsSL https://tailscale.com/install.sh | sh
   - tailscale up --auth-key=${TS_AUTHKEY}