diff --git a/templates/compose/grafana-with-postgresql.yaml b/templates/compose/grafana-with-postgresql.yaml
index 25add4cc2..6c5dda659 100644
--- a/templates/compose/grafana-with-postgresql.yaml
+++ b/templates/compose/grafana-with-postgresql.yaml
@@ -11,7 +11,7 @@ services:
     environment:
       - SERVICE_URL_GRAFANA_3000
       - GF_SERVER_ROOT_URL=${SERVICE_URL_GRAFANA}
-      - GF_SERVER_DOMAIN=${SERVICE_URL_GRAFANA}
+      - GF_SERVER_DOMAIN=${SERVICE_FQDN_GRAFANA}
       - GF_SECURITY_ADMIN_PASSWORD=${SERVICE_PASSWORD_GRAFANA}
       - GF_DATABASE_TYPE=postgres
       - GF_DATABASE_HOST=postgresql
diff --git a/templates/compose/grafana.yaml b/templates/compose/grafana.yaml
index a570c6c79..ed1689f58 100644
--- a/templates/compose/grafana.yaml
+++ b/templates/compose/grafana.yaml
@@ -11,7 +11,7 @@ services:
     environment:
       - SERVICE_URL_GRAFANA_3000
       - GF_SERVER_ROOT_URL=${SERVICE_URL_GRAFANA}
-      - GF_SERVER_DOMAIN=${SERVICE_URL_GRAFANA}
+      - GF_SERVER_DOMAIN=${SERVICE_FQDN_GRAFANA}
       - GF_SECURITY_ADMIN_PASSWORD=${SERVICE_PASSWORD_GRAFANA}
     volumes:
       - grafana-data:/var/lib/grafana