diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index d9aa472924653a5953b31fe78c02c5fdeac3c118..3440e38f20b778708e8ed3876b41b1af36654510 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -507,7 +507,7 @@ function upgrade_matrix {
     if [[ "$MATRIX_PYTHON" != '/usr/binpython' ]]; then
         $INSTALL_PACKAGES python3 python3-dev \
                           python3-pip python3-psycopg2 python3-venv \
-                          python3-setuptools
+                          python3-setuptools libpq-dev
     fi
 
     # recreate the daemon if needed
@@ -521,6 +521,7 @@ function upgrade_matrix {
     chown -R matrix:matrix /etc/matrix
     chown -R matrix:matrix $MATRIX_DATA_DIR
 
+    $MATRIX_PIP install --upgrade --force "psycopg2"
     $MATRIX_PIP install --upgrade --force "pynacl>=1.2.1"
     $MATRIX_PIP install --upgrade --force "canonicaljson>=1.1.3"
     $MATRIX_PIP install --upgrade --force "phonenumbers>=8.2.0"
@@ -817,7 +818,7 @@ function install_matrix {
             python3-pip python3-psycopg2 python3-venv \
             python3-setuptools \
             python-virtualenv sqlite unzip \
-            zlib1g zlib1g-dev
+            zlib1g zlib1g-dev libpq-dev
 
     increment_app_install_progress
 
@@ -833,6 +834,10 @@ function install_matrix {
 
     increment_app_install_progress
 
+    $MATRIX_PIP install --upgrade psycopg2
+
+    increment_app_install_progress
+
     $MATRIX_PIP install --upgrade python-ldap
 
     increment_app_install_progress