diff --git a/roles/network/templates/network/dhcpcd.conf b/roles/network/templates/network/dhcpcd.conf
deleted file mode 100644
index a9eaf1c08..000000000
--- a/roles/network/templates/network/dhcpcd.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# A sample configuration for dhcpcd.
-# See dhcpcd.conf(5) for details.
-
-# Allow users of this group to interact with dhcpcd via the control socket.
-#controlgroup wheel
-
-# Inform the DHCP server of our hostname for DDNS.
-hostname
-
-# Use the hardware address of the interface for the Client ID.
-clientid
-# or
-# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361.
-# Some non-RFC compliant DHCP servers do not reply with this set.
-# In this case, comment out duid and enable clientid above.
-#duid
-
-# Persist interface configuration when dhcpcd exits.
-persistent
-
-# Rapid commit support.
-# Safe to enable by default because it requires the equivalent option set
-# on the server to actually work.
-option rapid_commit
-
-# A list of options to request from the DHCP server.
-option domain_name_servers, domain_name, domain_search, host_name
-option classless_static_routes
-# Most distributions have NTP support.
-option ntp_servers
-# Respect the network MTU. This is applied to DHCP routes.
-option interface_mtu
-
-# A ServerID is required by RFC2131.
-require dhcp_server_identifier
-
-# Generate Stable Private IPv6 Addresses instead of hardware based ones
-slaac private
-
-# IIAB
-denyinterfaces {% if iiab_wireless_lan_iface != "none" %} {{ iiab_wireless_lan_iface }} {% endif %} {% if discovered_lan_iface != "none" %} {{ discovered_lan_iface }} {% endif %} {% if iiab_lan_iface != "br0" %} {{ iiab_lan_iface }} {% endif %}
-
-{% if dhcpcd_result == "enabled" and iiab_lan_iface == "br0" %}
-interface {{ iiab_lan_iface }}
-static ip_address={{ lan_ip }}/19
-static domain_name_servers=127.0.0.1
-{% endif %}
-
-# IIAB static IP configuration:
-{% if wan_ip != dhcp %}
-interface {{ iiab_wan_iface }}
-static ip_address={{ wan_ip }}/24
-static routers={{ wan_gateway }}
-domain_name_servers= {{ wan_nameserver }}
-{% endif %}
-
-# It is possible to fall back to a static IP if DHCP fails:
-# define static profile
-#profile static_eth0
-#static ip_address=192.168.1.23/24
-#static routers=192.168.1.1
-#static domain_name_servers=192.168.1.1
-
-# fallback to static profile on eth0
-#interface eth0
-#fallback static_eth0
diff --git a/roles/network/templates/network/dhcpcd.conf.j2 b/roles/network/templates/network/dhcpcd.conf.j2
index e2fa13dd4..63918be98 100644
--- a/roles/network/templates/network/dhcpcd.conf.j2
+++ b/roles/network/templates/network/dhcpcd.conf.j2
@@ -1,4 +1,3 @@
-# Supplied by IIAB
 # A sample configuration for dhcpcd.
 # See dhcpcd.conf(5) for details.
 
@@ -38,15 +37,21 @@ require dhcp_server_identifier
 # Generate Stable Private IPv6 Addresses instead of hardware based ones
 slaac private
 
-# supplied by IIAB
+# IIAB
+denyinterfaces {% if iiab_wireless_lan_iface is defined %} {{ iiab_wireless_lan_iface }} {% endif %} {% if iiab_wired_lan_iface is defined %} {{ iiab_wired_lan_iface }} {% endif %}
 
-#{% if gui_static_wan == true %}
-#denyinterfaces {{ iiab_wan_iface }}
-#{% endif %}
+#{% if iiab_lan_iface != "br0" %} {{ iiab_lan_iface }} {% endif %}
 
 {% if dhcpcd_result == "enabled" and iiab_lan_iface != "none" %}
 interface {{ iiab_lan_iface }}
 static ip_address={{ lan_ip }}/19
-static routers={{ lan_ip }}
-static domain_name_servers={{ lan_ip }}
+static domain_name_servers=127.0.0.1
+{% endif %}
+
+# IIAB static IP configuration:
+{% if wan_ip != "dhcp" %}
+interface {{ iiab_wan_iface }}
+static ip_address={{ wan_ip }}/24
+static routers={{ wan_gateway }}
+domain_name_servers= {{ wan_nameserver }}
 {% endif %}