diff --git a/bitnami/solr/CHANGELOG.md b/bitnami/solr/CHANGELOG.md
index 928b8ede9d..4380cf5152 100644
--- a/bitnami/solr/CHANGELOG.md
+++ b/bitnami/solr/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 9.3.5 (2024-06-18)
+## 9.3.6 (2024-07-03)
 
-* [bitnami/solr] Release 9.3.5 ([#27417](https://github.com/bitnami/charts/pull/27417))
+* [bitnami/solr] Release 9.3.6 ([#27720](https://github.com/bitnami/charts/pull/27720))
+
+## <small>9.3.5 (2024-06-18)</small>
+
+* [bitnami/solr] Release 9.3.5 (#27417) ([5ea1326](https://github.com/bitnami/charts/commit/5ea13267930734b27e99bf62bc38c175b4daaa94)), closes [#27417](https://github.com/bitnami/charts/issues/27417)
 
 ## <small>9.3.4 (2024-06-17)</small>
 
diff --git a/bitnami/solr/Chart.lock b/bitnami/solr/Chart.lock
index 9a049ef47e..33d3852961 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.4.4
+  version: 13.4.5
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 2.20.3
-digest: sha256:aede10f2b1dbd02435897f1acf653cb9232331341226c946aceaaa3a1404465c
-generated: "2024-06-18T12:16:00.476502474Z"
+digest: sha256:ca9323cb0cc1e1debc924410ac72dd82b15fe2fb02511ff4198583d42dc383de
+generated: "2024-07-03T07:22:34.339307819Z"
diff --git a/bitnami/solr/Chart.yaml b/bitnami/solr/Chart.yaml
index 99794a7ce5..ed4dd29628 100644
--- a/bitnami/solr/Chart.yaml
+++ b/bitnami/solr/Chart.yaml
@@ -6,9 +6,9 @@ annotations:
   licenses: Apache-2.0
   images: |
     - name: os-shell
-      image: docker.io/bitnami/os-shell:12-debian-12-r22
+      image: docker.io/bitnami/os-shell:12-debian-12-r24
     - name: solr
-      image: docker.io/bitnami/solr:9.6.1-debian-12-r0
+      image: docker.io/bitnami/solr:9.6.1-debian-12-r2
 apiVersion: v2
 appVersion: 9.6.1
 dependencies:
@@ -34,4 +34,4 @@ maintainers:
 name: solr
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/solr
-version: 9.3.5
+version: 9.3.6
diff --git a/bitnami/solr/values.yaml b/bitnami/solr/values.yaml
index 73ecd86ed1..f9e7c6438c 100644
--- a/bitnami/solr/values.yaml
+++ b/bitnami/solr/values.yaml
@@ -82,7 +82,7 @@ diagnosticMode:
 image:
   registry: docker.io
   repository: bitnami/solr
-  tag: 9.6.1-debian-12-r0
+  tag: 9.6.1-debian-12-r2
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -698,7 +698,7 @@ volumePermissions:
   image:
     registry: docker.io
     repository: bitnami/os-shell
-    tag: 12-debian-12-r22
+    tag: 12-debian-12-r24
     digest: ""
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.