diff --git a/roles/network/templates/network/dhcpcd.conf.j2 b/roles/network/templates/network/dhcpcd.conf.j2
index 80d13c807..9fbbe3058 100644
--- a/roles/network/templates/network/dhcpcd.conf.j2
+++ b/roles/network/templates/network/dhcpcd.conf.j2
@@ -38,7 +38,7 @@ require dhcp_server_identifier
 slaac private
 
 # IIAB
-timeout 10
+timeout {{ dhcp_timeout }}
 
 # always support Ethernet-to-Internet on RPi (avoid "denyinterfaces eth0")
 {% if is_rpi and hostapd_enabled %}
@@ -64,6 +64,7 @@ static ip_address={{ wan_ip }}/24
 static routers={{ wan_gateway }}
 static domain_name_servers={{ wan_nameserver }}
 
+{% if wan_try_dhcp_then_static_ip == "true" %}
 interface {{ iiab_wan_iface }}
 {% if wan_ipV4LL == "false" %}
 arping 192.0.2.1
@@ -72,3 +73,4 @@ fallback {{ wan_gateway }}
 arping {{ wan_gateway }}
 {% endif %}
 {% endif %}
+{% endif %}