diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 37fd784e3..b8857376f 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -4389,7 +4389,7 @@ matrix_sliding_sync_container_image_self_build: "{{ matrix_architecture not in [
 matrix_sliding_sync_container_additional_networks: |
   {{
     (
-      ([matrix_playbook_reverse_proxyable_services_additional_network] if matrix_playbook_reverse_proxyable_services_additional_network else [])
+      ([matrix_playbook_reverse_proxyable_services_additional_network] if matrix_sliding_sync_container_labels_traefik_enabled and matrix_playbook_reverse_proxyable_services_additional_network else [])
       +
       ([] if matrix_homeserver_container_network in ['', matrix_sliding_sync_container_network] else [matrix_homeserver_container_network])
       +
@@ -4402,13 +4402,11 @@ matrix_sliding_sync_container_labels_traefik_docker_network: "{{ matrix_playbook
 matrix_sliding_sync_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}"
 matrix_sliding_sync_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}"
 
-matrix_sliding_sync_systemd_required_services_list: |
+matrix_sliding_sync_systemd_required_services_list_auto: |
   {{
-    ['docker.service']
-    +
     matrix_homeserver_systemd_services_list
     +
-    ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
+    ([devture_postgres_identifier ~ '.service'] if (devture_postgres_enabled and matrix_sliding_sync_database_hostname == devture_postgres_connection_hostname) else [])
   }}
 
 matrix_sliding_sync_environment_variable_syncv3_secret: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'ss.secret', rounds=655555) | to_uuid }}"
diff --git a/roles/custom/matrix-sliding-sync/defaults/main.yml b/roles/custom/matrix-sliding-sync/defaults/main.yml
index e27104be9..541070837 100644
--- a/roles/custom/matrix-sliding-sync/defaults/main.yml
+++ b/roles/custom/matrix-sliding-sync/defaults/main.yml
@@ -72,7 +72,10 @@ matrix_sliding_sync_container_labels_additional_labels: ''
 matrix_sliding_sync_container_extra_arguments: []
 
 # List of systemd services that matrix-sliding-sync-proxy.service depends on
-matrix_sliding_sync_systemd_required_services_list: ["docker.service"]
+matrix_sliding_sync_systemd_required_services_list: "{{ matrix_sliding_sync_systemd_required_services_list_default + matrix_sliding_sync_systemd_required_services_list_auto + matrix_sliding_sync_systemd_required_services_list_custom }}"
+matrix_sliding_sync_systemd_required_services_list_default: ["docker.service"]
+matrix_sliding_sync_systemd_required_services_list_auto: []
+matrix_sliding_sync_systemd_required_services_list_custom: []
 
 # List of systemd services that matrix-sliding-sync-proxy.service wants
 matrix_sliding_sync_systemd_wanted_services_list: []