diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml
index 8cac95f422..e4a28d87df 100644
--- a/roles/nfs/client/tasks/main.yml
+++ b/roles/nfs/client/tasks/main.yml
@@ -83,7 +83,7 @@
         name=/mnt/fedora_koji
         src=10.16.167.64:/mnt/fedora_koji
         fstype=nfs4
-        opts=rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4
+        opts=rw,hard,bg,noatime,nodev,nosuid,nfsvers=4
         passno=0
         dump=0
         state=mounted
@@ -96,7 +96,7 @@
         name=/mnt/fedora_koji_prod
         src=ntap-rdu3-c02-fedora01-nfs01a.neta-002.prod.rdu2.dc.redhat.com:/fedora_koji
         fstype=nfs
-        opts=ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
+        opts=ro,hard,bg,noatime,nodev,nosuid,nfsvers=3
         passno=0
         dump=0
         state=mounted
diff --git a/roles/nfs/server/tasks/main.yml b/roles/nfs/server/tasks/main.yml
index 9cbdf636c9..b8e4dd2cc7 100644
--- a/roles/nfs/server/tasks/main.yml
+++ b/roles/nfs/server/tasks/main.yml
@@ -20,6 +20,7 @@
   service: name={{ item }}  enabled=true state=started
   with_items:
   - rpc-statd
+  - nfs-server
   when: ansible_distribution == 'Fedora'
   tags:
   - nfs/server
@@ -29,7 +30,6 @@
   with_items:
   - rpcbind
   - nfs-server
-  when: ansible_distribution == 'RedHat'
   tags:
   - nfs/server