diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 4e9f46a74..5ee403418 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -291,7 +291,8 @@ rc3_to_2.3.0() {
   INSTALLEDVERSION=2.3.0
 }
 
-2.3.0_to_2.3.20(){DOCKERSTUFFBIP=$(echo $DOCKERSTUFF | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24
+2.3.0_to_2.3.20(){
+  DOCKERSTUFFBIP=$(echo $DOCKERSTUFF | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24
   # Remove PCAP from global
   sed '/pcap:/d' /opt/so/saltstack/local/pillar/global.sls
   sed '/sensor_checkin_interval_ms:/d' /opt/so/saltstack/local/pillar/global.sls
@@ -325,7 +326,7 @@ rc3_to_2.3.0() {
 
   fi
 
-  INSTALLEDVERSION=2.3.0
+  INSTALLEDVERSION=2.3.20
 
 }
 
diff --git a/salt/firewall/assigned_hostgroups.map.yaml b/salt/firewall/assigned_hostgroups.map.yaml
index 30a6117aa..d3fb79117 100644
--- a/salt/firewall/assigned_hostgroups.map.yaml
+++ b/salt/firewall/assigned_hostgroups.map.yaml
@@ -33,9 +33,9 @@ role:
               - {{ portgroups.influxdb }}
               - {{ portgroups.wazuh_api }}
               - {{ portgroups.fleet_api }}
+              - {{ portgroups.sensoroni }}
           sensor:
             portgroups:
-              - {{ portgroups.sensoroni }}
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
           search_node:
@@ -127,12 +127,12 @@ role:
               - {{ portgroups.influxdb }}
               - {{ portgroups.wazuh_api }}
               - {{ portgroups.fleet_api }}
+              - {{ portgroups.sensoroni }}
               {% if ISAIRGAP is sameas true %}
               - {{ portgroups.yum }}
               {% endif %}
           sensor:
             portgroups:
-              - {{ portgroups.sensoroni }}
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
           search_node:
@@ -220,10 +220,10 @@ role:
               - {{ portgroups.influxdb }}
               - {{ portgroups.wazuh_api }}
               - {{ portgroups.fleet_api }}
+              - {{ portgroups.sensoroni }}
               - {{ portgroups.yum }}
           sensor:
             portgroups:
-              - {{ portgroups.sensoroni }}
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
           search_node:
@@ -309,10 +309,10 @@ role:
               - {{ portgroups.influxdb }}
               - {{ portgroups.wazuh_api }}
               - {{ portgroups.fleet_api }}
+              - {{ portgroups.sensoroni }}
               - {{ portgroups.yum }}              
           sensor:
             portgroups:
-              - {{ portgroups.sensoroni }}
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
           search_node:
@@ -394,9 +394,9 @@ role:
               - {{ portgroups.osquery_8080 }}
               - {{ portgroups.influxdb }}
               - {{ portgroups.wazuh_api }}
+              - {{ portgroups.sensoroni }}
           sensor:
             portgroups:
-              - {{ portgroups.sensoroni }}
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
           search_node:
@@ -560,11 +560,11 @@ role:
           minion:
             portgroups:
               - {{ portgroups.docker_registry }}
+              - {{ portgroups.sensoroni }}
           sensor:
             portgroups:
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
-              - {{ portgroups.sensoroni }}
           search_node:
             portgroups:
               - {{ portgroups.redis }}