diff --git a/playbooks/include/proxies-miscellaneous.yml b/playbooks/include/proxies-miscellaneous.yml
index a134f0c999..90b7827a35 100644
--- a/playbooks/include/proxies-miscellaneous.yml
+++ b/playbooks/include/proxies-miscellaneous.yml
@@ -55,3 +55,5 @@
   - role: apps-fp-o
     website: apps.fedoraproject.org
     path: /
+
+  - role: pkgdb2
diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index e62fa23d8f..3af5c0ba02 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -261,13 +261,6 @@
     wikipath: /wiki
     proxyurl: "{{ varnish_url }}"
 
-  - role: httpd/reverseproxy
-    website: admin.fedoraproject.org
-    destname: pkgdb
-    remotepath: /pkgdb
-    localpath: /pkgdb
-    proxyurl: "{{ varnish_url }}"
-
   - role: httpd/reverseproxy
     website: bodhi.fedoraproject.org
     destname: bodhi
diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json
new file mode 100644
index 0000000000..f7b44ef848
--- /dev/null
+++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json
@@ -0,0 +1,423 @@
+{
+  "collections": [
+    {
+      "allow_retire": false, 
+      "branchname": "f28", 
+      "date_created": "2018-02-20 11:18:46", 
+      "date_updated": "2018-02-20 11:18:46", 
+      "dist_tag": ".fc28", 
+      "koji_name": "f28", 
+      "name": "Fedora", 
+      "status": "Under Development", 
+      "version": "28"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f25", 
+      "date_created": "2016-07-26 13:50:32", 
+      "date_updated": "2016-11-22 14:31:43", 
+      "dist_tag": ".fc25", 
+      "koji_name": "f25", 
+      "name": "Fedora", 
+      "status": "Active", 
+      "version": "25"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f10", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc10", 
+      "koji_name": "dist-f10", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "10"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f16", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc16", 
+      "koji_name": "f16", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "16"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "FC-1", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc1", 
+      "koji_name": null, 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "1"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "FC-2", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc2", 
+      "koji_name": null, 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "2"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "FC-3", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc3", 
+      "koji_name": null, 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "3"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "FC-4", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc4", 
+      "koji_name": null, 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "4"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "FC-5", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc5", 
+      "koji_name": null, 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "5"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "fc6", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc6", 
+      "koji_name": "dist-fc6", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "6"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f7", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc7", 
+      "koji_name": "dist-fc7", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "7"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f11", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc11", 
+      "koji_name": "dist-f11", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "11"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f17", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc17", 
+      "koji_name": "f17", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "17"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f20", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc20", 
+      "koji_name": "f20", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "20"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f19", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc19", 
+      "koji_name": "f19", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "19"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f22", 
+      "date_created": "2015-02-10 14:00:01", 
+      "date_updated": "2016-07-19 15:50:41", 
+      "dist_tag": ".fc22", 
+      "koji_name": "f22", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "22"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f21", 
+      "date_created": "2014-07-08 18:02:03", 
+      "date_updated": "2015-12-21 10:17:22", 
+      "dist_tag": ".fc21", 
+      "koji_name": "f21", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "21"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f23", 
+      "date_created": "2015-07-14 18:13:12", 
+      "date_updated": "2016-12-20 20:27:52", 
+      "dist_tag": ".fc23", 
+      "koji_name": "f23", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "23"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f24", 
+      "date_created": "2016-02-23 22:57:55", 
+      "date_updated": "2017-09-19 16:43:34", 
+      "dist_tag": ".fc24", 
+      "koji_name": "f24", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "24"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f27", 
+      "date_created": "2017-09-19 16:42:06", 
+      "date_updated": "2017-11-28 09:45:05", 
+      "dist_tag": ".fc27", 
+      "koji_name": "f27", 
+      "name": "Fedora", 
+      "status": "Under Development", 
+      "version": "27"
+    }, 
+    {
+      "allow_retire": true, 
+      "branchname": "master", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2017-09-19 16:41:54", 
+      "dist_tag": ".fc29", 
+      "koji_name": "rawhide", 
+      "name": "Fedora", 
+      "status": "Under Development", 
+      "version": "devel"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f26", 
+      "date_created": "2017-02-28 20:24:57", 
+      "date_updated": "2017-07-11 14:04:59", 
+      "dist_tag": ".fc26", 
+      "koji_name": "f26", 
+      "name": "Fedora", 
+      "status": "Active", 
+      "version": "26"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f8", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc8", 
+      "koji_name": "dist-f8", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "8"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f9", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc9", 
+      "koji_name": "dist-f9", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "9"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f15", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc15", 
+      "koji_name": "dist-f15", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "15"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f12", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc12", 
+      "koji_name": "dist-f12", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "12"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f13", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc13", 
+      "koji_name": "dist-f13", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "13"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f14", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc14", 
+      "koji_name": "dist-f14", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "14"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "f18", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".fc18", 
+      "koji_name": "f18", 
+      "name": "Fedora", 
+      "status": "EOL", 
+      "version": "18"
+    }, 
+    {
+      "allow_retire": true, 
+      "branchname": "el5", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2017-03-31 15:41:41", 
+      "dist_tag": ".el5", 
+      "koji_name": "dist-5E-epel", 
+      "name": "Fedora EPEL", 
+      "status": "EOL", 
+      "version": "5"
+    }, 
+    {
+      "allow_retire": true, 
+      "branchname": "epel7", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2015-12-08 15:16:41", 
+      "dist_tag": ".el7", 
+      "koji_name": "epel7", 
+      "name": "Fedora EPEL", 
+      "status": "Active", 
+      "version": "7"
+    }, 
+    {
+      "allow_retire": true, 
+      "branchname": "el6", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2015-12-08 15:17:58", 
+      "dist_tag": ".el6", 
+      "koji_name": "dist-6E-epel", 
+      "name": "Fedora EPEL", 
+      "status": "Active", 
+      "version": "6"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "el4", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".el4", 
+      "koji_name": "dist-4E-epel", 
+      "name": "Fedora EPEL", 
+      "status": "EOL", 
+      "version": "4"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "olpc3", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".olpc3", 
+      "koji_name": "dist-olpc3", 
+      "name": "Fedora OLPC", 
+      "status": "EOL", 
+      "version": "3"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "OLPC-4", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": "olpc4", 
+      "koji_name": "dist-olpc4", 
+      "name": "Fedora OLPC", 
+      "status": "EOL", 
+      "version": "4"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "OLPC-2", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".olpc2", 
+      "koji_name": "dist-olpc2", 
+      "name": "Fedora OLPC", 
+      "status": "EOL", 
+      "version": "2"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "RHL-8", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".rhl8", 
+      "koji_name": null, 
+      "name": "Red Hat Linux", 
+      "status": "EOL", 
+      "version": "8"
+    }, 
+    {
+      "allow_retire": false, 
+      "branchname": "RHL-9", 
+      "date_created": "2014-05-14 12:36:15", 
+      "date_updated": "2014-05-14 12:36:15", 
+      "dist_tag": ".rhl9", 
+      "koji_name": null, 
+      "name": "Red Hat Linux", 
+      "status": "EOL", 
+      "version": "9"
+    }
+  ], 
+  "output": "ok"
+}
\ No newline at end of file
diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software.conf b/roles/pkgdb-proxy/files/pkgdb-gnome-software.conf
new file mode 100644
index 0000000000..e1257f3efb
--- /dev/null
+++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software.conf
@@ -0,0 +1 @@
+Alias /pkgdb/api/collections /srv/web/pkgdb-gnome-software-collections.json
diff --git a/roles/pkgdb-proxy/tasks/main.yml b/roles/pkgdb-proxy/tasks/main.yml
new file mode 100644
index 0000000000..edd3c70984
--- /dev/null
+++ b/roles/pkgdb-proxy/tasks/main.yml
@@ -0,0 +1,15 @@
+---
+# Install static JSON file needed by gnome-software, on proxies.
+- name: Copy static JSON file into place
+  copy: src=pkgdb-gnome-software-collections.json dest=/srv/web/pkgdb-gnome-software-collections.json owner=root group=root mode=755
+  tags:
+  - gnome-software
+  - pkgdb2
+
+- name: Copy httpd config
+  copy: src=pkgdb-gnome-software.conf dest=/etc/httpd/conf.d/admin.fedoraproject.org/pkgdb.conf owner=root group=root mode=755
+  notify:
+  - restart httpd
+  tags:
+  - gnome-software
+  - pkgdb2