diff --git a/grafana/application.yml b/grafana/application.yml
index b6772ad..d764394 100644
--- a/grafana/application.yml
+++ b/grafana/application.yml
@@ -1,6 +1,6 @@
 ---
-apiVersion: codemowers.io/v1alpha1
-kind: OIDCGWClient
+apiVersion: codemowers.cloud/v1beta1
+kind: OIDCClient
 metadata:
   name: grafana
 spec:
@@ -31,6 +31,8 @@ data:
     [server]
     domain = grafana.k-space.ee
     root_url = https://%(domain)s/
+    [auth]
+    oauth_allow_insecure_email_lookup=true
     [auth.generic_oauth]
     name = OAuth
     icon = signin
@@ -73,7 +75,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: oidc-client-grafana-owner-secrets
-                  key: OIDC_GATEWAY_URI
+                  key: OIDC_IDP_URI
             - name: GF_AUTH_GENERIC_OAUTH_CLIENT_ID
               valueFrom:
                 secretKeyRef:
@@ -93,17 +95,32 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: oidc-client-grafana-owner-secrets
-                  key: OIDC_GATEWAY_AUTH_URI
+                  key: OIDC_IDP_AUTH_URI
             - name: GF_AUTH_GENERIC_OAUTH_TOKEN_URL
               valueFrom:
                 secretKeyRef:
                   name: oidc-client-grafana-owner-secrets
-                  key: OIDC_GATEWAY_TOKEN_URI
+                  key: OIDC_IDP_TOKEN_URI
             - name: GF_AUTH_GENERIC_OAUTH_API_URL
               valueFrom:
                 secretKeyRef:
                   name: oidc-client-grafana-owner-secrets
-                  key: OIDC_GATEWAY_USERINFO_URI
+                  key: OIDC_IDP_USERINFO_URI
+            - name: GF_DATABASE_TYPE
+              value: mysql
+            - name: GF_DATABASE_HOST
+              value: 172.20.36.1:3306
+            - name: GF_DATABASE_SSL_MODE
+              value: disable
+            - name: GF_DATABASE_NAME
+              value: kspace_grafana
+            - name: GF_DATABASE_USER
+              value: kspace_grafana
+            - name: GF_DATABASE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: grafana-database
+                  key: password
           ports:
             - containerPort: 3000
               name: http-grafana