diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml
index 9647b70ea..88faaedba 100644
--- a/salt/influxdb/defaults.yaml
+++ b/salt/influxdb/defaults.yaml
@@ -2,10 +2,12 @@ influxdb:
   retention_policies:
     autogen:
       default: True
-      duration: 1h
+      duration: 1d
+      shard_duration: 1h
     so_long_term:
       default: False
-      duration: 6h
+      duration: 7d
+      shard_duration: 1d
   downsample:
     so_long_term:
       resolution: 30m
diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index 88f03042e..59673c93b 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -79,6 +79,7 @@ telegraf_database:
     - name: {{rp}}
     - database: telegraf
     - duration: {{influxdb.retention_policies[rp].duration}}
+    - shard_duration: {{influxdb.retention_policies[rp].shard_duration}}
     - replication: 1
     - default: {{influxdb.retention_policies[rp].get('default', 'False')}}
     - ssl: True