diff --git a/tasks/setup.yml b/tasks/setup.yml
index 0acd52c..0beca40 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -73,9 +73,10 @@
         src: etc/firewalld/zones/zone.xml.j2
         dest: /etc/firewalld/zones/{{ item.name }}.xml
         mode: 0640
-      loop: "{{ __firewalld_zones | difference(firewalld_zones_unmanaged) }}"
+      loop: "{{ __firewalld_zones }}"
       loop_control:
         label: "{{ item.name }}"
+      when: item.name not in firewalld_zones_unmanaged
       notify: __firewalld_reload
 
     - name: Register active zones
@@ -95,7 +96,7 @@
       notify: __firewalld_reload
       when:
         - (item | basename | splitext | first) not in (__firewalld_zones | map(attribute='name') | list)
-        - (item not in firewalld_zones_unmanaged)
+        - (item | basename | splitext | first) not in firewalld_zones_unmanaged
 
     - name: Validate deployed configuration
       command: firewall-offline-cmd --check-config