diff --git a/evoadmin/tasks/remount_usr_rw.yml b/evoadmin/tasks/remount_usr_rw.yml
new file mode 100644
index 00000000..8c51aee2
--- /dev/null
+++ b/evoadmin/tasks/remount_usr_rw.yml
@@ -0,0 +1,15 @@
+---
+- 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")
+  args:
+    warn: no
diff --git a/evoadmin/tasks/user.yml b/evoadmin/tasks/user.yml
index e3442cd1..8023777d 100644
--- a/evoadmin/tasks/user.yml
+++ b/evoadmin/tasks/user.yml
@@ -25,6 +25,9 @@
   # Warning: Need sudo!
   become_user: "{{ evoadmin_username }}"
 
+- include: remount_usr_rw.yml
+  when: evoadmin_scripts_dir | search ("/usr")
+
 - name: "Create {{ evoadmin_scripts_dir }}"
   file:
     dest: "{{ evoadmin_scripts_dir }}"