diff --git a/keycloak-values.yaml.tmpl b/keycloak-values.yaml.tmpl
index 98f361a..8c4ebe2 100644
--- a/keycloak-values.yaml.tmpl
+++ b/keycloak-values.yaml.tmpl
@@ -23,7 +23,6 @@ autoscaling:
 
 pdb:
   minAvailable: 1
-  maxUnavailable: "25%"
 
 resources:
   requests:
@@ -55,12 +54,6 @@ postgresql:
     database: ${keycloak_database}
     existingSecret: ${keycloak_existing_secret}
 
-extraEnvVars:
-  - name: PROXY_ADDRESS_FORWARDING
-    value: "true"
-  - name: KC_CONFIG_FILE
-    value: "/opt/bitnami/keycloak/kcadm.config"
-
 metrics:
   enabled: true
 
@@ -73,3 +66,7 @@ extraEnv: |
     value: "3"
   - name: CACHE_OWNERS_AUTH_SESSIONS_COUNT
     value: "3"
+  - name: PROXY_ADDRESS_FORWARDING
+    value: "true"
+  - name: KC_CONFIG_FILE
+    value: "/opt/bitnami/keycloak/kcadm.config"