diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml
index 1e6cd31903..db0fa1d8c3 100644
--- a/playbooks/groups/releng-compose.yml
+++ b/playbooks/groups/releng-compose.yml
@@ -40,41 +40,48 @@
     service: mash
     host: "koji{{env_suffix}}.fedoraproject.org"
 
+# production composer nfs mounts
+
   - role: nfs/client
     mnt_dir: '/mnt/fedora_koji'
     nfs_src_dir: "{{ koji_hub_nfs }}"
-    when: "'releng_compose_stg' not in group_names"
+    when: "'releng_compose' in group_names"
   - role: nfs/client
     mnt_dir: '/mnt/koji/ostree'
     nfs_src_dir: 'fedora_ostree_content/ostree'
-    when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
+    when: "'releng_compose' in group_names"
   - role: nfs/client
     mnt_dir: '/mnt/koji/compose/ostree'
     nfs_src_dir: 'fedora_ostree_content/compose/ostree'
-    when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
+    when: "'releng_compose' in group_names"
   - role: nfs/client
     mnt_dir: '/mnt/koji/ostree'
     nfs_src_dir: 'fedora_ostree_content/ostree'
-    when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
+    when: "'releng_compose' in group_names"
   - role: nfs/client
     mnt_dir: '/mnt/koji/compose/ostree'
     nfs_src_dir: 'fedora_ostree_content/compose/ostree'
-    when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
-
-  - role: nfs/client
-    mnt_dir: '/mnt/koji/ostree'
-    nfs_src_dir: 'fedora_ostree_content/ostree'
-    when: "'releng_compose_stg' in group_names"
-  - role: nfs/client
-    mnt_dir: '/mnt/koji/compose/ostree'
-    nfs_src_dir: 'fedora_ostree_content/compose/ostree'
-    when: "'releng_compose_stg' in group_names"
-
+    when: "'releng_compose' in group_names"
   - role: nfs/client
     mnt_dir: '/pub'
     nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub'
     when: "'releng_compose' in group_names"
 
+# staging composer nfs mounts
+
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji_prod'
+    nfs_src_dir: "{{ koji_hub_nfs }}"
+    when: "'releng_compose_stg' in group_names"
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji_prod/ostree'
+    nfs_src_dir: 'fedora_ostree_content/ostree'
+    when: "'releng_compose_stg' in group_names"
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji_prod/compose/ostree'
+    nfs_src_dir: 'fedora_ostree_content/compose/ostree'
+    when: "'releng_compose_stg' in group_names"
+
   - role: nfs/client
     mnt_dir: '/srv/fedora_ftp_archive'
     nfs_src_dir: 'fedora_ftp_archive'
@@ -112,11 +119,6 @@
     nfs_src_dir: '/fedora_koji_archive05'
     when: "'releng_compose' in group_names"
 
-  - role: nfs/client
-    mnt_dir: '/mnt/fedora_koji_prod'
-    nfs_src_dir: "{{ koji_hub_nfs }}"
-    when: "'releng_compose_stg' in group_names"
-
   - role: rabbit/user
     username: "pungi{{ env_suffix }}"