diff --git a/apache/tasks/remount_usr_rw.yml b/apache/tasks/remount_usr_rw.yml
index 60162607..1f6d064d 100644
--- a/apache/tasks/remount_usr_rw.yml
+++ b/apache/tasks/remount_usr_rw.yml
@@ -1,19 +1,12 @@
 ---
-- 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: update ansible_mounts facts
+  setup:
+    filter: ansible_mounts
 
-- name: Remount /usr if it is a partition and it is not mounted in rw
-  command: "mount -o remount,rw /usr"
-  when:
-    - not ansible_check_mode
-    - mount.rc == 0
-    - not mount.stdout_lines.0 | search("rw")
-  check_mode: yes
+- name: mount /usr in rw
+  command: mount -o remount,rw /usr
   args:
     warn: no
+  changed_when: false
+  when: item.mount == '/usr' and item.options | match(".*ro.*")
+  with_items: "{{ ansible_mounts }}"