diff --git a/keycloak/main.yaml b/keycloak/main.yaml
index 23fc674..e789876 100644
--- a/keycloak/main.yaml
+++ b/keycloak/main.yaml
@@ -56,22 +56,6 @@ metadata:
   namespace: keycloak
 ---
 apiVersion: v1
-data:
-  admin-password: bUpoNExmSGVYNg==
-kind: Secret
-metadata:
-  labels:
-    app.kubernetes.io/component: keycloak
-    app.kubernetes.io/instance: keycloak
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 26.2.5
-    helm.sh/chart: keycloak-24.7.3
-  name: keycloak
-  namespace: keycloak
-type: Opaque
----
-apiVersion: v1
 kind: Service
 metadata:
   labels:
@@ -199,7 +183,6 @@ spec:
     metadata:
       annotations:
         checksum/configmap-env-vars: 7ed8e56f444615469aa0ea38e604cc7c913c1dd874dcfc7e5dac178b777f2633
-        checksum/secrets: b428291160dc82579b5eda80498f0ba89b4f09a208dc79f651436cd046dee6d7
       labels:
         app.kubernetes.io/app-version: 26.2.5
         app.kubernetes.io/component: keycloak
diff --git a/keycloak/src/values.yaml b/keycloak/src/values.yaml
index 1a44fb3..c0676cc 100644
--- a/keycloak/src/values.yaml
+++ b/keycloak/src/values.yaml
@@ -140,10 +140,10 @@ auth:
   adminPassword: ""
   ## @param auth.existingSecret Existing secret containing Keycloak admin password
   ##
-  existingSecret: ""
+  existingSecret: keycloak
   ## @param auth.passwordSecretKey Key where the Keycloak admin password is being stored inside the existing secret.
   ##
-  passwordSecretKey: ""
+  passwordSecretKey: admin-password
   ## @param auth.annotations Additional custom annotations for Keycloak auth secret object
   ##
   annotations: {}
@@ -1346,9 +1346,9 @@ postgresql:
     database: keycloak
     existingSecret: keycloak
     secretKeys:
-      adminPasswordKey: postgres-password
+      postgres-password: postgres-password
       userPasswordKey: db-pass
-      replicationPasswordKey: postgres-repl-pass
+      #replicationPasswordKey: postgres-repl-pass
   architecture: standalone
   primary:
     persistence: