diff --git a/salt/firewall/soc_firewall.yaml b/salt/firewall/soc_firewall.yaml
index 582c01bba..c54d3011e 100644
--- a/salt/firewall/soc_firewall.yaml
+++ b/salt/firewall/soc_firewall.yaml
@@ -43,7 +43,7 @@ firewall:
     standalone: *hostgroupsettings
     strelka_frontend: *hostgroupsettings
     syslog: *hostgroupsettings
-    customhostgroup1: &customhostgroupsettings
+    customhostgroup0: &customhostgroupsettings
       description: List of IP or CIDR blocks to allow to this hostgroup.
       forcedType: "[]string"
       helpLink: firewall.html
@@ -51,6 +51,7 @@ firewall:
       multiline: True
       regex: ^(([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?)?$
       regexFailureMessage: You must enter a valid IP address or CIDR.
+    customhostgroup1: *customhostgroupsettings
     customhostgroup2: *customhostgroupsettings
     customhostgroup3: *customhostgroupsettings
     customhostgroup4: *customhostgroupsettings
@@ -59,7 +60,6 @@ firewall:
     customhostgroup7: *customhostgroupsettings
     customhostgroup8: *customhostgroupsettings
     customhostgroup9: *customhostgroupsettings
-    customhostgroup0: *customhostgroupsettings
   portgroups:
     all:
       tcp: &tcpsettings