diff --git a/roles/network/templates/network/netplan.j2 b/roles/network/templates/network/netplan.j2
index 9223307d4..ece05aa49 100644
--- a/roles/network/templates/network/netplan.j2
+++ b/roles/network/templates/network/netplan.j2
@@ -1,27 +1,23 @@
 network:
-    version: 2
+  version: 2
 {% if network_manager_active %}
-    renderer: NetworkManager
+  renderer: NetworkManager
 {% else  %}
-    renderer: networkd
+  renderer: networkd
 {% endif %}
-    ethernets:
+  ethernets:
+    {{ iiab_wan_iface }}:
 {% if wan_ip != "dhcp" %}
-        {{ iiab_wan_iface }}:
-            addresses:
-            - {{ wan_ip }}/{{ wan_cidr }}
-            gateway4: {{ wan_gateway }}
-            nameservers:
-               addresses:
-               - {{ wan_nameserver }}
-               search:
-               - {{ iiab_domain }}
-            optional: true
+      addresses:
+      - {{ wan_ip }}/{{ wan_cidr }}
+      gateway4: {{ wan_gateway }}
+      nameservers:
+        addresses:
+        - {{ wan_nameserver }}
+      search:
+      - {{ iiab_domain }}
 {% else %}
-        {{ iiab_wan_iface }}:
-            addresses: []
-            dhcp4: true
-            optional: true
+      dhcp4: yes
 {% endif %}
 #{% if iiab_lan_iface == "br0" %}
 #    bridges: