diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml
index e2103047d..8830dcaa9 100644
--- a/roles/network/tasks/debian.yml
+++ b/roles/network/tasks/debian.yml
@@ -44,6 +44,11 @@
             src=network/rpi.j2
   when: is_rpi and iiab_lan_iface == "br0"
 
+- name: Workaround auto issue on Debian-9
+  template: dest=/etc/network/interfaces.d/patch_auto
+            src=network/debian-auto
+  when: iiab_wan_iface != "none" and is_debian_9
+
 - name: bind may be affected
   service: name={{ dns_service }} state=stopped
   when: named_install and dnsmasq_enabled
diff --git a/roles/network/templates/network/debian-auto.j2 b/roles/network/templates/network/debian-auto.j2
new file mode 100644
index 000000000..3aaa4fde6
--- /dev/null
+++ b/roles/network/templates/network/debian-auto.j2
@@ -0,0 +1 @@
+auto {{ iiab_wan_iface }}