diff --git a/elasticsearch/defaults/main.yml b/elasticsearch/defaults/main.yml
index 5fce4ef6..33310a2f 100644
--- a/elasticsearch/defaults/main.yml
+++ b/elasticsearch/defaults/main.yml
@@ -1,4 +1,6 @@
 ---
+elastic_stack_version: "5.x"
+
 elasticsearch_cluster_name: Null
 elasticsearch_node_name: "${HOSTNAME}"
 elasticsearch_network_host: "[_site_, _local_]"
diff --git a/elasticsearch/tasks/packages.yml b/elasticsearch/tasks/packages.yml
index ff395cb5..1a0ad8dc 100644
--- a/elasticsearch/tasks/packages.yml
+++ b/elasticsearch/tasks/packages.yml
@@ -19,7 +19,7 @@
 
 - name: Elastic sources list is available
   apt_repository:
-    repo: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
+    repo: "deb https://artifacts.elastic.co/packages/{{ elastic_stack_version | mandatory }}/apt stable main"
     filename: elastic
     state: present
     update_cache: yes
diff --git a/filebeat/defaults/main.yml b/filebeat/defaults/main.yml
index 6a950e17..89b6e753 100644
--- a/filebeat/defaults/main.yml
+++ b/filebeat/defaults/main.yml
@@ -1,3 +1,5 @@
 ---
+elastic_stack_version: "5.x"
+
 filebeat_kibana_dashboards: False
 filebeat_logstash_plugin: False
diff --git a/filebeat/tasks/main.yml b/filebeat/tasks/main.yml
index 75f4bc2b..89c0f7ab 100644
--- a/filebeat/tasks/main.yml
+++ b/filebeat/tasks/main.yml
@@ -19,7 +19,7 @@
 
 - name: Elastic sources list is available
   apt_repository:
-    repo: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
+    repo: "deb https://artifacts.elastic.co/packages/{{ elastic_stack_version | mandatory }}/apt stable main"
     filename: elastic
     state: present
     update_cache: yes
diff --git a/kibana/defaults/main.yml b/kibana/defaults/main.yml
index 6fd7e16f..e167c21f 100644
--- a/kibana/defaults/main.yml
+++ b/kibana/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
+elastic_stack_version: "5.x"
 
 kibana_server_host: "127.0.0.1"
 kibana_server_basepath: ""
diff --git a/kibana/tasks/main.yml b/kibana/tasks/main.yml
index 6803568a..55e0c848 100644
--- a/kibana/tasks/main.yml
+++ b/kibana/tasks/main.yml
@@ -19,7 +19,7 @@
 
 - name: Elastic sources list is available
   apt_repository:
-    repo: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
+    repo: "deb https://artifacts.elastic.co/packages/{{ elastic_stack_version | mandatory }}/apt stable main"
     filename: elastic
     state: present
     update_cache: yes
@@ -64,27 +64,27 @@
     owner: root
     group: root
 
-- name: Get mount options for /usr partition
-  shell: "mount | grep 'on /usr type'"
-  args:
-    warn: no
-  register: mount
-  changed_when: False
-  failed_when: False
-  when: not ansible_check_mode
-
-- block:
-  - include_role:
-      name: remount-usr
-
-  - name: Move kibana optimize directory
-    shell: "mv /usr/share/kibana/{{ item }} /var/lib/kibana/{{ item }} && ln -s /var/lib/kibana/{{ item }} /usr/share/kibana/{{ item }}"
-    args:
-      creates: "/var/lib/kibana/{{ item }}"
-    notify: restart kibana
-    with_items:
-      - optimize
-      - data
+# - name: Get mount options for /usr partition
+#   shell: "mount | grep 'on /usr type'"
+#   args:
+#     warn: no
+#   register: mount
+#   changed_when: False
+#   failed_when: False
+#   when: not ansible_check_mode
+#
+# - block:
+#   - include_role:
+#       name: remount-usr
+# 
+#   - name: Move kibana optimize directory
+#     shell: "mv /usr/share/kibana/{{ item }} /var/lib/kibana/{{ item }} && ln -s /var/lib/kibana/{{ item }} /usr/share/kibana/{{ item }}"
+#     args:
+#       creates: "/var/lib/kibana/{{ item }}"
+#     notify: restart kibana
+#     with_items:
+#       - optimize
+#       - data
 
 - include: proxy_nginx.yml
   when: kibana_proxy_nginx
diff --git a/logstash/defaults/main.yml b/logstash/defaults/main.yml
index e563f517..38b7f85f 100644
--- a/logstash/defaults/main.yml
+++ b/logstash/defaults/main.yml
@@ -1,4 +1,6 @@
 ---
+elastic_stack_version: "5.x"
+
 logstash_jvm_xms: 256m
 logstash_jvm_xmx: 1g
 logstash_log_rotate_days: 365
diff --git a/logstash/tasks/main.yml b/logstash/tasks/main.yml
index 71be5614..61c585bf 100644
--- a/logstash/tasks/main.yml
+++ b/logstash/tasks/main.yml
@@ -19,7 +19,7 @@
 
 - name: Elastic sources list is available
   apt_repository:
-    repo: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
+    repo: "deb https://artifacts.elastic.co/packages/{{ elastic_stack_version | mandatory }}/apt stable main"
     filename: elastic
     state: present
     update_cache: yes