diff --git a/bundles/matrix-synapse/files/override.conf b/bundles/matrix-synapse/files/override.conf
new file mode 100644
index 0000000..a499b3e
--- /dev/null
+++ b/bundles/matrix-synapse/files/override.conf
@@ -0,0 +1,6 @@
+[Service]
+ExecStartPre=
+ExecStartPre=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --generate-keys
+
+ExecStart=
+ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml
diff --git a/bundles/matrix-synapse/items.py b/bundles/matrix-synapse/items.py
index a525ee9..825e315 100644
--- a/bundles/matrix-synapse/items.py
+++ b/bundles/matrix-synapse/items.py
@@ -9,11 +9,23 @@ files = {
             'svc_systemd:matrix-synapse:restart',
         },
     },
+    '/etc/systemd/system/matrix-synapse.service.d/override.conf': {
+        'needs': {
+            'pkg_apt:matrix-synapse-py3',
+        },
+        'triggers': {
+            'action:systemd-reload',
+            'svc_systemd:matrix-synapse:restart',
+        },
+    },
     '/etc/matrix-synapse/homeserver.signing.key': {
         'content': repo.vault.decrypt_file('matrix-synapse/{}/homeserver_signing.key.vault'.format(node.name)),
     },
     '/etc/matrix-synapse/conf.d': {
         'delete': True,
+        'needs': {
+            'file:/etc/systemd/system/matrix-synapse.service.d/override.conf',
+        },
     },
 }
 
@@ -21,7 +33,7 @@ svc_systemd = {
     'matrix-synapse': {
         'needs': {
             'file:/etc/matrix-synapse/homeserver.yaml',
-            'file:/etc/matrix-synapse/conf.d',
+            'file:/etc/systemd/system/matrix-synapse.service.d/override.conf',
             'pkg_apt:matrix-synapse-py3',
         },
     },