diff --git a/bitnami/keycloak/CHANGELOG.md b/bitnami/keycloak/CHANGELOG.md
index 09a951118d2559..d7ab08a9c49b5b 100644
--- a/bitnami/keycloak/CHANGELOG.md
+++ b/bitnami/keycloak/CHANGELOG.md
@@ -1,12 +1,16 @@
 # Changelog
 
-## 25.2.5 (2025-10-09)
+## 25.2.6 (2025-10-16)
 
-* [bitnami/keycloak] Fix: Rename duplicated secret labels ([#36254](https://github.com/bitnami/charts/pull/36254))
+* change hostname settings ([#36340](https://github.com/bitnami/charts/pull/36340))
 
-## <small>25.2.4 (2025-09-23)</small>
+## <small>25.2.5 (2025-10-08)</small>
 
-* [bitnami/keycloak] Fix indentation in ingress TLS secret template ([#36282](https://github.com/bitnami/charts/pull/36282))
+* [bitnami/keycloak] Fix: Rename duplicated secret labels (#36254) ([9b3915b](https://github.com/bitnami/charts/commit/9b3915b649a9b08fbfad1fa82cc24e48232edd36)), closes [#36254](https://github.com/bitnami/charts/issues/36254)
+
+## <small>25.2.4 (2025-10-02)</small>
+
+* [bitnami/keycloak] Fix indentation in ingress TLS secret template (#36282) ([3f7fa45](https://github.com/bitnami/charts/commit/3f7fa45393366ca67af940efa64acfab89c05e75)), closes [#36282](https://github.com/bitnami/charts/issues/36282)
 
 ## <small>25.2.3 (2025-09-11)</small>
 
diff --git a/bitnami/keycloak/Chart.yaml b/bitnami/keycloak/Chart.yaml
index 077e198d3f7ce3..ba65297aea73e1 100644
--- a/bitnami/keycloak/Chart.yaml
+++ b/bitnami/keycloak/Chart.yaml
@@ -35,4 +35,4 @@ maintainers:
 name: keycloak
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/keycloak
-version: 25.2.5
+version: 25.2.6
diff --git a/bitnami/keycloak/templates/configmap-env-vars.yaml b/bitnami/keycloak/templates/configmap-env-vars.yaml
index b6633812d14789..ea79c9791204b7 100644
--- a/bitnami/keycloak/templates/configmap-env-vars.yaml
+++ b/bitnami/keycloak/templates/configmap-env-vars.yaml
@@ -31,7 +31,7 @@ data:
   {{- end }}
   {{- if .Values.ingress.enabled }}
   KC_HOSTNAME_STRICT: {{ ternary "true" "false" .Values.hostnameStrict | quote }}
-{{- if .Values.ingress.hostname }}
+{{- if and .Values.ingress.hostname (eq .Values.hostnameStrict true) }}
   {{- $path := tpl .Values.ingress.path . }}
   {{- if and (eq .Values.ingress.controller "gce") (hasSuffix "*" $path) }}
     {{- $path = trimSuffix "*" $path }}