diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index aa4ddf55f..9cd47e4dc 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -707,8 +707,19 @@ up_to_2.3.90() {
 up_to_2.3.100() {
   echo "Updating to Security Onion 2.3.100"
   fix_wazuh
+  
   echo "Removing /opt/so/state files for patched Salt InfluxDB module and state. This is due to Salt being upgraded and needing to patch the files again."
   rm -vrf /opt/so/state/influxdb_continuous_query.py.patched /opt/so/state/influxdb_retention_policy.py.patched /opt/so/state/influxdbmod.py.patched
+  
+  echo "Adding receiver hostgroup with so-firewall"
+  if so-firewall addhostgroup receiver 2>&1 | grep -q 'Already exists'; then
+    echo 'receiver hostgroup already exists'
+  else
+    echo 'receiver hostgroup added'
+  fi
+
+  echo "Adding receiver to assigned_hostgroups.local.map.yaml"
+  grep -qxF "  receiver:" /opt/so/saltstack/local/salt/firewall/assigned_hostgroups.local.map.yaml || sed -i -e '$a\  receiver:' /opt/so/saltstack/local/salt/firewall/assigned_hostgroups.local.map.yaml
 }
 
 verify_upgradespace() {
diff --git a/salt/repo/client/init.sls b/salt/repo/client/init.sls
index 27ffbe527..081fef762 100644
--- a/salt/repo/client/init.sls
+++ b/salt/repo/client/init.sls
@@ -1,7 +1,7 @@
 {% from 'repo/client/map.jinja' import ABSENTFILES with context %}
 {% from 'repo/client/map.jinja' import REPOPATH with context %}
 {% set ISAIRGAP = salt['pillar.get']('global:airgap', False) %}
-{% set managerupdates = salt['pillar.get']('global:managerupdate', '0') %}
+{% set managerupdates = salt['pillar.get']('global:managerupdate', 0) %}
 {% set role = grains.id.split('_') | last %}
 
 # from airgap state
@@ -47,6 +47,12 @@ crsynckeys:
     - source: salt://repo/client/files/centos/keys/
 
 {% if not ISAIRGAP %}
+    {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %}
+remove_securityonionrepocache:
+  file.absent:
+    - name: /etc/yum.repos.d/securityonioncache.repo
+    {% endif %}
+
 crsecurityonionrepo:
   file.managed:
     {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %}
diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja
index 3ef334752..b66ec23eb 100644
--- a/salt/salt/map.jinja
+++ b/salt/salt/map.jinja
@@ -27,9 +27,9 @@
 
 {% if grains.saltversion|string != SALTVERSION|string %}
   {% if grains.os|lower in ['centos', 'redhat'] %}
-      {% set UPGRADECOMMAND = 'yum clean all ; /usr/sbin/bootstrap-salt.sh -X -s 120 -r -F -x python3 stable ' ~ SALTVERSION %}
+      {% set UPGRADECOMMAND = 'yum clean all ; /usr/sbin/bootstrap-salt.sh -s 120 -r -F -x python3 stable ' ~ SALTVERSION %}
   {% elif grains.os|lower == 'ubuntu' %}
-    {% set UPGRADECOMMAND = '/usr/sbin/bootstrap-salt.sh -X -s 120 -F -x python3 stable ' ~ SALTVERSION %}
+    {% set UPGRADECOMMAND = '/usr/sbin/bootstrap-salt.sh -s 120 -F -x python3 stable ' ~ SALTVERSION %}
   {% endif %}
 {% else %}
   {% set UPGRADECOMMAND = 'echo Already running Salt Minion version ' ~ SALTVERSION %}