diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml
index 416ec8e9f9..dc8ece7d97 100644
--- a/roles/koji_hub/tasks/main.yml
+++ b/roles/koji_hub/tasks/main.yml
@@ -189,10 +189,9 @@
   - cron
   - koji_hub
 
-- name: koji web config files
+- name: koji web common config files
   copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root
   with_items:
-  - kojiweb.conf
   - kojihub.conf
   - mash.conf
   - rel-eng.conf
@@ -202,6 +201,13 @@
   - koji_hub
   notify: restart httpd
 
+- name: koji web hub specific config files
+  template: src=kojiweb.conf.j2 dest=/etc/httpd/conf.d/kojiweb.conf owner=root group=root
+  tags:
+  - config
+  - koji_hub
+  notify: restart httpd
+
 - name: koji web staging config files
   copy: src=kojiweb.conf.stg dest=/etc/httpd/conf.d/kojiweb-stg.conf owner=root group=root
   tags:
diff --git a/roles/koji_hub/files/kojiweb.conf b/roles/koji_hub/templates/kojiweb.conf.j2
similarity index 74%
rename from roles/koji_hub/files/kojiweb.conf
rename to roles/koji_hub/templates/kojiweb.conf.j2
index d8f09d27d7..f8393ae0c0 100644
--- a/roles/koji_hub/files/kojiweb.conf
+++ b/roles/koji_hub/templates/kojiweb.conf.j2
@@ -63,5 +63,19 @@ Alias /buildgroups "/mnt/koji/buildgroups/"
     Require all granted
 </Directory>
 
-
+{% if inventory_hostname.startswith('koji') %}
+# use a redirect for packages location
 RewriteRule ^/packages(.+) https://kojipkgs.fedoraproject.org/packages$1  [R=301,L]
+{% else %}
+Alias /packages "/mnt/koji/packages/"
+
+<Directory "/mnt/koji/packages/">
+    Options Indexes FollowSymLinks
+    Require all granted
+</Directory>
+
+# use a redirect for packages location to be consistent with primary hub
+{% if inventory_hostname == 's390-koji01.qa.fedoraproject.org' %}
+RewriteRule ^/packages(.+) https://s390pkgs.fedoraproject.org/packages$1  [R=301,L]
+{% endif %}
+{% endif %}