diff --git a/roles/raspbian/handlers/main.yml b/roles/raspbian/handlers/main.yml
new file mode 100644
index 0000000..d25cf90
--- /dev/null
+++ b/roles/raspbian/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: reboot
+  reboot:
diff --git a/roles/raspbian/tasks/main.yml b/roles/raspbian/tasks/main.yml
index 22fb952..04c931a 100644
--- a/roles/raspbian/tasks/main.yml
+++ b/roles/raspbian/tasks/main.yml
@@ -5,7 +5,8 @@
       ( ansible_facts.architecture is search("arm") and
         ansible_facts.lsb.description is match("[Rr]aspbian.*[Bb]uster") ) or
       ( ansible_facts.architecture is search("aarch64") and
-        ansible_facts.lsb.description is match("Debian.*buster") ) %}True{% else %}False{% endif %}'
+        ansible_facts.lsb.description is match("Debian.*buster") or
+        ansible_facts.lsb.description is match("[Rr]aspbian.*[Bb]uster") ) %}true{% else %}false{% endif %}'
 
 - name: Activating cgroup support
   lineinfile:
@@ -13,12 +14,15 @@
     regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
     line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
     backrefs: true
-  when: raspbian
+  notify: reboot
+  when:
+    - raspbian is true
 
 - name: Flush iptables before changing to iptables-legacy
   iptables:
     flush: true
   when: raspbian
+  changed_when: false   # iptables flush always returns changed
 
 - name: Changing to iptables-legacy
   alternatives:
@@ -33,7 +37,3 @@
     name: ip6tables
   register: ip6_legacy
   when: raspbian
-
-- name: Rebooting
-  reboot:
-  when: raspbian