diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 5690691fc..9d4026b56 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -445,7 +445,7 @@ msslkeyperms:
   x509.certificate_managed:
     - signing_private_key: /etc/pki/fleet.key
     - CN: {{ manager }}
-    - subjectAltName: DNS:{{ manager }},IP:{{ managerip }}
+    - subjectAltName: DNS:{{ manager }},IP:{{ managerip }}{% if CUSTOM_FLEET_HOSTNAME != None %},DNS:{{ CUSTOM_FLEET_HOSTNAME }}{% endif %}
     - days_remaining: 0
     - days_valid: 820
     - backup: True