diff --git a/nfs-client/handlers/main.yml b/nfs-client/handlers/main.yml
index 7944169d8c6f1aad07261147e7e16f3f0addb958..64b046966cd753a214d7410135feb38b7001f14c 100644
--- a/nfs-client/handlers/main.yml
+++ b/nfs-client/handlers/main.yml
@@ -4,8 +4,8 @@
 - name: restart autofs
   service: name=autofs state=restarted
 
-- name: restart nfs-common
-  service: name=nfs-common state=restarted
+- name: restart nfs-client
+  service: name=nfs-client.target state=restarted
 
 - name: reload sysctl
   command: sysctl -p
diff --git a/nfs-client/tasks/main.yml b/nfs-client/tasks/main.yml
index 88640e1bc122478cc8679c5e294aa8babe2af7e3..3638b7b823b4610b39e7a733d4e65c404afa0a16 100644
--- a/nfs-client/tasks/main.yml
+++ b/nfs-client/tasks/main.yml
@@ -29,19 +29,31 @@
     - nfs-client
     - packages
 
-- name: ensure the nfs-common service is configured for nfs4
+- name: ensure the nfs-client service is configured for nfs4
   copy: src=nfs-common dest=/etc/default/nfs-common owner=root group=root mode=0644
   notify:
-    - restart nfs-common
+    - restart nfs-client
     - restart autofs
   tags:
     - nfs-client
     - config
 
+- name: ensure nfs module is loaded
+  modprobe: name=nfs state=present
+  tags:
+    - nfs-client
+    - config
+
+- name: ensure nfs module is loaded after a reboot
+  copy: content="nfs" dest=/etc/modules-load.d/nfs.conf
+  tags:
+    - nfs-client
+    - config
+
 - name: ensure we use the idmapper
   shell: echo "N" > /sys/module/nfs/parameters/nfs4_disable_idmapping
   notify:
-    - restart nfs-common
+    - restart nfs-client
     - restart autofs
   tags:
     - nfs-client
@@ -74,7 +86,7 @@
     - config
 
 - name: ensure nfs-common is enabled
-  service: name=nfs-common state=running enabled=yes
+  service: name=nfs-client.target state=running enabled=yes
   tags:
     - nfs-client
     - service