diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml
index 88faaedba..3de7edd56 100644
--- a/salt/influxdb/defaults.yaml
+++ b/salt/influxdb/defaults.yaml
@@ -2,11 +2,11 @@ influxdb:
   retention_policies:
     autogen:
       default: True
-      duration: 1d
+      duration: 1h
       shard_duration: 1h
     so_long_term:
       default: False
-      duration: 7d
+      duration: 2d
       shard_duration: 1d
   downsample:
     so_long_term:
diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index 59673c93b..b3f3e5c9c 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -92,13 +92,14 @@ telegraf_database:
       - file: influxdb_retention_policy.present_patch
 {% endfor %}
 
+{#
 {% for dest_rp in influxdb.downsample.keys() %}
   {% for measurement in influxdb.downsample[dest_rp].measurements %}
 so_downsample_{{measurement}}_cq:
   influxdb_continuous_query.present:
     - name: so_downsample_{{measurement}}_cq
     - database: telegraf
-    - query: SELECT mean(*) INTO "{{dest_rp}}"."{{measurement}}" FROM "{{measurement}}" GROUP BY time({{influxdb.downsample[dest_rp].resolution}})
+    - query: SELECT mean(*) INTO "{{dest_rp}}".:MEASUREMENT FROM "{{measurement}}" GROUP BY time({{influxdb.downsample[dest_rp].resolution}}), *
     - ssl: True
     - verify_ssl: /etc/pki/ca.crt
     - cert: ['/etc/pki/influxdb.crt', '/etc/pki/influxdb.key']
@@ -109,6 +110,22 @@ so_downsample_{{measurement}}_cq:
       - file: influxdb_continuous_query.present_patch
   {% endfor %}
 {% endfor %}
+#}
+
+so_downsample_cq:
+  influxdb_continuous_query.present:
+    - name: so_downsample_cq
+    - database: telegraf
+    - query: SELECT mean(*) INTO "{{dest_rp}}".:MEASUREMENT FROM /.*/ GROUP BY time({{influxdb.downsample[dest_rp].resolution}}),*
+    - ssl: True
+    - verify_ssl: /etc/pki/ca.crt
+    - cert: ['/etc/pki/influxdb.crt', '/etc/pki/influxdb.key']
+    - influxdb_host: {{ MANAGER }}
+    - require:
+      - docker_container: so-influxdb
+      - influxdb_database: telegraf_database
+      - file: influxdb_continuous_query.present_patch
+
 
 {% endif %}