diff --git a/bitnami/solr/CHANGELOG.md b/bitnami/solr/CHANGELOG.md
index 288eb79d20..b03e432e43 100644
--- a/bitnami/solr/CHANGELOG.md
+++ b/bitnami/solr/CHANGELOG.md
@@ -1,8 +1,13 @@
 # Changelog
 
-## 9.6.2 (2025-05-05)
+## 9.6.3 (2025-05-07)
 
-* [bitnami/solr] Add persistentvolumeclaim retention on solr statefulset ([#33310](https://github.com/bitnami/charts/pull/33310))
+* [bitnami/solr] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33435](https://github.com/bitnami/charts/pull/33435))
+
+## <small>9.6.2 (2025-05-07)</small>
+
+* [bitnami/solr] Add persistentvolumeclaim retention on solr statefulset (#33310) ([34ee22f](https://github.com/bitnami/charts/commit/34ee22fa3bc6d59cb3969a76d7655515e8969049)), closes [#33310](https://github.com/bitnami/charts/issues/33310)
+* Fix typo mentioning Geode in Solr and Zookeeper (#32987) ([9dd4289](https://github.com/bitnami/charts/commit/9dd42891c2c9f5ed339e5dbc1506a13f29e0d45c)), closes [#32987](https://github.com/bitnami/charts/issues/32987)
 
 ## <small>9.6.1 (2025-04-09)</small>
 
diff --git a/bitnami/solr/Chart.lock b/bitnami/solr/Chart.lock
index d27971ea81..9449dba7f4 100644
--- a/bitnami/solr/Chart.lock
+++ b/bitnami/solr/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: zookeeper
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 13.8.0
+  version: 13.8.1
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.30.0
-digest: sha256:49aec6b7684a03243b316afc44c3b16844f049a0b9ab75142b05976f056cca2f
-generated: "2025-04-09T11:38:07.625185606Z"
+  version: 2.31.0
+digest: sha256:f624298818dc1dbc4fac2b047b5b7d81591426a03d6a8bb9cea9e8eafec43862
+generated: "2025-05-06T11:04:49.53069139+02:00"
diff --git a/bitnami/solr/Chart.yaml b/bitnami/solr/Chart.yaml
index 8fbb10fe98..bee32d890e 100644
--- a/bitnami/solr/Chart.yaml
+++ b/bitnami/solr/Chart.yaml
@@ -35,4 +35,4 @@ maintainers:
 name: solr
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/solr
-version: 9.6.2
+version: 9.6.3
diff --git a/bitnami/solr/templates/ingress.yaml b/bitnami/solr/templates/ingress.yaml
index f5269be805..22a3d73cb9 100644
--- a/bitnami/solr/templates/ingress.yaml
+++ b/bitnami/solr/templates/ingress.yaml
@@ -15,7 +15,7 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
-  {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
+  {{- if .Values.ingress.ingressClassName }}
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   {{- end }}
   rules:
@@ -27,9 +27,7 @@ spec:
           {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraPaths "context" $) | nindent 10 }}
           {{- end }}
           - path: {{ tpl .Values.ingress.path . }}
-            {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
             pathType: {{ .Values.ingress.pathType }}
-            {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "tcp-client" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
@@ -37,9 +35,7 @@ spec:
       http:
         paths:
           - path: {{ default "/" (tpl .path $) }}
-            {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
-            {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "tcp-client" "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.ingress.extraRules }}