diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 56a993b1..9bb85a9c 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -11,6 +11,9 @@
 # matrix server
 #
 # https://raw.githubusercontent.com/silvio/docker-matrix
+# https://matrix.org/blog/2016/02/10/advanced-synapse-setup-with-lets-encrypt
+#
+# Test by visiting https://$MATRIX_DOMAIN_NAME/_matrix/key/v2/server/auto
 #
 # License
 # =======
@@ -48,7 +51,7 @@ MATRIX_ID_PORT=8081
 MATRIX_ONION_PORT=8109
 MATRIX_ID_ONION_PORT=8111
 MATRIX_REPO="https://github.com/matrix-org/synapse"
-MATRIX_COMMIT='27c005ae2c568909ab98fa936f38c0952bffe679'
+MATRIX_COMMIT='c45dc6c62aa2a2e83a10d8116a709dfd8c144e3c'
 SYDENT_REPO="https://github.com/matrix-org/sydent"
 SYDENT_COMMIT='d087278afd712222653b69ff72bd8ff4aa0180ec'
 REPORT_STATS="no"
@@ -704,8 +707,9 @@ function install_home_server {
     echo 'Type=simple' >> /etc/systemd/system/matrix.service
     echo 'User=matrix' >> /etc/systemd/system/matrix.service
     echo "WorkingDirectory=/etc/matrix" >> /etc/systemd/system/matrix.service
+    echo "ExecStartPre=/usr/bin/python -m synapse.app.homeserver --config-path ${MATRIX_DATA_DIR}/homeserver.yaml --generate-keys" >> /etc/systemd/system/matrix.service
     echo "ExecStart=/usr/bin/python -m synapse.app.homeserver --config-path ${MATRIX_DATA_DIR}/homeserver.yaml" >> /etc/systemd/system/matrix.service
-    echo 'Restart=always' >> /etc/systemd/system/matrix.service
+    echo 'Restart=on-failure' >> /etc/systemd/system/matrix.service
     echo 'RestartSec=10' >> /etc/systemd/system/matrix.service
     echo '' >> /etc/systemd/system/matrix.service
     echo '[Install]' >> /etc/systemd/system/matrix.service