diff --git a/roles/postgresql_server/files/koji-cleanup-sessions.cron b/roles/postgresql_server/files/koji-cleanup-sessions.cron
new file mode 100644
index 0000000000..562a7825aa
--- /dev/null
+++ b/roles/postgresql_server/files/koji-cleanup-sessions.cron
@@ -0,0 +1,6 @@
+SHELL=/bin/bash
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+MAILTO=root@fedoraproject.org
+HOME=/
+
+0 0 * * * postgres /usr/bin/psql -q -c "DELETE FROM sessions WHERE update_time < now() - '1 day'::interval" koji
diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml
index 54fb69bd5f..669b52ac78 100644
--- a/roles/postgresql_server/tasks/main.yml
+++ b/roles/postgresql_server/tasks/main.yml
@@ -72,3 +72,12 @@
   tags:
   - cron
   - postgresql
+
+- name: Set up a cron job to clean long koji sessions on koji database server only
+  copy: >
+    src=koji-cleanup-sessions.cron
+    dest=/etc/cron.d/koji-cleanup-sessions.cron
+  when: inventory_hostname.startswith('db-koji01')
+  tags:
+  - cron
+  - postgresql