diff --git a/filebeat/filebeat.yml b/filebeat/filebeat.yml
index 705aa27..e2c9660 100644
--- a/filebeat/filebeat.yml
+++ b/filebeat/filebeat.yml
@@ -7,11 +7,11 @@ setup.template.settings:
   index.codec: best_compression
 
 setup.kibana:
-  host: "${NGINX_HOST}:80"
+  host: "${NGINX_HOST}"
   path: "/geonetwork/dashboards"
   space.id: catalogue-monitor
-  username: admin
-  password: admin
+  username: ${METRIC_GN_USER}
+  password: ${METRIC_GN_PASSWORD}
 
 setup.dashboards:
   index: "gn-logs-*"
diff --git a/metricbeat/metricbeat.yml b/metricbeat/metricbeat.yml
index 3930639..72c998e 100644
--- a/metricbeat/metricbeat.yml
+++ b/metricbeat/metricbeat.yml
@@ -7,11 +7,11 @@ setup.template.settings:
   index.codec: best_compression
 
 setup.kibana:
-  host: "${NGINX_HOST}:80"
+  host: "${NGINX_HOST}"
   path: "/geonetwork/dashboards"
   space.id: catalogue-monitor
-  username: admin
-  password: admin
+  username: ${METRIC_GN_USER}
+  password: ${METRIC_GN_PASSWORD}
 
 setup.dashboards:
   index: "gn-metrics-*"