diff --git a/overlays/generic/etc/hosts.ww b/overlays/generic/etc/hosts.ww
index c1c2e5a8..0f2f1b1e 100644
--- a/overlays/generic/etc/hosts.ww
+++ b/overlays/generic/etc/hosts.ww
@@ -4,7 +4,7 @@
 
 
 # Warewulf Server
-{{$.Ipaddr}} {{$.BuildHost}}
+{{$.Ipaddr}} warewulf {{$.BuildHost}}
 
 {{-range $node := $.AllNodes}}                  {{/* for each node */}}
 # Entry for {{$node.Id.Get}}
diff --git a/overlays/host/etc/hosts.ww b/overlays/host/etc/hosts.ww
index db0d9577..9673da61 100644
--- a/overlays/host/etc/hosts.ww
+++ b/overlays/host/etc/hosts.ww
@@ -4,9 +4,11 @@
 # Time:   {{.BuildTime}}
 # Source: {{.BuildSource}}
 
+
 # Warewulf Server
-{{$.Ipaddr}} {{$.BuildHost}}
-{{range $node := $.AllNodes}}                  {{/* for each node */}}
+{{$.Ipaddr}} warewulf {{$.BuildHost}}
+
+{{-range $node := $.AllNodes}}                  {{/* for each node */}}
 # Entry for {{$node.Id.Get}}
 {{- range $devname, $netdev := $node.NetDevs}} {{/* for each network device on the node */}}
 {{- if $netdev.Ipaddr.Defined}}                {{/* if we have an ip address on this network device */}}