diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index d6a7b6452a..e93f5198aa 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -83,6 +83,11 @@
     nfs_src_dir: 'fedora_koji_archive05'
     when: env == 'production' and inventory_hostname.startswith('koji')
 
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive06'
+    nfs_src_dir: 'fedora_koji_archive06'
+    when: env == 'production' and inventory_hostname.startswith('koji')
+
   - role: nfs/client
     mnt_dir: '/mnt/koji/ostree'
     nfs_src_dir: 'fedora_ostree_content/ostree'
diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml
index 364e38f54b..e8f3301309 100644
--- a/playbooks/groups/kojipkgs.yml
+++ b/playbooks/groups/kojipkgs.yml
@@ -45,6 +45,9 @@
   - role: nfs/client
     mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive05'
     nfs_src_dir: 'fedora_koji_archive05'
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive06'
+    nfs_src_dir: 'fedora_koji_archive06'
   - role: nfs/client
     mnt_dir: '/mnt/fedora_app/app'
     nfs_src_dir: 'fedora_app/app'
diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml
index e0350fe137..0851cbc807 100644
--- a/playbooks/groups/releng-compose.yml
+++ b/playbooks/groups/releng-compose.yml
@@ -131,6 +131,11 @@
     nfs_src_dir: '/fedora_koji_archive05'
     when: "'releng_compose' in group_names"
 
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji/koji/vol/fedora_koji_archive06'
+    nfs_src_dir: '/fedora_koji_archive06'
+    when: "'releng_compose' in group_names"
+
   - role: rabbit/user
     username: "pungi{{ env_suffix }}"
     sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pungi|compose|logger)\..*
diff --git a/roles/kojipkgs/templates/kojipkgs.conf b/roles/kojipkgs/templates/kojipkgs.conf
index d9c5715762..bef16bbc74 100644
--- a/roles/kojipkgs/templates/kojipkgs.conf
+++ b/roles/kojipkgs/templates/kojipkgs.conf
@@ -33,6 +33,7 @@ Alias /vol/fedora_koji_archive02/packages /mnt/fedora_koji/koji/vol/fedora_koji_
 Alias /vol/fedora_koji_archive03/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive03/packages
 Alias /vol/fedora_koji_archive04/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive04/packages
 Alias /vol/fedora_koji_archive05/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive05/packages
+Alias /vol/fedora_koji_archive06/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive06/packages
 Alias /toplink/packages /mnt/fedora_koji/koji/packages
 Alias /toplink/vol/fedora_koji_archive00/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive00/packages
 Alias /toplink/vol/fedora_koji_archive01/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive01/packages
@@ -40,6 +41,7 @@ Alias /toplink/vol/fedora_koji_archive02/packages /mnt/fedora_koji/koji/vol/fedo
 Alias /toplink/vol/fedora_koji_archive03/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive03/packages
 Alias /toplink/vol/fedora_koji_archive04/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive04/packages
 Alias /toplink/vol/fedora_koji_archive05/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive05/packages
+Alias /toplink/vol/fedora_koji_archive06/packages /mnt/fedora_koji/koji/vol/fedora_koji_archive06/packages
 
 <Directory /mnt/fedora_koji/koji/packages>
     Options Indexes FollowSymLinks
@@ -90,6 +92,13 @@ Alias /toplink/vol/fedora_koji_archive05/packages /mnt/fedora_koji/koji/vol/fedo
     Require all granted
 </Directory>
 
+<Directory /mnt/fedora_koji/koji/vol/fedora_koji_archive06/packages>
+    Options Indexes FollowSymLinks
+    IndexOptions NameWidth=* FancyIndexing
+    FileETag None
+    Require all granted
+</Directory>
+
 Alias /repos-dist /mnt/fedora_koji/koji/repos-dist
 
 <Directory /mnt/fedora_koji/koji/repos-dist>