diff --git a/lxc1/p4-monitor/grafana.yml b/lxc1/p4-monitor/grafana.yml
index 936e342..c60e111 100644
--- a/lxc1/p4-monitor/grafana.yml
+++ b/lxc1/p4-monitor/grafana.yml
@@ -1,13 +1,13 @@
 services:
   grafana:
     image: grafana/grafana-oss:latest
-    container_name: grafana_node${GRAFANA_NODE_ID}
+    container_name: grafana_node${GF_NODE_ID}
     user: "1000:1000"
     restart: always
     environment:
-      - GF_SERVER_ROOT_URL=https://${GRAFANA_HOST_NAME}.${TRAEFIK_DNS_SUFFIX}
-      - GF_SECURITY_ADMIN_USER=${GRAFANA_USER_NAME}
-      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_USER_PASS}
+      - GF_SERVER_ROOT_URL=https://${GF_HOST_NAME}.${TRAEFIK_DNS_SUFFIX}
+      - GF_SECURITY_ADMIN_USER=${GF_USER_NAME}
+      - GF_SECURITY_ADMIN_PASSWORD=${GF_USER_PASS}
       - GF_USERS_ALLOW_SIGN_UP=false
     volumes:
       - /shared/grafana/data:/var/lib/grafana
@@ -19,7 +19,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=grafana_external"
-      - "traefik.http.routers.grafana.rule=Host(`${GRAFANA_HOST_NAME}.${TRAEFIK_DNS_SUFFIX}`)"
+      - "traefik.http.routers.grafana.rule=Host(`${GF_HOST_NAME}.${TRAEFIK_DNS_SUFFIX}`)"
       - "traefik.http.routers.grafana.entrypoints=websecure"
       - "traefik.http.routers.grafana.tls=true"
       - "traefik.http.routers.grafana.tls.certresolver=dns_resolver"