diff --git a/overlays/runtime/default/etc/hosts.ww b/overlays/runtime/default/etc/hosts.ww
index e1549f3f..8d6e22e8 100644
--- a/overlays/runtime/default/etc/hosts.ww
+++ b/overlays/runtime/default/etc/hosts.ww
@@ -3,10 +3,10 @@
 
 
 {{range $node := $.AllNodes}}
-# Entry for {{$node.Fqdn}}
+# Entry for {{$node.Id}}
 {{- range $devname, $netdev := $node.NetDevs}}
 {{- if $netdev.Default}}
-{{$netdev.Ipaddr}} {{$node.Fqdn}}
+{{$netdev.Ipaddr}} {{$node.Id}}
 {{- else}}
 {{$netdev.Ipaddr}} {{$node.Fqdn}}-{{$devname}}
 {{- end}}
diff --git a/overlays/system/default/etc/hostname.ww b/overlays/system/default/etc/hostname.ww
index c6b7c67e..5bbffc40 100644
--- a/overlays/system/default/etc/hostname.ww
+++ b/overlays/system/default/etc/hostname.ww
@@ -1 +1 @@
-{{$.Self.Fqdn}}
+{{$.Self.Id}}
diff --git a/overlays/system/default/etc/sysconfig/network.ww b/overlays/system/default/etc/sysconfig/network.ww
index c2ce4854..bcbd324d 100644
--- a/overlays/system/default/etc/sysconfig/network.ww
+++ b/overlays/system/default/etc/sysconfig/network.ww
@@ -1,2 +1,2 @@
 NETWORKING=yes
-HOSTNAME={{$.Self.Fqdn}}
+HOSTNAME={{$.Self.Id}}