diff --git a/salt/ca/init.sls b/salt/ca/init.sls
index 1f3b405ef..3d4fe90f4 100644
--- a/salt/ca/init.sls
+++ b/salt/ca/init.sls
@@ -1,3 +1,4 @@
+{% set master = salt['grains.get']('master') %}
 /etc/salt/minion.d/signing_policies.conf:
   file.managed:
     - source: salt://ca/files/signing_policies.conf
@@ -19,7 +20,7 @@ pki_private_key:
 /etc/pki/ca.crt:
   x509.certificate_managed:
     - signing_private_key: /etc/pki/ca.key
-    - CN: ca.example.com
+    - CN: {{ master }}
     - C: US
     - ST: Utah
     - L: Salt Lake City
diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 50851ea98..9d47f586a 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -14,7 +14,7 @@
     - ca_server: {{ master }}
     - signing_policy: filebeat
     - public_key: /etc/pki/filebeat.key
-    - CN: ca.example.com
+    - CN: {{ master }}
     - days_remaining: 3000
     - backup: True
     - managed_private_key:
@@ -40,7 +40,7 @@ fbcrtlink:
     - ca_server: {{ master }}
     - signing_policy: filebeat
     - public_key: /etc/pki/registry.key
-    - CN: ca.example.com
+    - CN: {{ master }}
     - days_remaining: 3000
     - backup: True
     - managed_private_key: