diff --git a/charts/keycloakx/README.md b/charts/keycloakx/README.md
index 7ce38219..7a9d8a6c 100644
--- a/charts/keycloakx/README.md
+++ b/charts/keycloakx/README.md
@@ -267,7 +267,6 @@ This allows you to only configure memory using Kubernetes resources and the JVM
 extraEnv: |
   - name: JAVA_OPTS
     value: >-
-      -XX:+UseContainerSupport
       -XX:MaxRAMPercentage=50.0
       -Djava.awt.headless=true
 ```
@@ -276,6 +275,8 @@ Alternatively one can append custom JVM options by setting the `JAVA_OPTS_APPEND
 
 The parameter `-Djava.net.preferIPv4Stack=true` is [optional](https://github.com/keycloak/keycloak/commit/ee205c8fbc1846f679bd604fa8d25310c117c87e) for [Keycloak >= v22](https://www.keycloak.org/server/configuration-production#_configure_keycloak_server_with_ipv4_or_ipv6).
 
+The parameter `-XX:+UseContainerSupport` is no longer required for [Keycloak >= v21 based on JDK v17](https://github.com/keycloak/keycloak/blob/release/21.0/quarkus/container/Dockerfile#L20).
+
 #### Using an External Database
 
 The Keycloak Docker image supports various database types.
diff --git a/charts/keycloakx/ci/h2-values.yaml b/charts/keycloakx/ci/h2-values.yaml
index ee8e1d04..6c9a4420 100644
--- a/charts/keycloakx/ci/h2-values.yaml
+++ b/charts/keycloakx/ci/h2-values.yaml
@@ -17,7 +17,6 @@ extraEnv: |
         key: password
   - name: JAVA_OPTS_APPEND
     value: >-
-      -XX:+UseContainerSupport
       -XX:MaxRAMPercentage=50.0
       -Djava.awt.headless=true
       -Djgroups.dns.query={{ include "keycloak.fullname" . }}-headless
diff --git a/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml b/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml
index 2c975ed9..01f8c90f 100644
--- a/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml
+++ b/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml
@@ -35,7 +35,6 @@ extraEnv: |
         key: password
   - name: JAVA_OPTS_APPEND
     value: >-
-      -XX:+UseContainerSupport
       -XX:MaxRAMPercentage=50.0
       -Djava.awt.headless=true
       -Dkubeping_namespace={{ .Release.Namespace }}
diff --git a/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml b/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
index 678e19d2..48a5f91f 100644
--- a/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
+++ b/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
@@ -23,7 +23,6 @@ extraEnv: |
         key: password
   - name: JAVA_OPTS_APPEND
     value: >-
-      -XX:+UseContainerSupport
       -XX:MaxRAMPercentage=50.0
       -Djava.awt.headless=true
       -Djgroups.dns.query={{ include "keycloak.fullname" . }}-headless