diff --git a/salt/elasticfleet/enabled.sls b/salt/elasticfleet/enabled.sls
index d3210c150..6903d576f 100644
--- a/salt/elasticfleet/enabled.sls
+++ b/salt/elasticfleet/enabled.sls
@@ -39,7 +39,7 @@ so-elastic-fleet:
       {% endfor %}
     - binds:
       - /etc/pki:/etc/pki:ro
-      {% if GLOBALS.os == 'Ubuntu' %}
+      {% if GLOBALS.os_family == 'Debian' %}
       - /etc/ssl:/etc/ssl:ro
       {% endif %}
       #- /opt/so/conf/elastic-fleet/state:/usr/share/elastic-agent/state:rw
@@ -56,7 +56,7 @@ so-elastic-fleet:
       - FLEET_SERVER_POLICY_ID=FleetServer_{{ GLOBALS.hostname }}
       - FLEET_SERVER_CERT=/etc/pki/elasticfleet.crt
       - FLEET_SERVER_CERT_KEY=/etc/pki/elasticfleet.key
-      {% if GLOBALS.os == 'Ubuntu' %}
+      {% if GLOBALS.os_family == 'Debian' %}
       - FLEET_CA=/etc/ssl/certs/intca.crt     
       - FLEET_SERVER_ELASTICSEARCH_CA=/etc/ssl/certs/intca.crt
       {% else %}
diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
index faf2cab90..dbcbdc17d 100755
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
@@ -6,7 +6,7 @@
 # this file except in compliance with the Elastic License 2.0.
 {% from 'vars/globals.map.jinja' import GLOBALS %}
 
-{% if GLOBALS.os == 'Ubuntu' %}
+{% if GLOBALS.os_family == 'Debian' %}
 INTCA=/etc/ssl/certs/intca.crt
 {% else %}
 INTCA=/etc/pki/tls/certs/intca.crt
diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja
index b6b109c47..1120685fb 100644
--- a/salt/salt/map.jinja
+++ b/salt/salt/map.jinja
@@ -1,7 +1,7 @@
 {% import_yaml 'salt/minion.defaults.yaml' as saltminion %}
 {% set SALTVERSION = saltminion.salt.minion.version %}
 
-{% if grains.os == 'Ubuntu' %}
+{% if grains.os_family == 'Debian' %}
   {% set SPLITCHAR = '+' %}
   {% set SALTNOTHELD = salt['cmd.run']('apt-mark showhold | grep -q salt ; echo $?', python_shell=True) %}
   {% set SALTPACKAGES = ['salt-common', 'salt-master', 'salt-minion'] %}
@@ -22,7 +22,7 @@
 {% if grains.saltversion|string != SALTVERSION|string %}
   {% if grains.os|lower in ['Rocky', 'redhat', 'CentOS Stream'] %}
       {% set UPGRADECOMMAND = 'yum clean all ; /usr/sbin/bootstrap-salt.sh -s 120 -r -F -x python3 stable ' ~ SALTVERSION %}
-  {% elif grains.os|lower == 'ubuntu' %}
+  {% elif grains.os_family|lower == 'debian' %}
     {% set UPGRADECOMMAND = '/usr/sbin/bootstrap-salt.sh -s 120 -r -F -x python3 stable ' ~ SALTVERSION %}
   {% endif %}
 {% else %}