diff --git a/elk_metrics_6x/roles/elastic_curator/templates/curator-actions-age.yml.j2 b/elk_metrics_6x/roles/elastic_curator/templates/curator-actions-age.yml.j2
index 9f2ed25e..d3e5e95b 100644
--- a/elk_metrics_6x/roles/elastic_curator/templates/curator-actions-age.yml.j2
+++ b/elk_metrics_6x/roles/elastic_curator/templates/curator-actions-age.yml.j2
@@ -36,7 +36,7 @@
    {
     'filtertype': 'pattern',
     'kind': 'prefix',
-    'value': key + '-'
+    'value': key
    }
   )
 -%}
diff --git a/elk_metrics_6x/roles/elastic_curator/templates/curator-actions-size.yml.j2 b/elk_metrics_6x/roles/elastic_curator/templates/curator-actions-size.yml.j2
index 88e1c3c4..86cb6527 100644
--- a/elk_metrics_6x/roles/elastic_curator/templates/curator-actions-size.yml.j2
+++ b/elk_metrics_6x/roles/elastic_curator/templates/curator-actions-size.yml.j2
@@ -36,7 +36,7 @@
    {
     'filtertype': 'pattern',
     'kind': 'prefix',
-    'value': key + '-'
+    'value': key
    }
   )
 -%}
diff --git a/elk_metrics_6x/roles/elastic_retention/defaults/main.yml b/elk_metrics_6x/roles/elastic_retention/defaults/main.yml
index 1bb40529..e58f8945 100644
--- a/elk_metrics_6x/roles/elastic_retention/defaults/main.yml
+++ b/elk_metrics_6x/roles/elastic_retention/defaults/main.yml
@@ -27,6 +27,7 @@ elastic_index_retention_algorithm: default
 #  elastic_journalbeat_retention: 1
 #  elastic_metricbeat_retention: 1
 #  elastic_packetbeat_retention: 1
+#  elastic_skydive_retention: 1
 
 ## These options are all in megabytes.
 #  elastic_logstash_size: 1024
@@ -37,6 +38,7 @@ elastic_index_retention_algorithm: default
 #  elastic_journalbeat_size: 1024
 #  elastic_metricbeat_size: 1024
 #  elastic_packetbeat_size: 1024
+#  elastic_skydive_size: 1024
 
 ## WHen a static retention policy option is not defined these options will be
 ## used for dynamic fact generation.
@@ -94,6 +96,9 @@ elastic_beat_retention_policy_hosts:
   packetbeat:
     weight: 1
     hosts: "{{ groups['hosts'] | default([]) }}"
+  skydive:
+    weight: 1
+    hosts: "{{ groups['skydive_analyzers'] | default([]) }}"
 
 # Refresh the elasticsearch retention policy local facts.
-elastic_retention_refresh: false
\ No newline at end of file
+elastic_retention_refresh: false
diff --git a/skydive/inventory/osa-integration-inventory.yml b/skydive/inventory/osa-integration-inventory.yml
index 69c47107..a634a66e 100644
--- a/skydive/inventory/osa-integration-inventory.yml
+++ b/skydive/inventory/osa-integration-inventory.yml
@@ -11,6 +11,8 @@ all_systems:
         skydive_password: "{{ haproxy_stats_password }}"
         skydive_elasticsearch_servers: "{{ groups['elastic-logstash'] | map('extract', hostvars, ['ansible_host']) | list | join(',') }}"
         skydive_bind_address: "{{ container_address | default(ansible_host) }}"
+        elastic_skydive_retention: 2  # Elastic retention set to 2 days max
+        elastic_skydive_size: 51200  # Elastic retention set to 50GiB max
         haproxy_extra_services:
           - service:
               haproxy_service_name: skydive_analyzer
@@ -32,6 +34,7 @@ all_systems:
                 - "httpchk HEAD / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
               haproxy_backend_httpcheck_options:
                 - expect rstatus 200|401
+
       children:
         traefik_all:
           children: