diff --git a/inventory/group_vars/beaker-stg b/inventory/group_vars/beaker-stg
index 41004d95e9..d467691029 100644
--- a/inventory/group_vars/beaker-stg
+++ b/inventory/group_vars/beaker-stg
@@ -5,7 +5,7 @@ num_cpus: 2
 
 tcp_ports: [ 80, 443, 8000 ]
 udp_ports: [ 69 ]
-fas_client_groups: sysadmin-qa
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
diff --git a/inventory/group_vars/bodhi-backend b/inventory/group_vars/bodhi-backend
index f3befd4372..6dccae88b5 100644
--- a/inventory/group_vars/bodhi-backend
+++ b/inventory/group_vars/bodhi-backend
@@ -35,4 +35,4 @@ fedmsg_certs:
   owner: root
   group: masher
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
diff --git a/inventory/group_vars/composers b/inventory/group_vars/composers
index 82cd018cad..b70c0ccd21 100644
--- a/inventory/group_vars/composers
+++ b/inventory/group_vars/composers
@@ -35,4 +35,4 @@ fedmsg_certs:
   owner: root
   group: masher
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
diff --git a/inventory/group_vars/qadevel-stg b/inventory/group_vars/qadevel-stg
index 8ce882b20f..c6c5eace3f 100644
--- a/inventory/group_vars/qadevel-stg
+++ b/inventory/group_vars/qadevel-stg
@@ -7,7 +7,7 @@ num_cpus: 1
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-fas_client_groups: sysadmin-qa
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
 
 # default virt install command is for a single nic-device
 # define in another group file for more nics (see buildvm)
diff --git a/inventory/group_vars/releng b/inventory/group_vars/releng
index 82cd018cad..b70c0ccd21 100644
--- a/inventory/group_vars/releng
+++ b/inventory/group_vars/releng
@@ -35,4 +35,4 @@ fedmsg_certs:
   owner: root
   group: masher
 
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
diff --git a/inventory/group_vars/resultsdb-dev b/inventory/group_vars/resultsdb-dev
index 82e6d9ba89..474db8d550 100644
--- a/inventory/group_vars/resultsdb-dev
+++ b/inventory/group_vars/resultsdb-dev
@@ -7,7 +7,7 @@ num_cpus: 4
 # the host_vars/$hostname file
 
 tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}", "{{ execdb_db_port }}" ]
-fas_client_groups: sysadmin-qa,sysadmin-main
+fas_client_groups: sysadmin-qa,sysadmin-main.fi-apprentice
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index c6d0c0463b..69d7e8bdf3 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -1,4 +1,6 @@
 ---
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
+
 grokmirror_basedir: /var/lib/git/mirror
 grokmirror_user: grokmirror
 grokmirror_repos:
diff --git a/inventory/host_vars/arm01-releng00.arm.fedoraproject.org b/inventory/host_vars/arm01-releng00.arm.fedoraproject.org
index d9f5686198..22d8ae4e8e 100644
--- a/inventory/host_vars/arm01-releng00.arm.fedoraproject.org
+++ b/inventory/host_vars/arm01-releng00.arm.fedoraproject.org
@@ -4,4 +4,4 @@
 #
 libdir: /usr/lib
 
-nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
+nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid
diff --git a/inventory/host_vars/arm01-releng02.arm.fedoraproject.org b/inventory/host_vars/arm01-releng02.arm.fedoraproject.org
index d9f5686198..22d8ae4e8e 100644
--- a/inventory/host_vars/arm01-releng02.arm.fedoraproject.org
+++ b/inventory/host_vars/arm01-releng02.arm.fedoraproject.org
@@ -4,4 +4,4 @@
 #
 libdir: /usr/lib
 
-nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
+nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid
diff --git a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
index 529bd02403..224434eeee 100644
--- a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
+++ b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
@@ -36,4 +36,4 @@ kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.fedoraproject.org/kojihub
 kojihub_scheme: https
 
-nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
+nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid
diff --git a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
index 43b5941c77..b6c4e08db5 100644
--- a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
@@ -8,7 +8,7 @@ volgroup: /dev/vg_guests
 eth0_ip: 10.5.124.181
 vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2
-fas_client_groups: sysadmin-qa,sysadmin-main
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
 lvm_size: 45000
 
 # default virt install command is for a single nic-device
diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml
index 8334f6aeb6..b457888d21 100644
--- a/playbooks/groups/backup-server.yml
+++ b/playbooks/groups/backup-server.yml
@@ -23,7 +23,7 @@
   - sudo
   - collectd/base
   - { role: nfs/client,
-      mnt_dir: 'fedora_backups',
+      mnt_dir: '/fedora_backups',
       nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
       nfs_src_dir: 'fedora_backups' }
   - openvpn/client
diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml
index b9372eb18b..8848c507a1 100644
--- a/playbooks/groups/pkgs.yml
+++ b/playbooks/groups/pkgs.yml
@@ -42,7 +42,7 @@
   - git/server
   - git/hooks
   - clamav
-  - { role: nfs/client, when: env != "staging", mnt_dir: '/srv/cache/lookaside',  nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3' } 
+  - { role: nfs/client, when: env != "staging", mnt_dir: '/srv/cache/lookaside',  nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid' } 
   - distgit
 
   tasks:
diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml
index 81479b635d..82fdd9ec32 100644
--- a/playbooks/groups/secondary.yml
+++ b/playbooks/groups/secondary.yml
@@ -40,11 +40,11 @@
       nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/archive' }
   - { role: nfs/client, 
       mnt_dir: '/srv/pub/alt',  
-      nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3",
+      nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
       nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/alt' }
   - { role: nfs/client,
       mnt_dir: '/srv/pub/fedora-secondary',
-      nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3",
+      nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
       nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora-secondary' }
 
   - role: apache
diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml
index 87c53c2c5d..09627c7887 100644
--- a/roles/nfs/client/tasks/main.yml
+++ b/roles/nfs/client/tasks/main.yml
@@ -67,7 +67,7 @@
 - name: nfs mount points (phx2)
   mount: >
         name={{ mnt_dir }} 
-        src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/{{ nfs_src_dir }} 
+        src=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com:/{{ nfs_src_dir }} 
         fstype=nfs 
         opts={{nfs_mount_opts}}
         passno=0 
@@ -80,7 +80,7 @@
 - name: nfs mount points (rdu)
   mount: >
         name={{ mnt_dir }} 
-        src=172.31.1.10:/vol/{{ nfs_src_dir }} 
+        src=172.31.1.11:/{{ nfs_src_dir }} 
         fstype=nfs 
         opts={{nfs_mount_opts}}
         passno=0