diff --git a/tasks/remount-off.yml b/tasks/remount-off.yml
index df1a901..2d6d5c5 100644
--- a/tasks/remount-off.yml
+++ b/tasks/remount-off.yml
@@ -9,12 +9,10 @@
 #       partitions:
 #         - "/tmp"
 #         - "/usr"
-#
-
 ---
 
 - name: Get mount options for partitions
-  shell: mount |grep " {{ item }} "
+  shell: "mount | grep 'on {{ item }} type'"
   register: mount
   changed_when: False
   failed_when: False
diff --git a/tasks/remount-on.yml b/tasks/remount-on.yml
index 37a2c38..4e26595 100644
--- a/tasks/remount-on.yml
+++ b/tasks/remount-on.yml
@@ -10,12 +10,10 @@
 #       partitions:
 #         - "/tmp"
 #         - "/usr"
-#
-
 ---
 
 - name: Get mount options for partitions
-  shell: mount |grep " {{ item }} "
+  shell: "mount | grep 'on {{ item }} type'"
   register: mount
   changed_when: False
   failed_when: False