diff --git a/overlays/wwinit/etc/issue.ww b/overlays/wwinit/etc/issue.ww
index 00463bf0..134e8994 100644
--- a/overlays/wwinit/etc/issue.ww
+++ b/overlays/wwinit/etc/issue.ww
@@ -7,5 +7,7 @@ Network:
 {{- range $devname, $netdev := .NetDevs}}
     {{$devname}}: {{$netdev.Device}}
     {{$devname}}: {{$netdev.IpCIDR}}
+{{if $netdev.Hwaddr }}
     {{$devname}}: {{$netdev.Hwaddr}}
+{{ end -}}
 {{end}}
\ No newline at end of file
diff --git a/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg.ww b/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg.ww
index 973970a3..7449adab 100644
--- a/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg.ww
+++ b/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg.ww
@@ -14,7 +14,11 @@ BOOTPROTO=static
 DEVTIMEOUT=10
 IPADDR={{ $netdev.Ipaddr }}
 NETMASK={{ $netdev.Netmask }}
+{{ if $netdev.Gateway -}}
 GATEWAY={{ $netdev.Gateway }}
+{{ end -}}
+{{ if $netdev.Hwaddr -}}
 HWADDR={{ $netdev.Hwaddr }}
+{{ end -}}
 ONBOOT=yes
 {{ end -}}
diff --git a/overlays/wwinit/etc/wicked/ifconfig/ifcfg.xml.ww b/overlays/wwinit/etc/wicked/ifconfig/ifcfg.xml.ww
index 1702cf0a..cadb45b5 100644
--- a/overlays/wwinit/etc/wicked/ifconfig/ifcfg.xml.ww
+++ b/overlays/wwinit/etc/wicked/ifconfig/ifcfg.xml.ww
@@ -25,11 +25,13 @@ Source: {{ $source }}
     <address>
       <local>{{$netdev.IpCIDR}}</local>
     </address>
+{{ if $netdev.Gateway -}}
     <route>
       <nexthop>
         <gateway>{{$netdev.Gateway}}</gateway>
       </nexthop>
     </route>
+{{ end -}}
   </ipv4:static>
   <ipv6>
     <enabled>true</enabled>