diff --git a/salt/firewall/soc/soc.map.jinja b/salt/firewall/soc/soc.map.jinja
index cd3fa0401..7e86d5252 100644
--- a/salt/firewall/soc/soc.map.jinja
+++ b/salt/firewall/soc/soc.map.jinja
@@ -1,2 +1,2 @@
 {% import_yaml 'firewall/soc/defaults_soc_firewall.yaml' as DEFAULT_SOC_FIREWALL %}
-{% set SOC_FIREWALL = salt['pillar.get'}('firewall:custom_groups:groups', DEFAULT_SOC_FIREWALL.firewall.hostgroups, merge=True) %}
+{% set SOC_FIREWALL = salt['pillar.get']('firewall:custom_groups:groups', DEFAULT_SOC_FIREWALL.firewall.hostgroups, merge=True) %}
diff --git a/salt/firewall/soc/soc_firewall.yaml.jinja b/salt/firewall/soc/soc_firewall.yaml.jinja
index 916fd83d1..0a8a4761f 100644
--- a/salt/firewall/soc/soc_firewall.yaml.jinja
+++ b/salt/firewall/soc/soc_firewall.yaml.jinja
@@ -1 +1,3 @@
 {% from 'firewall/soc/soc.map.jinja' import SOC_FIREWALL %}
+
+{{ SOC_FIREWALL | yaml(false) }}