diff --git a/elk_metrics_6x/createElasticIndexes.yml b/elk_metrics_6x/createElasticIndexes.yml
index 571df62d..c06b4703 100644
--- a/elk_metrics_6x/createElasticIndexes.yml
+++ b/elk_metrics_6x/createElasticIndexes.yml
@@ -37,7 +37,7 @@
       register: elk_indexes
       until: elk_indexes is success
       retries: 3
-      delay: 10
+      delay: 30
       with_items:
         - name: "osprofiler-notifications"
           index_options:
@@ -67,7 +67,7 @@
       register: check_basicIndexTemplate
       until: check_basicIndexTemplate is success
       retries: 3
-      delay: 10
+      delay: 30
 
     - name: Check for basic index template
       uri:
@@ -77,7 +77,7 @@
       register: delete_basicIndexTemplate
       until: delete_basicIndexTemplate is success
       retries: 3
-      delay: 10
+      delay: 30
       when:
         - check_basicIndexTemplate.status == 200
 
@@ -91,7 +91,7 @@
       register: create_basicIndexTemplate
       until: create_basicIndexTemplate is success
       retries: 3
-      delay: 10
+      delay: 30
       vars:
         index_option:
           index_patterns: >-
@@ -117,7 +117,7 @@
       register: create_basicIndexTemplate
       until: create_basicIndexTemplate is success
       retries: 3
-      delay: 10
+      delay: 30
       vars:
         index_option:
           template: ".monitoring-*"
diff --git a/elk_metrics_6x/fieldRefresh.yml b/elk_metrics_6x/fieldRefresh.yml
index 889a79b8..fe009e5c 100644
--- a/elk_metrics_6x/fieldRefresh.yml
+++ b/elk_metrics_6x/fieldRefresh.yml
@@ -38,7 +38,7 @@
       register: index_fields_return
       until: index_fields_return is success
       retries: 6
-      delay: 10
+      delay: 30
       run_once: true
 
     - name: Get index fields format
@@ -54,7 +54,7 @@
       register: index_fields_format_return
       until: index_fields_format_return is success
       retries: 6
-      delay: 10
+      delay: 30
       run_once: true
 
     - name: Refresh fields block
@@ -86,7 +86,7 @@
           register: index_fields_return
           until: index_fields_return is success
           retries: 6
-          delay: 10
+          delay: 30
           run_once: true
       when:
         - index_fields_return.status == 200
diff --git a/elk_metrics_6x/installKibana.yml b/elk_metrics_6x/installKibana.yml
index 2172331b..4d9d200d 100644
--- a/elk_metrics_6x/installKibana.yml
+++ b/elk_metrics_6x/installKibana.yml
@@ -47,7 +47,7 @@
       register: kibana_indexes
       until: kibana_indexes is success
       retries: 6
-      delay: 10
+      delay: 30
       run_once: true
 
     - name: Create basic indexes
@@ -67,7 +67,7 @@
       register: kibana_indexes
       until: kibana_indexes is success
       retries: 6
-      delay: 10
+      delay: 30
       run_once: true
 
   tags:
