diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 2fbe0c2b0..acfe16a99 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1184,6 +1184,17 @@ matrix_backup_borg_systemd_required_services_list: |
 
 matrix_maubot_enabled: false
 
+matrix_maubot_systemd_required_services_list: |
+  {{
+    ['docker.service']
+    +
+    (['matrix-synapse.service'] if matrix_synapse_enabled else [])
+    +
+    (['matrix-postgres.service'] if matrix_postgres_enabled else [])
+    +
+    (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
+  }}
+
 ######################################################################
 #
 # /matrix-bot-maubot
diff --git a/roles/matrix-maubot/defaults/main.yml b/roles/matrix-maubot/defaults/main.yml
index c03fe5098..1038e77e8 100644
--- a/roles/matrix-maubot/defaults/main.yml
+++ b/roles/matrix-maubot/defaults/main.yml
@@ -5,7 +5,7 @@ matrix_maubot_container_data_dir: "/data"
 matrix_maubot_container_config_dir: "/root/.config/"
 matrix_maubot_config_filename: "config.yaml"
 matrix_maubot_config_path: "{{ matrix_maubot_host_data_dir + '/' + matrix_maubot_config_filename }}"
-matrix_maubot_systemd_required_services_list: ['docker.service', 'matrix-synapse.service', 'matrix-nginx-proxy.service']
+matrix_maubot_systemd_required_services_list: ['docker.service']
 matrix_maubot_systemd_wanted_services_list: []
 matrix_maubot_container_extra_arguments: []