diff --git a/playbooks/groups/postgresl-server.yml b/playbooks/groups/postgresl-server.yml
index b830eb2585..5379c7b479 100644
--- a/playbooks/groups/postgresl-server.yml
+++ b/playbooks/groups/postgresl-server.yml
@@ -37,7 +37,6 @@
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
   - /srv/web/infra/ansible/roles/postgresql_server
-  - /srv/web/infra/ansible/roles/koji_db
 
   tasks:
   - include: $tasks/hosts.yml
@@ -47,6 +46,20 @@
   - include: $tasks/sudo.yml
   - include: $tasks/collectd/client.yml
 
+- name: make koji db
+  hosts: dbserver-secondary
+  gather_facts: no
+  sudo: yes
+  sudo_user: postgres
+
+  vars_files: 
+   - /srv/web/infra/ansible/vars/global.yml
+   - ${private}/vars.yml
+   - ${vars}/${ansible_distribution}.yml
+
+  roles:
+  - /srv/web/infra/ansible/roles/koji_db
+
 # TODO: add iscsi task
 
   handlers:
diff --git a/roles/koji_db/tasks/main.yml b/roles/koji_db/tasks/main.yml
index 94f7d55bcd..71f60cc2de 100644
--- a/roles/koji_db/tasks/main.yml
+++ b/roles/koji_db/tasks/main.yml
@@ -2,13 +2,6 @@
 #
 # These tasks only run on koji db servers from the postgresql playbook
 #
-- name: setup postgresql koji config file
-  template: src=pg_hba.conf.j2 dest=/var/lib/pgsql/data/pg_hba.conf mode=600 backup=yes
-  notify:
-  - restart postgresql
-  tags:
-  - config
-
 #
 # create a koji database if not already created
 #
diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml
index cc88c6eca1..3d1bf050b2 100644
--- a/roles/postgresql_server/tasks/main.yml
+++ b/roles/postgresql_server/tasks/main.yml
@@ -19,6 +19,13 @@
   tags:
   - service
 
+- name: setup postgresql koji config file
+  template: src=pg_hba.conf.j2 dest=/var/lib/pgsql/data/pg_hba.conf mode=600 backup=yes
+  notify:
+  - restart postgresql
+  tags:
+  - config
+
 - name: Set postgresql-server to run on boot
   service: name=postgresql enabled=yes
   ignore_errors: true
diff --git a/roles/koji_db/templates/pg_hba.conf.j2 b/roles/postgresql_server/templates/pg_hba.conf.j2
similarity index 100%
rename from roles/koji_db/templates/pg_hba.conf.j2
rename to roles/postgresql_server/templates/pg_hba.conf.j2