diff --git a/kibana/handlers/main.yml b/kibana/handlers/main.yml
new file mode 100644
index 00000000..cbccd8e0
--- /dev/null
+++ b/kibana/handlers/main.yml
@@ -0,0 +1,6 @@
+---
+
+- name: restart kibana
+  systemd:
+    name: kibana
+    state: restarted
diff --git a/kibana/tasks/main.yml b/kibana/tasks/main.yml
index c571ce39..da5e0095 100644
--- a/kibana/tasks/main.yml
+++ b/kibana/tasks/main.yml
@@ -28,3 +28,26 @@
     mode: "0644"
     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:
+  - name: Remount /usr as writable
+    command: "mount -o remount,rw /usr"
+
+  - name: Move kibana optimize directory
+    shell: "mv /usr/share/kibana/optimize /var/lib/kibana/optimize && ln -s /var/lib/kibana/optimize /usr/share/kibana/optimize"
+    args:
+      creates: /var/lib/kibana/optimize
+    notify: restart kibana
+
+  - name: Remount /usr as read-only
+    command: "mount -o remount /usr"
+  when: mount.rc == 0 and not mount.stdout_lines.0 | search("rw")
diff --git a/kibana/tasks/remount_usr_rw.yml b/kibana/tasks/remount_usr_rw.yml
new file mode 100644
index 00000000..a62d86d6
--- /dev/null
+++ b/kibana/tasks/remount_usr_rw.yml
@@ -0,0 +1,13 @@
+---
+- name: Get mount options for partitions
+  shell: "mount | grep 'on /usr type'"
+  args:
+    warn: no
+  register: mount
+  changed_when: False
+  failed_when: False
+  when: not ansible_check_mode
+
+- name: Remount /usr if it is a partition and it is not mounted in rw
+  command: "mount -o remount,rw /usr"
+  when: mount.rc == 0 and not mount.stdout_lines.0 | search("rw")