diff --git a/compose.grafana.yml b/compose.grafana.yml
index c6869d4..a9758a2 100644
--- a/compose.grafana.yml
+++ b/compose.grafana.yml
@@ -25,14 +25,14 @@ services:
       - proxy
       - internal
     environment:
-      - GF_SERVER_ROOT_URL=https://${GRAFANA_DOMAIN}
+      - GF_SERVER_ROOT_URL
       - GF_SECURITY_ADMIN_PASSWORD__FILE=/run/secrets/grafana_admin_password
       - GF_SMTP_HOST
       - GF_SMTP_ENABLED
       - GF_SMTP_FROM_ADDRESS
       - GF_SMTP_SKIP_VERIFY
       - GF_SECURITY_ALLOW_EMBEDDING
-      - GF_INSTALL_PLUGINS=grafana-piechart-panel
+      - GF_INSTALL_PLUGINS
       - OIDC_API_URL
       - OIDC_AUTH_URL
       - OIDC_CLIENT_ID
diff --git a/grafana_custom.ini b/grafana_custom.ini
index 2f17975..08a84af 100644
--- a/grafana_custom.ini
+++ b/grafana_custom.ini
@@ -18,6 +18,7 @@ name = oauth
 icon = signin
 tls_skip_verify_insecure = false
 allow_sign_up = true
+auto_login = true
 client_id = {{ env "OIDC_CLIENT_ID" }}
 client_secret = {{ secret "grafana_oidc_client_secret" }}
 auth_url = {{ env "OIDC_AUTH_URL" }}