diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index 6bf28c2..df83109 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -14,6 +14,14 @@
     insertafter: '^# net devices'
   notify: mkinitfs
 
+- name: Tell ifupdown to also rename network interfaces
+  copy:
+    dest: /etc/network/if-pre-up.d/nameif
+    content: |
+      #!/bin/sh
+      nameif -s
+    mode: 0755
+
 - name: Configure interface names
   template:
     dest: /etc/mactab