diff --git a/elk_metrics_6x/roles/elastic_apm_server/templates/_macros.j2 b/elk_metrics_6x/roles/elastic_apm_server/templates/_macros.j2
deleted file mode 120000
index b7fbced5..00000000
--- a/elk_metrics_6x/roles/elastic_apm_server/templates/_macros.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../templates/_macros.j2
\ No newline at end of file
diff --git a/elk_metrics_6x/roles/elastic_auditbeat/templates/_macros.j2 b/elk_metrics_6x/roles/elastic_auditbeat/templates/_macros.j2
deleted file mode 120000
index b7fbced5..00000000
--- a/elk_metrics_6x/roles/elastic_auditbeat/templates/_macros.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../templates/_macros.j2
\ No newline at end of file
diff --git a/elk_metrics_6x/roles/elastic_filebeat/templates/_macros.j2 b/elk_metrics_6x/roles/elastic_filebeat/templates/_macros.j2
deleted file mode 120000
index b7fbced5..00000000
--- a/elk_metrics_6x/roles/elastic_filebeat/templates/_macros.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../templates/_macros.j2
\ No newline at end of file
diff --git a/elk_metrics_6x/roles/elastic_heartbeat/templates/_macros.j2 b/elk_metrics_6x/roles/elastic_heartbeat/templates/_macros.j2
deleted file mode 120000
index b7fbced5..00000000
--- a/elk_metrics_6x/roles/elastic_heartbeat/templates/_macros.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../templates/_macros.j2
\ No newline at end of file
diff --git a/elk_metrics_6x/roles/elastic_journalbeat/templates/_macros.j2 b/elk_metrics_6x/roles/elastic_journalbeat/templates/_macros.j2
deleted file mode 120000
index b7fbced5..00000000
--- a/elk_metrics_6x/roles/elastic_journalbeat/templates/_macros.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../templates/_macros.j2
\ No newline at end of file
diff --git a/elk_metrics_6x/roles/elastic_kibana/defaults/main.yml b/elk_metrics_6x/roles/elastic_kibana/defaults/main.yml
index 1c9006a9..8a910861 100644
--- a/elk_metrics_6x/roles/elastic_kibana/defaults/main.yml
+++ b/elk_metrics_6x/roles/elastic_kibana/defaults/main.yml
@@ -23,4 +23,4 @@ kibana_password: admin
 kibana_nginx_port: 81
 kibana_server_name: "{{ ansible_hostname }}"
 kibana_index_on_elasticsearch: "http://{{ hostvars[groups['elastic-logstash'][0]]['ansible_host'] }}:{{ elastic_port}}/.kibana"
-kibana_elastic_request_timeout: 600000
+kibana_elastic_request_timeout: 1800000
diff --git a/elk_metrics_6x/roles/elastic_metricbeat/handlers/main.yml b/elk_metrics_6x/roles/elastic_metricbeat/handlers/main.yml
index 6c28c6d6..08425049 100644
--- a/elk_metrics_6x/roles/elastic_metricbeat/handlers/main.yml
+++ b/elk_metrics_6x/roles/elastic_metricbeat/handlers/main.yml
@@ -25,7 +25,7 @@
 
 - name: Enable and restart metricbeat (upstart)
   service:
-    name: "elasticsearch"
+    name: "metricbeat"
     state: "{{ metricbeat_service_state }}"
     enabled: yes
   when:
diff --git a/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml b/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml
index 31399112..c4934aea 100644
--- a/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_metricbeat/tasks/main.yml
@@ -254,8 +254,6 @@
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     mode: "0644"
-  when:
-    - ansible_service_mgr == 'systemd'
   with_items:
     - src: "metricbeat.yml.j2"
       dest: "/etc/metricbeat/metricbeat.yml"
diff --git a/elk_metrics_6x/roles/elastic_metricbeat/templates/_macros.j2 b/elk_metrics_6x/roles/elastic_metricbeat/templates/_macros.j2
deleted file mode 120000
index b7fbced5..00000000
--- a/elk_metrics_6x/roles/elastic_metricbeat/templates/_macros.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../templates/_macros.j2
\ No newline at end of file
diff --git a/elk_metrics_6x/roles/elastic_packetbeat/templates/_macros.j2 b/elk_metrics_6x/roles/elastic_packetbeat/templates/_macros.j2
deleted file mode 120000
index b7fbced5..00000000
--- a/elk_metrics_6x/roles/elastic_packetbeat/templates/_macros.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../templates/_macros.j2
\ No newline at end of file
diff --git a/elk_metrics_6x/roles/elastic_retention/tasks/main.yml b/elk_metrics_6x/roles/elastic_retention/tasks/main.yml
index 4a344b82..1a147563 100644
--- a/elk_metrics_6x/roles/elastic_retention/tasks/main.yml
+++ b/elk_metrics_6x/roles/elastic_retention/tasks/main.yml
@@ -23,7 +23,7 @@
   until:
     - elk_data is success and elk_data['json'] is defined
   retries: 5
-  delay: 10
+  delay: 30
   run_once: true
 
 - name: Set retention keys fact