diff --git a/tasks/iptables.yml b/tasks/iptables.yml
index 7c6ee38..9b791a4 100644
--- a/tasks/iptables.yml
+++ b/tasks/iptables.yml
@@ -1,26 +1,13 @@
 ---
 - name: iptables - install iptables-persistent
   package: name=iptables-persistent
-  when: ansible_os_family == "Debian"
-
-- name: iptables - install iptables
-  package: name=iptables
-  when: ansible_os_family != "Debian"
 
 - name: /etc/iptables/rules.v4
   template: "dest=/etc/iptables/rules.v4 src={{ common_iptables_v4 }} owner=root group=root mode=0644"
   notify:
     iptables restore
 
-- name: iptables - setup service for IPv4
-  service: name=iptables enabled=yes
-  when: ansible_os_family != "Debian"
-
 - name: /etc/iptables/rules.v6
   template: "dest=/etc/iptables/rules.v6 src={{ common_iptables_v6 }} owner=root group=root mode=0644"
   notify:
     iptables restore
-
-- name: iptables - setup service for IPv6
-  service: name=ip6tables enabled=yes
-  when: ansible_os_family != "Debian"
diff --git a/tasks/iptables_void.yml b/tasks/iptables_void.yml
new file mode 100644
index 0000000..90ab3bf
--- /dev/null
+++ b/tasks/iptables_void.yml
@@ -0,0 +1,19 @@
+---
+- name: iptables - install iptables
+  package: name=iptables
+
+- name: /etc/iptables/rules.v4
+  template: "dest=/etc/iptables/iptables.rules src={{ common_iptables_v4 }} owner=root group=root mode=0644"
+  notify:
+    iptables restore
+
+- name: iptables - setup service for IPv4
+  service: name=iptables enabled=yes
+
+- name: /etc/iptables/rules.v6
+  template: "dest=/etc/iptables/ip6tables.rules src={{ common_iptables_v6 }} owner=root group=root mode=0644"
+  notify:
+    iptables restore
+
+- name: iptables - setup service for IPv6
+  service: name=ip6tables enabled=yes
diff --git a/tasks/main.yml b/tasks/main.yml
index 535891e..100e916 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -70,7 +70,11 @@
   tags: ['common', 'logrotate']
 
 - import_tasks: iptables.yml
-  when: common_iptables
+  when: common_iptables and ansible_os_family == "Debian"
+  tags: ['common', 'iptables']
+
+- import_tasks: iptables_void.yml
+  when: common_iptables and ansible_os_family != "Debian"
   tags: ['common', 'iptables']
 
 - import_tasks: snapper.yml