diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 32b0d3a8a..af84d5d92 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1467,7 +1467,21 @@ matrix_nginx_proxy_systemd_wanted_services_list: |
     +
     (['matrix-ma1sd.service'] if matrix_ma1sd_enabled else [])
     +
+    (['matrix-client-cinny.service'] if matrix_client_cinny_enabled else [])
+    +
     (['matrix-client-element.service'] if matrix_client_element_enabled else [])
+    +
+    (['matrix-client-hydrogen.service'] if matrix_client_hydrogen_enabled else [])
+    +
+    (['matrix-grafana.service'] if matrix_grafana_enabled else [])
+    +
+    (['matrix-dimension.service'] if matrix_dimension_enabled else [])
+    +
+    (['matrix-sygnal.service'] if matrix_sygnal_enabled else [])
+    +
+    (['matrix-jitsi.service'] if matrix_jitsi_enabled else [])
+    +
+    (['matrix-bot-go-neb.service'] if matrix_bot_go_neb_enabled else [])
   }}
 
 matrix_ssl_domains_to_obtain_certificates_for: |
@@ -2129,6 +2143,12 @@ matrix_grafana_dashboard_download_urls_all: |
     (matrix_prometheus_postgres_exporter_dashboard_urls if matrix_prometheus_postgres_exporter_enabled else [])
   }}
 
+matrix_grafana_systemd_wanted_services_list: |
+  {{
+    []
+    +
+    (['matrix-prometheus-postgres-exporter.service'] if matrix_prometheus_postgres_exporter_enabled else [])
+  }}
 
 ######################################################################
 #