diff --git a/ubuntu/roles/firewall-ruleset-deploy/handlers/main.yml b/ubuntu/roles/firewall-ruleset-deploy/handlers/main.yml
new file mode 100644
index 0000000..34ab5ba
--- /dev/null
+++ b/ubuntu/roles/firewall-ruleset-deploy/handlers/main.yml
@@ -0,0 +1,13 @@
+---
+
+- name: restart netfilter-persistent-v4
+  service:
+    name: netfilter-persistent
+    state: restarted
+    enabled: yes
+
+- name: restart netfilter-persistent-v6
+  service:
+    name: netfilter-persistent
+    state: restarted
+    enabled: yes
diff --git a/ubuntu/roles/firewall-ruleset-deploy/tasks/main.yml b/ubuntu/roles/firewall-ruleset-deploy/tasks/main.yml
index 757f0f7..169233d 100644
--- a/ubuntu/roles/firewall-ruleset-deploy/tasks/main.yml
+++ b/ubuntu/roles/firewall-ruleset-deploy/tasks/main.yml
@@ -14,14 +14,12 @@
   copy:
     src: "{{ ansible_fqdn }}.rules.v4"
     dest: /etc/iptables/rules.v4
+  notify:
+    - restart netfilter-persistent-v4
 
 - name: Copy IPv6 ruleset
   copy:
     src: "{{ ansible_fqdn }}.rules.v6"
     dest: /etc/iptables/rules.v6
-
-- name: Restart netfilter-persistent service to load rulesets
-  service:
-    name: netfilter-persistent
-    state: restarted
-    enabled: yes
+  notify:
+    - restart netfilter-persistent-v6