diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index a0780ecf6..efa3032dc 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -142,6 +142,7 @@ regkeyperms:
     - signing_policy: managerssl
     - public_key: /etc/pki/managerssl.key
     - CN: {{ manager }}
+    - subjectAltName: DNS:{{ HOSTNAME }}, IP:{{ MAINIP }} {% if CUSTOM_FLEET_HOSTNAME != None %},DNS:{{ CUSTOM_FLEET_HOSTNAME }} {% endif %}
     - days_remaining: 0
     - days_valid: 820
     - backup: True
@@ -289,4 +290,4 @@ fleetkeyperms:
     - mode: 640
     - group: 939
 
-{% endif %}
+{% endif %}
\ No newline at end of file