diff --git a/internal/pkg/node/datastructure.go b/internal/pkg/node/datastructure.go
index 2a23621e..58a3fda4 100644
--- a/internal/pkg/node/datastructure.go
+++ b/internal/pkg/node/datastructure.go
@@ -29,8 +29,8 @@ type NodeConf struct {
 	IpmiIpaddr     string              `yaml:"ipmi ipaddr,omitempty"`
 	IpmiNetmask    string              `yaml:"ipmi netmask,omitempty"`
 	IpmiGateway    string              `yaml:"ipmi gateway,omitempty"`
-	RuntimeOverlay string              `yaml:"runtime overlay files,omitempty"`
-	SystemOverlay  string              `yaml:"system overlay files,omitempty"`
+	RuntimeOverlay string              `yaml:"runtime overlay,omitempty"`
+	SystemOverlay  string              `yaml:"system overlay,omitempty"`
 	Init           string              `yaml:"init,omitempty"`
 	Discoverable   bool                `yaml:"discoverable,omitempty"`
 	Profiles       []string            `yaml:"profiles,omitempty"`
diff --git a/overlays/runtime/default/etc/hosts.ww b/overlays/runtime/default/etc/hosts.ww
index 8d6e22e8..65af0fd4 100644
--- a/overlays/runtime/default/etc/hosts.ww
+++ b/overlays/runtime/default/etc/hosts.ww
@@ -8,7 +8,7 @@
 {{- if $netdev.Default}}
 {{$netdev.Ipaddr}} {{$node.Id}}
 {{- else}}
-{{$netdev.Ipaddr}} {{$node.Fqdn}}-{{$devname}}
+{{$netdev.Ipaddr}} {{$node.Id}}-{{$devname}}
 {{- end}}
 {{- end}}
 {{end}}