diff --git a/docker-compose.yml b/docker-compose.yml
index 759eb58..8e5374e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -121,6 +121,8 @@ services:
     image: grafana/grafana:latest
     env_file:
       - ./monitoring/configuration/grafana-plugins.env
+    environment:
+      - ADMIN_PASSW=${GF_SECURITY_ADMIN_PASSWORD}
     volumes:
       - ./monitoring/configuration/grafana.ini:/etc/grafana/grafana.ini:z
       - ./monitoring/configuration/dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml:z
diff --git a/monitoring/configuration/grafana.ini b/monitoring/configuration/grafana.ini
index 5a3bfb3..2e51258 100644
--- a/monitoring/configuration/grafana.ini
+++ b/monitoring/configuration/grafana.ini
@@ -25,8 +25,8 @@ enabled = true
 org_role = Viewer
 
 [security]
-admin_user = waku
-admin_password = Waku-Waku-eh-eh
+admin_user = wakusim-user
+admin_password = ${ADMIN_PASSW}
 
 ;[users]
 # disable user signup / registration