diff --git a/roles/matrix_synapse/tasks/conf.yml b/roles/matrix_synapse/tasks/conf.yml
index 0c00ae0..954a69e 100644
--- a/roles/matrix_synapse/tasks/conf.yml
+++ b/roles/matrix_synapse/tasks/conf.yml
@@ -10,7 +10,7 @@
   tags: matrix
 
 - name: Generate certificates
-  command: "{{ synapse_root_dir }}/bin/python3 -m synapse.app.homeserver --generate-keys -c {{ synapse_root_dir }}/etc/homeserver.yaml"
+  command: "{{ synapse_root_dir }}/venv/bin/python3 -m synapse.app.homeserver --generate-keys -c {{ synapse_root_dir }}/etc/homeserver.yaml"
   args:
     creates: "{{ synapse_root_dir }}/etc/{{ synapse_server_name }}.signing.key"
   tags: matrix
diff --git a/roles/matrix_synapse/tasks/install.yml b/roles/matrix_synapse/tasks/install.yml
index 838fb58..694ac0e 100644
--- a/roles/matrix_synapse/tasks/install.yml
+++ b/roles/matrix_synapse/tasks/install.yml
@@ -19,13 +19,14 @@
       - libtool
       - autoconf
       - automake
-      - postgresql11
+      - postgresql12
       - postgresql-devel
       - libpqxx-devel
       - jemalloc
       - python3-virtualenv
       - python3-pip
       - python-psycopg2
+      - python-setuptools
   tags: matrix
 
 - name: Wipe pip cache
diff --git a/roles/matrix_synapse/tasks/main.yml b/roles/matrix_synapse/tasks/main.yml
index 2706713..9b84de6 100644
--- a/roles/matrix_synapse/tasks/main.yml
+++ b/roles/matrix_synapse/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
 
-- include: facts.yml
 - include: user.yml
 - include: directories.yml
+- include: facts.yml
 - include: install.yml
 - include: conf.yml
 - include: iptables.yml
diff --git a/roles/matrix_synapse/templates/pre-backup.sh.j2 b/roles/matrix_synapse/templates/pre-backup.sh.j2
index d296d6d..17bbfcb 100644
--- a/roles/matrix_synapse/templates/pre-backup.sh.j2
+++ b/roles/matrix_synapse/templates/pre-backup.sh.j2
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-PGPASSWORD='{{ synapse_pg_db_pass }}' /usr/pgsql-11/bin/pg_dump \
+PGPASSWORD='{{ synapse_pg_db_pass }}' /usr/pgsql-12/bin/pg_dump \
   --clean \
   --create \
   --username={{ synapse_pg_db_user }} \