diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 12ab3a9c7..f20988694 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -23,7 +23,8 @@ m2cryptopkgs:
     - signing_policy: influxdb
     - public_key: /etc/pki/influxdb.key
     - CN: {{ master }}
-    - days_remaining: 3000
+    - days_remaining: 0
+    - days_valid: 3650
     - backup: True
     - managed_private_key:
         name: /etc/pki/influxdb.key
@@ -39,7 +40,8 @@ m2cryptopkgs:
     - signing_policy: filebeat
     - public_key: /etc/pki/filebeat.key
     - CN: {{ master }}
-    - days_remaining: 3000
+    - days_remaining: 0
+    - days_valid: 3650
     - backup: True
     - managed_private_key:
         name: /etc/pki/filebeat.key
@@ -71,7 +73,8 @@ fbcrtlink:
     - signing_policy: registry
     - public_key: /etc/pki/registry.key
     - CN: {{ master }}
-    - days_remaining: 3000
+    - days_remaining: 0
+    - days_valid: 3650
     - backup: True
     - managed_private_key:
         name: /etc/pki/registry.key
@@ -85,7 +88,8 @@ fbcrtlink:
     - signing_policy: masterssl
     - public_key: /etc/pki/masterssl.key
     - CN: {{ master }}
-    - days_remaining: 3000
+    - days_remaining: 0
+    - days_valid: 3650
     - backup: True
     - managed_private_key:
         name: /etc/pki/masterssl.key
@@ -99,7 +103,8 @@ fbcrtlink:
     - signing_policy: fleet
     - public_key: /etc/pki/fleet.key
     - CN: {{ master }}
-    - days_remaining: 3000
+    - days_remaining: 0
+    - days_valid: 3650
     - backup: True
     - managed_private_key:
         name: /etc/pki/fleet.key
@@ -121,7 +126,8 @@ fbcertdir:
     - signing_policy: filebeat
     - public_key: /opt/so/conf/filebeat/etc/pki/filebeat.key
     - CN: {{ master }}
-    - days_remaining: 3000
+    - days_remaining: 0
+    - days_valid: 3650
     - backup: True
     - managed_private_key:
         name: /opt/so/conf/filebeat/etc/pki/filebeat.key