diff --git a/docker/.env.example b/docker/.env.example
index 4636aa4e..5dc4da86 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -10,8 +10,10 @@ PROXY_DASH_PORT=81
 PROXY_MYSQL_PASS=%PROXY_MYSQL_PASS%
 PROXY_MYSQL_PASS_ROOT=%PROXY_MYSQL_PASS_ROOT%
 
-# grafana
+# Grafana
 GRAFANA_DB_PASSWORD=%GRAFANA_DB_PASSWORD%
+GF_SECURITY_ADMIN_USERNAME=admin
+GF_SECURITY_ADMIN_PASSWORD=%GF_SECURITY_ADMIN_PASSWORD%
 
 # Alliance Auth Environment Config
 AA_SITENAME=%AA_SITENAME%
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a4d73187..950cd2d1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -142,6 +142,8 @@ services:
       - grafana-data:/var/lib/grafana
     environment:
       GF_INSTALL_PLUGINS: grafana-piechart-panel,grafana-clock-panel,grafana-simple-json-datasource
+      GF_SECURITY_ADMIN_USERNAME: ${GF_SECURITY_ADMIN_USERNAME}
+      GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD}
       GF_AUTH_DATABASE_PASSWORD: ${GRAFANA_DB_PASSWORD}
     logging:
       driver: "json-file"
diff --git a/docker/scripts/prepare-env.sh b/docker/scripts/prepare-env.sh
index 53311536..9f5cc73e 100755
--- a/docker/scripts/prepare-env.sh
+++ b/docker/scripts/prepare-env.sh
@@ -11,6 +11,7 @@ cp .env.example .env
 sed -i.bak 's/%PROXY_MYSQL_PASS%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%PROXY_MYSQL_PASS_ROOT%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%GRAFANA_DB_PASSWORD%/'"$(openssl rand -hex 24)"'/g' .env
+sed -i.bak 's/%GF_SECURITY_ADMIN_PASSWORD%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%AA_SECRET_KEY%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%AA_DB_PASSWORD%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%AA_DB_ROOT_PASSWORD%/'"$(openssl rand -hex 24)"'/g' .env