diff --git a/yonote-chart-service/secret-values.yaml b/yonote-chart-service/secret-values.yaml
index 388175c..ca3aed9 100644
--- a/yonote-chart-service/secret-values.yaml
+++ b/yonote-chart-service/secret-values.yaml
@@ -42,5 +42,4 @@ keycloak:
     secrets:
       stringData:
         KEYCLOAK_ADMIN_PASSWORD: secret
-        KC_DB_PASSWORD: "password1"
         OIDC_CLIENT_SECRET: "iS3jOA3Z7zXBwSN8EzJm36ybz57JNgpR"
diff --git a/yonote-chart-service/values.yaml b/yonote-chart-service/values.yaml
index ad7486d..8ac887f 100644
--- a/yonote-chart-service/values.yaml
+++ b/yonote-chart-service/values.yaml
@@ -613,15 +613,17 @@ keycloak:
 
   extraEnv: |
     - name: KEYCLOAK_ADMIN
-      valueFrom:
-        secretKeyRef:
-          name: {{ include "keycloak.fullname" . }}-admin-creds
-          key: user
+      value: root
     - name: KEYCLOAK_ADMIN_PASSWORD
       valueFrom:
         secretKeyRef:
-          name: {{ include "keycloak.fullname" . }}-admin-creds
-          key: password
+          name: {{ include "keycloak.fullname" . }}-secrets
+          key: KEYCLOAK_ADMIN_PASSWORD
+    - name: OIDC_CLIENT_SECRET
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "keycloak.fullname" . }}-secrets
+          key: OIDC_CLIENT_SECRET
     - name: BASENAME_FOR_SUBDOMAIN
       value: example.com
     - name: KC_HOSTNAME_STRICT