diff --git a/firewalld/files/zone.xml b/firewalld/files/zone.xml
index 9095200..ca96e47 100644
--- a/firewalld/files/zone.xml
+++ b/firewalld/files/zone.xml
@@ -43,7 +43,7 @@
     {%- if 'comment' in v %}
   <!-- {{ v.comment }} -->
     {%- endif %}
-  <port port="{{ v.port }}" protocol="{{ v.protocol }}"/>
+  <port port="{{ v.port }}" protocol="{{ v.protocol }}" />
   {%- endfor %}
 {%- endif %}
 {%- if 'protocols' in zone %}
@@ -77,7 +77,7 @@
     {%- if 'comment' in v %}
   <!-- {{ v.comment }} -->
     {%- endif %}
-  <source-port port="{{ v.port }}" protocol="{{ v.protocol }}"/>
+  <source-port port="{{ v.port }}" protocol="{{ v.protocol }}" />
   {%- endfor %}
 {%- endif %}
 
@@ -89,28 +89,28 @@
   <rule>
   {%- endif %}    
   {%- if 'ipset' in rule %}
-    <source ipset="{{ rule.ipset.name }}"/>
+    <source ipset="{{ rule.ipset.name }}" />
   {%- endif %}
   {%- if 'source' in rule %}
-    <source address="{{ rule.source.address }}" {%- if 'invert' in rule.source %}invert="{{ rule.source.invert }}"{%- endif %}/>
+    <source address="{{ rule.source.address }}" {%- if 'invert' in rule.source %}invert="{{ rule.source.invert }}"{%- endif %} />
   {%- endif %}    
   {%- if 'destination' in rule %}
-    <destination address="{{ rule.destination.address }}" {%- if 'invert' in rule.destination %}invert="{{ rule.destination.invert }}"{%- endif %}/>
+    <destination address="{{ rule.destination.address }}" {%- if 'invert' in rule.destination %}invert="{{ rule.destination.invert }}"{%- endif %} />
   {%- endif %}    
   {%- if 'service' in rule %}
-    <service name="{{ rule.service }}"/>
+    <service name="{{ rule.service }}" />
   {%- endif %}    
   {%- if 'port' in rule %}
-    <port port="{{ rule.port.portid }}" protocol="{{ rule.port.protocol }}"/>
+    <port port="{{ rule.port.portid }}" protocol="{{ rule.port.protocol }}" />
   {%- endif %}    
   {%- if 'protocol' in rule %}
-    <protocol value="{{ rule.protocol }}"/>
+    <protocol value="{{ rule.protocol }}" />
   {%- endif %}    
   {%- if 'icmp_block' in rule %}
-    <icmp-block name="{{ rule.icmp_block }}"/>
+    <icmp-block name="{{ rule.icmp_block }}" />
   {%- endif %}    
   {%- if 'icmp_type' in rule %}
-    <icmp-type name="{{ rule.icmp_type }}"/>
+    <icmp-type name="{{ rule.icmp_type }}" />
   {%- endif %}    
   {%- if 'masquerade' in rule %}
     {%- if rule.masquerade %}<masquerade/>{%- endif %}
@@ -141,7 +141,7 @@
     <accept/>
   {%- endif %}
   {%- if 'reject' in rule %}
-    <reject{%- if 'type' in rule.reject %} type="{{ rule.reject.type }}"{%- endif %}/>
+    <reject{%- if 'type' in rule.reject %} type="{{ rule.reject.type }}"{%- endif %} />
   {%- endif %}    
   {%- if 'drop' in rule %}
     <drop/>