diff --git a/overlays/wwinit/etc/issue.ww b/overlays/wwinit/etc/issue.ww
index 38088e3d..d526a2b6 100644
--- a/overlays/wwinit/etc/issue.ww
+++ b/overlays/wwinit/etc/issue.ww
@@ -1,6 +1,6 @@
 Warewulf Node:      {{.Id}}
 Container:          {{.Container}}
-Kernel:             {{.Kernel.Version}}
+{{ if .Kernel.Version }}Kernel:             {{.Kernel.Version}} {{ end -}}
 Kernelargs:         {{.Kernel.Args}}
 
 Network:
diff --git a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
index 4bfcd3fa..e56c063c 100644
--- a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
+++ b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
@@ -1,9 +1,16 @@
-# /etc/systemd/network/10-persistent-net.link
+# This file is autogenerated by warewulf 
+# Host:   {{.BuildHost}}
+# Time:   {{.BuildTime}}
+# Source: {{.BuildSource}}
 {{range $devname, $netdev := .NetDevs}}
 {{- if $netdev.Primary}}
 [Match]
 MACAddress={{$netdev.Hwaddr}}
 [Link]
-Name={{$devname}}
-{{- end}}
+{{ if $netdev.Device -}}
+Name={{ $netdev.Device }}
+{{ else -}}
+Name={{ $devname }}
+{{ end -}}
+{{ end -}}
 {{end}}