diff --git a/roles/common/tasks/nfs.yml b/roles/common/tasks/nfs.yml
index a190f55..bf77f91 100644
--- a/roles/common/tasks/nfs.yml
+++ b/roles/common/tasks/nfs.yml
@@ -67,7 +67,7 @@
 - name: (nfs.yml) Check if file '/etc/default/nfs-kernel-server.ORIG' exists
   ansible.builtin.stat:
     path: /etc/default/nfs-kernel-server
-  register: default_nfs_kernel_server_exists
+  register: common_default_nfs_kernel_server_exists
   when:
     - "groups['nfs_server']|string is search(inventory_hostname)"
   tags:
@@ -75,9 +75,10 @@
 
 - name: (nfs.yml) Backup existing file /etc/default/nfs-kernel-server
   ansible.builtin.command: cp -a /etc/default/nfs-kernel-server /etc/default/nfs-kernel-server.ORIG
+  changed_when: true
   when:
     - "groups['nfs_server']|string is search(inventory_hostname)"
-    - default_nfs_kernel_server_exists.stat.exists == False
+    - not common_default_nfs_kernel_server_exists.stat.exists
   tags:
     - nfs-server
 
@@ -135,7 +136,7 @@
     - nfs-client
 
 - name: (nfs.yml) NFS Mount exports from nfs server
-  mount:
+  ansible.posix.mount:
     path: "{{ item.path }}"
     src: "{{ item.src }}"
     fstype: nfs