diff --git a/docker-compose.full.yaml b/docker-compose.full.yaml
index 8dfb8f3..f72b576 100644
--- a/docker-compose.full.yaml
+++ b/docker-compose.full.yaml
@@ -26,7 +26,7 @@ services:
       - 127.0.0.1:3000:3000
     environment:
       HOSTNAME: grafana
-      GF_SERVER_ROOT_URL: ${GRAFANA_URL}
+      GF_SERVER_ROOT_URL: "${GRAFANA_URL}"
       GF_ANALYTICS_REPORTING_ENABLED: "false"
       GF_ANALYTICS_CHECK_FOR_UPDATES: "false"
       GF_USERS_ALLOW_SIGN_UP: "false"
@@ -35,6 +35,7 @@ services:
       GF_AUTH_BASIC_ENABLED: "${GF_AUTH_BASIC_ENABLED:-false}"
       GF_AUTH_DISABLE_LOGIN_FORM: "${GF_AUTH_DISABLE_LOGIN_FORM:-true}"
       GF_SECURITY_ADMIN_PASSWORD: "${GF_SECURITY_ADMIN_PASSWORD}"
+      GF_SECURITY_ADMIN_USER: "${GF_SECURITY_ADMIN_USER}"
     volumes:
       - ./files/grafana/dashboards.yaml:/etc/grafana/provisioning/dashboards/default.yaml:ro
       - ./files/grafana/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml:ro
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2bab333..8d60db5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -26,7 +26,7 @@ services:
       - 127.0.0.1:3000:3000
     environment:
       HOSTNAME: grafana
-      GF_SERVER_ROOT_URL: ${GRAFANA_URL}
+      GF_SERVER_ROOT_URL: "${GRAFANA_URL}"
       GF_ANALYTICS_REPORTING_ENABLED: "false"
       GF_ANALYTICS_CHECK_FOR_UPDATES: "false"
       GF_USERS_ALLOW_SIGN_UP: "false"
@@ -35,6 +35,7 @@ services:
       GF_AUTH_BASIC_ENABLED: "${GF_AUTH_BASIC_ENABLED:-false}"
       GF_AUTH_DISABLE_LOGIN_FORM: "${GF_AUTH_DISABLE_LOGIN_FORM:-true}"
       GF_SECURITY_ADMIN_PASSWORD: "${GF_SECURITY_ADMIN_PASSWORD}"
+      GF_SECURITY_ADMIN_USER: "${GF_SECURITY_ADMIN_USER}"
     volumes:
       - ./files/grafana/dashboards.yaml:/etc/grafana/provisioning/dashboards/default.yaml:ro
       - ./files/grafana/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml:ro
diff --git a/env-example b/env-example
index 1b3828f..50eb285 100644
--- a/env-example
+++ b/env-example
@@ -8,3 +8,4 @@ GF_AUTH_ANONYMOUS_ENABLED=true
 GF_AUTH_BASIC_ENABLED=true
 GF_AUTH_DISABLE_LOGIN_FORM=true
 GF_SECURITY_ADMIN_PASSWORD=xxxxxx
+GF_SECURITY_ADMIN_USER=xxxx