diff --git a/roles/matrix-grafana/templates/dashboards.yaml.j2 b/roles/matrix-grafana/templates/dashboards.yaml.j2
index b6662e597..aae42ba29 100644
--- a/roles/matrix-grafana/templates/dashboards.yaml.j2
+++ b/roles/matrix-grafana/templates/dashboards.yaml.j2
@@ -1,7 +1,7 @@
 apiVersion: 1
 
 providers:
-  - name: {{ matrix_domain }} - Dashboards
+  - name: {{ matrix_server_fqn_matrix }} - Dashboards
     folder: '' # The folder where to place the dashboards
     type: file
     allowUiUpdates: true
diff --git a/roles/matrix-grafana/templates/datasources.yaml.j2 b/roles/matrix-grafana/templates/datasources.yaml.j2
index ffa6046b0..6ccbe3742 100644
--- a/roles/matrix-grafana/templates/datasources.yaml.j2
+++ b/roles/matrix-grafana/templates/datasources.yaml.j2
@@ -1,7 +1,7 @@
 apiVersion: 1
 
 datasources:
-  - name: {{ matrix_domain }} - Prometheus
+  - name: {{ matrix_server_fqn_matrix }} - Prometheus
     type: prometheus
     # Access mode - proxy (server in the UI) or direct (browser in the UI).
     access: proxy