diff --git a/base/pki/host.sls b/base/pki/host.sls
index d88c50d..1b4ced3 100644
--- a/base/pki/host.sls
+++ b/base/pki/host.sls
@@ -14,8 +14,8 @@
     - ca_server: tumor.chaos 
     - signing_policy: host
     - public_key: /etc/pki/private.key
-    - CN: {{ grains['fqdn'] }} 
-    - days_remaining: 90
+    - subjectAltName: 'DNS:{{ grains['fqdn'] }}'
+    - days_remaining: 5
     - backup: True
     - require:
       - x509: /etc/pki/private.key
@@ -27,9 +27,9 @@
     - ca_server: tumor.chaos 
     - signing_policy: host
     - public_key: /etc/pki/private.key
-    - CN: {{ cn }} 
-    - days_remaining: 90
+    - days_remaining: 5
     - backup: False
+    - subjectAltName: 'DNS:{{ cn }}'
     - require:
       - x509: /etc/pki/private.key