diff --git a/metrics/README.md b/metrics/README.md
index 5c8b49e27..cc13c7a91 100644
--- a/metrics/README.md
+++ b/metrics/README.md
@@ -1,3 +1,5 @@
+![image](https://user-images.githubusercontent.com/110216567/184346286-94e0b45f-19e9-4fc9-a1a3-2e50c6f12bf8.png)
+
 # Metrics
 
 ## InfluxDB
diff --git a/metrics/metrics-main/grafana.sh b/metrics/metrics-main/grafana.sh
index 6e6044410..a6730ecc7 100644
--- a/metrics/metrics-main/grafana.sh
+++ b/metrics/metrics-main/grafana.sh
@@ -41,6 +41,10 @@ sudo docker run \
   --publish 3000:3000 \
   --user root:root \
   --env GF_PATHS_CONFIG=/grafana.ini \
+  --env GF_AUTH_GITHUB_CLIENT_ID="$GITHUB_CLIENT_ID" \
+  --env GF_AUTH_GITHUB_CLIENT_SECRET="$GITHUB_CLIENT_SECRET" \
+  --env GF_SECURITY_ADMIN_USER="$ADMIN_USER_GRAFANA" \
+  --env GF_SECURITY_ADMIN_PASSWORD="$ADMIN_PASSWORD_GRAFANA" \
   --volume "$PWD"/certs:/certs:ro \
   --volume "$PWD"/grafana-"$HOST".ini:/grafana.ini:ro \
   --volume /var/lib/grafana:/var/lib/grafana \
diff --git a/metrics/metrics-main/kapacitor.sh b/metrics/metrics-main/kapacitor.sh
index f4a964458..78e9fe317 100644
--- a/metrics/metrics-main/kapacitor.sh
+++ b/metrics/metrics-main/kapacitor.sh
@@ -28,6 +28,8 @@ container=kapacitor
 sudo docker run \
   --detach \
   --name=kapacitor \
+  --env KAPACITOR_USERNAME="$KAPACITOR_USERNAME" \
+  --env KAPACITOR_USERNAME="$KAPACITOR_PASSWORD" \
   --publish 9092:9092 \
   --volume "$PWD"/kapacitor.conf:/etc/kapacitor/kapacitor.conf \
   --volume /var/lib/kapacitor:/var/lib/kapacitor \
diff --git a/metrics/metrics-main/start.sh b/metrics/metrics-main/start.sh
old mode 100644
new mode 100755
index 5f2bc22bc..0a3a969a1
--- a/metrics/metrics-main/start.sh
+++ b/metrics/metrics-main/start.sh
@@ -80,6 +80,10 @@ sudo docker run \
   --publish 3000:3000 \
   --user root:root \
   --env GF_PATHS_CONFIG=/grafana.ini \
+  --env GF_AUTH_GITHUB_CLIENT_ID="$GITHUB_CLIENT_ID" \
+  --env GF_AUTH_GITHUB_CLIENT_SECRET="$GITHUB_CLIENT_SECRET" \
+  --env GF_SECURITY_ADMIN_USER="$ADMIN_USER_GRAFANA" \
+  --env GF_SECURITY_ADMIN_PASSWORD="$ADMIN_PASSWORD_GRAFANA" \
   --volume "$PWD"/certs:/certs:ro \
   --volume "$PWD"/grafana-"$HOST".ini:/grafana.ini:ro \
   --volume /var/lib/grafana:/var/lib/grafana \
@@ -133,6 +137,8 @@ sudo docker run \
 sudo docker run \
   --detach \
   --name=kapacitor \
+  --env KAPACITOR_USERNAME="$KAPACITOR_USERNAME" \
+  --env KAPACITOR_USERNAME="$KAPACITOR_PASSWORD" \
   --publish 9092:9092 \
   --volume "$PWD"/kapacitor.conf:/etc/kapacitor/kapacitor.conf \
   --volume /var/lib/kapacitor:/var/lib/kapacitor \