diff --git a/roles/postgresql_server/files/fasdb-cleanup-sessions b/roles/postgresql_server/files/fasdb-cleanup-sessions
new file mode 100755
index 0000000000..165971f1b0
--- /dev/null
+++ b/roles/postgresql_server/files/fasdb-cleanup-sessions
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+PGOPTIONS='-c maintenance_work_mem=1048576'
+SESSIONDBS='fas2'
+
+# Clean out old sessions since TurboGears doesn't
+for db in $SESSIONDBS; do
+/usr/bin/psql $db > /dev/null <<EOF
+delete from visit where expiry < now() - interval '1h';
+delete from visit_identity where visit_key not in (select visit_key from visit);
+EOF
+done
diff --git a/roles/postgresql_server/files/fasdb-cleanup-sessions.cron b/roles/postgresql_server/files/fasdb-cleanup-sessions.cron
new file mode 100644
index 0000000000..b06d8a7bfb
--- /dev/null
+++ b/roles/postgresql_server/files/fasdb-cleanup-sessions.cron
@@ -0,0 +1,6 @@
+SHELL=/bin/bash
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+MAILTO=root@fedoraproject.org
+HOME=/
+
+*/10 * * * * postgres /usr/local/bin/fasdb-cleanup-sessions
diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml
index 1396883628..3c9c5bff5c 100644
--- a/roles/postgresql_server/tasks/main.yml
+++ b/roles/postgresql_server/tasks/main.yml
@@ -88,3 +88,21 @@
   tags:
   - cron
   - postgresql
+
+- name: Set up a script for cron job to clean long fas sessions on fas database server only
+  copy: >
+    src=fasdb-cleanup-sessions
+    dest=/usr/local/bin/fasdb-cleanup-sessions
+  when: inventory_hostname.startswith('db-fas01')
+  tags:
+  - cron
+  - postgresql
+
+- name: Set up a cron job to clean long fas sessions on fas database server only
+  copy: >
+    src=fasdb-cleanup-sessions.cron
+    dest=/etc/cron.d/fasdb-cleanup-sessions.cron
+  when: inventory_hostname.startswith('db-fas01')
+  tags:
+  - cron
+  - postgresql