diff --git a/values.yaml b/values.yaml
index 613e6f6..fb5cbb3 100644
--- a/values.yaml
+++ b/values.yaml
@@ -49,9 +49,10 @@ postgresql:
       enabled: false
       secretName: external-postgres-secret
       secretUserKey: postgres-username
-      secretPasswordKey: postgres-password  
-    postgresUser: "username"
-    postgresPassword: "password"
+      secretPasswordKey: postgres-password
+    # Don't use clear text credentials in production !!!
+    postgresUser: ""
+    postgresPassword: ""
 
 settings:
   secretKey: mysupesecretkey
@@ -75,16 +76,22 @@ settings:
     externalSecret:
       enabled: false
       emailSecretName: external-postgres-secret
-      emailSecretUserKey: email_user
-      emailSecretPasswordKey: email_password
+      emailSecretUserKey: email_user_key
+      emailSecretPasswordKey: email_password_key
+    # Don't use clear text credentials in production !!!
+    emailUser: ""
+    emailPassword: ""
   twilio:
     enabled: false
     twilioFromNumber: XXXXXXXXX
-    twilioSecretName: ""
-    twilioSecretAccountSid: ""
-    twilioSecretAccountToken: ""
-    remoteAccountSidRef: ""
-    remoteAccountTokenRef: ""
+    externalSecret:
+      enabled: false
+      twilioSecretName: ""
+      twilioSecretAccountSid: ""
+      twilioSecretAccountToken: ""
+    # Don't use clear text credentials in production !!!
+    twilioAccountSid: ""
+    twilioAccountToken: ""
 
 labels:
   application: chiefonboarding