diff --git a/class/defaults.yml b/class/defaults.yml
index cfff21a3..b65f4fb0 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -201,7 +201,6 @@ parameters:
           value: >-
                     -XX:MaxRAMPercentage=50.0
                     -Djava.net.preferIPv4Stack=true
-                    -Djava.awt.headless=true
                     -Djgroups.dns.query={{ include "keycloak.fullname" . }}-headless
                     ${keycloak:extraJavaOpts}
         - name: KC_HOSTNAME
diff --git a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
index 9dab0b71..26aadfbf 100644
--- a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
+++ b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
@@ -61,8 +61,7 @@ spec:
             - name: FOO
               value: bar
             - name: JAVA_OPTS
-              value: -XX:MaxRAMPercentage=50.0 -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true
-                -Djgroups.dns.query=keycloakx-headless
+              value: -XX:MaxRAMPercentage=50.0 -Djava.net.preferIPv4Stack=true -Djgroups.dns.query=keycloakx-headless
             - name: KC_CACHE
               value: ispn
             - name: KC_CACHE_STACK
diff --git a/tests/golden/external/external/external/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml b/tests/golden/external/external/external/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
index caae9976..65d15608 100644
--- a/tests/golden/external/external/external/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
+++ b/tests/golden/external/external/external/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
@@ -59,8 +59,7 @@ spec:
             - --http-enabled=true
           env:
             - name: JAVA_OPTS
-              value: -XX:MaxRAMPercentage=50.0 -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true
-                -Djgroups.dns.query=keycloakx-headless
+              value: -XX:MaxRAMPercentage=50.0 -Djava.net.preferIPv4Stack=true -Djgroups.dns.query=keycloakx-headless
             - name: KC_CACHE
               value: ispn
             - name: KC_CACHE_STACK
diff --git a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
index c9cf7896..2c97a1ae 100644
--- a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
+++ b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
@@ -59,8 +59,7 @@ spec:
             - --http-enabled=true
           env:
             - name: JAVA_OPTS
-              value: -XX:MaxRAMPercentage=50.0 -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true
-                -Djgroups.dns.query=keycloakx-headless
+              value: -XX:MaxRAMPercentage=50.0 -Djava.net.preferIPv4Stack=true -Djgroups.dns.query=keycloakx-headless
             - name: KC_CACHE
               value: ispn
             - name: KC_CACHE_STACK
diff --git a/tests/golden/openshift/openshift/openshift/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml b/tests/golden/openshift/openshift/openshift/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
index e11b2bd0..29eeecf1 100644
--- a/tests/golden/openshift/openshift/openshift/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
+++ b/tests/golden/openshift/openshift/openshift/01_keycloak_helmchart/keycloakx/templates/statefulset.yaml
@@ -59,8 +59,7 @@ spec:
             - --http-enabled=true
           env:
             - name: JAVA_OPTS
-              value: -XX:MaxRAMPercentage=50.0 -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true
-                -Djgroups.dns.query=keycloakx-headless
+              value: -XX:MaxRAMPercentage=50.0 -Djava.net.preferIPv4Stack=true -Djgroups.dns.query=keycloakx-headless
             - name: KC_CACHE
               value: ispn
             - name: KC_CACHE_STACK