diff --git a/monitor/grafana/config.tf b/monitor/grafana/config.tf
index e02add4..fbe9d55 100644
--- a/monitor/grafana/config.tf
+++ b/monitor/grafana/config.tf
@@ -26,6 +26,7 @@ auto_assign_org_id = 0
 [auth]
 oauth_allow_insecure_email_lookup = true
 signout_redirect_url = '${module.oauth2.sso_signout_url}'
+oauth_auto_login = true
 [auth.generic_oauth]
 enabled = true
 name = vynil
diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml
index 984fb4a..3b0a327 100644
--- a/monitor/grafana/index.yaml
+++ b/monitor/grafana/index.yaml
@@ -6,6 +6,36 @@ metadata:
   name: grafana
   description: null
 options:
+  admin_name:
+    default: grafana_admin
+    examples:
+    - grafana_admin
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  sub-domain:
+    default: grafana
+    examples:
+    - grafana
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   app-group:
     default: monitor
     examples:
@@ -108,11 +138,6 @@ options:
             type: string
         type: object
     type: object
-  sub-domain:
-    default: grafana
-    examples:
-    - grafana
-    type: string
   volume:
     default:
       accessMode: ReadWriteOnce
@@ -132,31 +157,6 @@ options:
         default: 10Gi
         type: string
     type: object
-  admin_name:
-    default: grafana_admin
-    examples:
-    - grafana_admin
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
 dependencies: []
 providers:
   kubernetes: true