diff --git a/tasks/nfsd.yml b/tasks/nfsd.yml
index 5723b194..55490ed2 100644
--- a/tasks/nfsd.yml
+++ b/tasks/nfsd.yml
@@ -28,7 +28,7 @@
 - name: Check if 'all_squash' appears in /etc/exports (for V-38460)
   shell: grep all_squash /etc/exports
   register: v38460_result
-  changed_when: v38460_result.rc == 0
+  changed_when: v38460_result | success
   failed_when: False
   when: exports.stat.exists
   tags:
@@ -39,8 +39,11 @@
 - name: V-38460 - The NFS server must not have the all_squash option enabled
   fail:
     msg: "Remove all_squash from /etc/exports"
-  changed_when: v38460_result.rc == 0
-  when: exports.stat.exists and v38460_result.rc == 0
+  changed_when: v38460_result | success
+  when:
+    - exports.stat.exists
+    - v38460_result | success
+    - not check_mode
   tags:
     - nfs
     - cat3
@@ -49,7 +52,7 @@
 - name: Check if 'insecure_locks' appears in /etc/exports (for V-38677)
   shell: grep insecure_locks /etc/exports
   register: v38677_result
-  changed_when: v38677_result.rc == 0
+  changed_when: v38677_result | success
   failed_when: False
   when: exports.stat.exists
   tags:
@@ -60,8 +63,11 @@
 - name: V-38677 - The NFS server must not have the insecure_locks option enabled
   fail:
     msg: "Remove insecure_locks from /etc/exports"
-  changed_when: v38677_result.rc == 0
-  when: exports.stat.exists and v38677_result.rc == 0
+  changed_when: v38677_result | success
+  when:
+    - exports.stat.exists
+    - v38677_result | success
+    - not check_mode
   tags:
     - nfs
     - cat3