diff --git a/roles/network/templates/network/cloud-init.j2 b/roles/network/templates/network/cloud-init.j2
index 850c2ab40..32fc6f7d0 100644
--- a/roles/network/templates/network/cloud-init.j2
+++ b/roles/network/templates/network/cloud-init.j2
@@ -2,12 +2,14 @@
 network:
     ethernets:
         {{ iiab_wan_iface }}:
-            dhcp4: false
-            dhcp6: false
-            addresses: [{{ wan_ip }}/{{ wan_cidr }}]
+            addresses:
+            - {{ wan_ip }}/{{ wan_cidr }}
             gateway4: {{ wan_gateway }}
             nameservers:
-               addresses: [{{ wan_nameserver }}]
+               addresses:
+               - {{ wan_nameserver }}
+               search:
+               - {{ iiab_domain }}
             optional: true
     version: 2
 {% else %}