diff --git a/salt/minion/ca.sls b/salt/minion/ca.sls
index 9966293..7f3c38d 100644
--- a/salt/minion/ca.sls
+++ b/salt/minion/ca.sls
@@ -29,7 +29,7 @@
 /etc/pki/ca/{{ ca_name }}/ca.crt:
   x509.certificate_managed:
   - signing_private_key: /etc/pki/ca/{{ ca_name }}/ca.key
-  - CN: {{ ca.common_name }}
+  - CN: "{{ ca.common_name }}"
   {%- if ca.country is defined %}
   - C: {{ ca.country }}
   {%- endif %}
diff --git a/salt/minion/cert.sls b/salt/minion/cert.sls
index 594d686..abe95a4 100644
--- a/salt/minion/cert.sls
+++ b/salt/minion/cert.sls
@@ -43,9 +43,9 @@
     - ca_server: {{ cert.host }}
     - signing_policy: {{ cert.authority }}_{{ cert.signing_policy }}
     - public_key: {{ key_file }}
-    - CN: {{ cert.common_name }}
+    - CN: "{{ cert.common_name }}"
     {%- if cert.alternative_names is defined %}
-    - subjectAltName: {{ cert.alternative_names }}
+    - subjectAltName: "{{ cert.alternative_names }}"
     {%- endif %}
     - days_remaining: 30
     - backup: True