diff --git a/salt/fleet/install_package.sls b/salt/fleet/install_package.sls
index 583970bcd..579a2fb32 100644
--- a/salt/fleet/install_package.sls
+++ b/salt/fleet/install_package.sls
@@ -2,14 +2,24 @@
 {%- set FLEETNODE = salt['pillar.get']('static:fleet_node', False) -%}
 {%- set FLEETHOSTNAME = salt['pillar.get']('static:fleet_hostname', False) -%}
 {%- set FLEETIP = salt['pillar.get']('static:fleet_ip', False) -%}
+{% set CUSTOM_FLEET_HOSTNAME = salt['pillar.get']('static:fleet_custom_hostname', None) %}
 
-{%- if FLEETMASTER or FLEETNODE %}
+{% if CUSTOM_FLEET_HOSTNAME != None or CUSTOM_FLEET_HOSTNAME != '' %}
+
+{{ CUSTOM_FLEET_HOSTNAME }}:
+  host.present:
+    - ip: {{ FLEETIP }}
+    - clean: True
+
+{% elif FLEETNODE and grains['role'] != 'so-fleet' %}
 
 {{ FLEETHOSTNAME }}:
   host.present:
     - ip: {{ FLEETIP }}
     - clean: True
 
+{% endif %}
+
 launcherpkg:
   pkg.installed:
     - sources:
@@ -18,4 +28,3 @@ launcherpkg:
       {% elif grains['os'] == 'Ubuntu' %}
       - launcher-final: salt://fleet/packages/launcher.deb
       {% endif %}
-{%- endif %}