diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml
index 00e34e8e80..5b8b2376e7 100644
--- a/roles/nfs/client/tasks/main.yml
+++ b/roles/nfs/client/tasks/main.yml
@@ -30,7 +30,7 @@
   with_items:
   - nfs-idmap
   - nfs-lock
-  when: ansible_distribution == 'Fedora'
+  when: ansible_distribution == 'Fedora' or ansible_distribution_major_version == '7'
 
 - name: enable nfs-related services and run them (rhel)
   action: service name={{ item }}  enabled=true state=started
@@ -39,7 +39,7 @@
   - rpcbind
   - nfs
   - nfslock
-  when: ansible_distribution == 'RedHat'
+  when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '6'
 
 - name: nfs mount points (phx2)
   mount: >