diff --git a/tests/functional/all_daemons/container/hosts-ubuntu b/tests/functional/all_daemons/container/hosts-ubuntu
index 001a3981d..d0adf6308 100644
--- a/tests/functional/all_daemons/container/hosts-ubuntu
+++ b/tests/functional/all_daemons/container/hosts-ubuntu
@@ -25,11 +25,3 @@ client1
 
 [rbdmirrors]
 rbd-mirror0
-
-[all:vars]
-debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse']
-nfs_ganesha_stable=True
-nfs_ganesha_stable_branch="V2.7-stable"
-nfs_ganesha_stable_deb_repo="{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}"
-nfs_ganesha_dev=False
-nfs_ganesha_flavor="ceph_master"
diff --git a/tests/functional/all_daemons/group_vars/nfss b/tests/functional/all_daemons/group_vars/nfss
index 2d2f83bb6..d4f560c14 100644
--- a/tests/functional/all_daemons/group_vars/nfss
+++ b/tests/functional/all_daemons/group_vars/nfss
@@ -5,3 +5,7 @@ ganesha_conf_overrides: |
     CACHEINODE {
             Entries_HWMark = 100000;
     }
+nfs_ganesha_stable: true
+nfs_ganesha_dev: false
+nfs_ganesha_flavor: "ceph_master"
+nfs_ganesha_stable_branch: "V2.7-stable"
diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index 20c0d4599..9345ec883 100644
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -28,9 +28,3 @@ rbd-mirror0
 
 [iscsigws]
 iscsi-gw0 ceph_repository="dev"
-
-[all:vars]
-nfs_ganesha_stable=True
-nfs_ganesha_dev=False
-nfs_ganesha_stable_branch="V2.7-stable"
-nfs_ganesha_flavor="ceph_master"
diff --git a/tests/functional/all_daemons/hosts-ubuntu b/tests/functional/all_daemons/hosts-ubuntu
index 073cde5f6..0c2eed779 100644
--- a/tests/functional/all_daemons/hosts-ubuntu
+++ b/tests/functional/all_daemons/hosts-ubuntu
@@ -28,8 +28,4 @@ rbd-mirror0
 
 [all:vars]
 debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse']
-nfs_ganesha_stable=True
-nfs_ganesha_stable_branch="V2.7-stable"
 nfs_ganesha_stable_deb_repo="{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}"
-nfs_ganesha_dev=False
-nfs_ganesha_flavor="ceph_master"
diff --git a/tests/functional/dev_setup.yml b/tests/functional/dev_setup.yml
index d8c35a5e1..b683987b6 100644
--- a/tests/functional/dev_setup.yml
+++ b/tests/functional/dev_setup.yml
@@ -9,28 +9,30 @@
     - block:
         - name: set_fact group_vars_path
           set_fact:
-            group_vars_path: "{{ change_dir + '/hosts' if 'ooo-collocation' in change_dir.split('/') else change_dir + '/group_vars/all' }}"
+            group_vars_path: "{{ change_dir + '/hosts' if 'ooo-collocation' in change_dir.split('/') else change_dir + '/group_vars' }}"
 
         - block:
             - name: change ceph_repository to 'dev'
               replace:
                 regexp: "ceph_repository:.*"
                 replace: "ceph_repository: dev"
-                dest: "{{ group_vars_path }}"
+                dest: "{{ group_vars_path }}/all"
 
-            - name: ensure nfs_ganesha_stable is set to False
-              replace:
-                regexp: "nfs_ganesha_stable=.*"
-                replace: "nfs_ganesha_stable=False"
-                dest: "{{ group_vars_path }}"
+            - block:
+                - name: ensure nfs_ganesha_stable is set to False
+                  replace:
+                    regexp: "nfs_ganesha_stable:.*"
+                    replace: "nfs_ganesha_stable: false"
+                    dest: "{{ group_vars_path }}/nfss"
 
-            - name: ensure nfs_ganesha_dev is set to True
-              replace:
-                regexp: "nfs_ganesha_dev:.*"
-                replace: "nfs_ganesha_dev=True"
-                dest: "{{ group_vars_path }}"
+                - name: ensure nfs_ganesha_dev is set to True
+                  replace:
+                    regexp: "nfs_ganesha_dev:.*"
+                    replace: "nfs_ganesha_dev: true"
+                    dest: "{{ group_vars_path }}/nfss"
+              when: "'all_daemons' in group_vars_path.split('/')"
           when: change_dir is defined
 
-        - name: print contents of {{ group_vars_path }}
-          command: "cat {{ group_vars_path }}"
+        - name: print contents of {{ group_vars_path }}/all
+          command: "cat {{ group_vars_path }}/all"
       when: dev_setup
diff --git a/tests/functional/shrink_mon/hosts-ubuntu b/tests/functional/shrink_mon/hosts-ubuntu
index 6675222ed..f2cc0b125 100644
--- a/tests/functional/shrink_mon/hosts-ubuntu
+++ b/tests/functional/shrink_mon/hosts-ubuntu
@@ -5,31 +5,3 @@ mon2 monitor_address=192.168.1.12
 
 [osds]
 osd0
-osd1
-
-[mdss]
-mds0
-
-[rgws]
-rgw0
-
-[clients]
-client0
-client1
-
-#[nfss]
-#nfs0
-
-[rbdmirrors]
-rbd-mirror0
-
-[iscsigws]
-iscsi-gw0 ceph_repository="dev"
-
-[all:vars]
-debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse']
-nfs_ganesha_stable=True
-nfs_ganesha_stable_branch="V2.7-stable"
-nfs_ganesha_stable_deb_repo="{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}"
-nfs_ganesha_dev=False
-nfs_ganesha_flavor="ceph_master"