diff --git a/stable/artifactory-cpp-ce/CHANGELOG.md b/stable/artifactory-cpp-ce/CHANGELOG.md
index 13c5c1b53..a43c57be4 100644
--- a/stable/artifactory-cpp-ce/CHANGELOG.md
+++ b/stable/artifactory-cpp-ce/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory CE for C++ Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.98.7] - Feb 20, 2024
+## [107.98.9] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024
diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
index f44ea5414..e64b6af87 100644
--- a/stable/artifactory-cpp-ce/Chart.yaml
+++ b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.98.7
+  version: 107.98.9
 description: JFrog Artifactory CE for C++
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-cpp-ce/logo/conan.png
@@ -21,4 +21,4 @@ name: artifactory-cpp-ce
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.98.7
+version: 107.98.9
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
index 0f22a72f7..58f97bbd1 100644
--- a/stable/artifactory-ha/CHANGELOG.md
+++ b/stable/artifactory-ha/CHANGELOG.md
@@ -1,12 +1,14 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.98.7] - Oct 02, 2024
+## [107.98.9] - Nov 06, 2024
 * Add support for `extraEnvironmentVariables` on filebeat Sidecar [GH-1377](https://github.com/jfrog/charts/pull/1377)
 * Support for SSL offload HTTPS proto override in Nginx service (ClusterIP, LoadBalancer) layer. Introduced `nginx.service.ssloffloadForceHttps` field with boolean type. [GH-1906](https://github.com/jfrog/charts/pull/1906)
 * Enable Access workers integration when artifactory.worker.enabled is true
 * Added `signedUrlExpirySeconds` option to artifactory.persistence.type of `google-storage`, `google-storage-v2`, and `google-storage-v2-direct` [GH-1858](https://github.com/jfrog/charts/pull/1858)
 * Added support to bootstrap jfconnect custom certs to jfconnect trusted directory
+* Added fix for database credentials secret in non-unified secret installations
+* Fixed the type of `.Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds` in binarystore.xml from boolean to integer
 
 ## [107.96.0] - Sep 18, 2024
 * Merged Artifactory sizing templates to a single file per size
@@ -29,7 +31,7 @@ All changes to this chart will be documented in this file
 ## [107.91.0] - July 18, 2024
 * Remove X-JFrog-Override-Base-Url port when using default `443/80` ports
 
-## [107.90.15] - July 18, 2024
+## [107.90.0] - July 18, 2024
 * Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
 * Added new `nginx.hosts` to use Nginx server_name directive instead of `ingress.hosts`
 * Added a deprecation notice of ingress.hosts when `ngnix.enabled` is true
diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
index 2511a8e6c..14cf4f9a4 100644
--- a/stable/artifactory-ha/Chart.yaml
+++ b/stable/artifactory-ha/Chart.yaml
@@ -1,9 +1,9 @@
 annotations:
-  artifactoryServiceVersion: 7.98.6
-  metadataVersion: 7.90.0
+  artifactoryServiceVersion: 7.98.10
+  metadataVersion: 7.90.4
   observabilityVersion: 1.31.5
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -25,4 +25,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.98.7
+version: 107.98.9
diff --git a/stable/artifactory-ha/files/binarystore.xml b/stable/artifactory-ha/files/binarystore.xml
index fca04f08a..d807bf2e4 100644
--- a/stable/artifactory-ha/files/binarystore.xml
+++ b/stable/artifactory-ha/files/binarystore.xml
@@ -199,9 +199,7 @@
         <path>{{ .Values.artifactory.persistence.googleStorage.path }}</path>
         <bucketExists>{{ .Values.artifactory.persistence.googleStorage.bucketExists }}</bucketExists>
         {{- if .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds }}
-        <signedUrlExpirySeconds>true</signedUrlExpirySeconds>
-        {{- else }}
-        <signedUrlExpirySeconds>false</signedUrlExpirySeconds>
+        <signedUrlExpirySeconds>{{ .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds | int64 }}</signedUrlExpirySeconds>
         {{- end }}
     </provider>
 </config>
diff --git a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
index 7d2f583a8..d8e69a238 100644
--- a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
+++ b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
@@ -542,7 +542,7 @@ spec:
               key: {{ tpl .Values.database.secrets.user.key . }}
         {{- else if .Values.database.user }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
@@ -558,7 +558,7 @@ spec:
               key: {{ tpl .Values.database.secrets.password.key . }}
         {{- else if .Values.database.password }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
@@ -577,7 +577,7 @@ spec:
               key: {{ tpl .Values.database.secrets.url.key . }}
         {{- else if .Values.database.url }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
diff --git a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
index 8da5de94c..57c44bd22 100644
--- a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
+++ b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
@@ -674,7 +674,7 @@ spec:
               key: {{ tpl .Values.database.secrets.user.key . }}
         {{- else if .Values.database.user }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
@@ -690,7 +690,7 @@ spec:
               key: {{ tpl .Values.database.secrets.password.key . }}
         {{- else if .Values.database.password }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
@@ -709,7 +709,7 @@ spec:
               key: {{ tpl .Values.database.secrets.url.key . }}
         {{- else if .Values.database.url }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
index c6dbec234..e702ed1d0 100644
--- a/stable/artifactory-ha/values.yaml
+++ b/stable/artifactory-ha/values.yaml
@@ -880,7 +880,7 @@ artifactory:
       bucketExists: false
       useInstanceCredentials: false
       enableSignedUrlRedirect: false
-      # signedUrlExpirySeconds: false
+      # signedUrlExpirySeconds: 30
     ## For artifactory.persistence.type aws-s3-v3, s3-storage-v3-direct, s3-storage-v3-archive
     awsS3V3:
       testConnection: false
diff --git a/stable/artifactory-jcr/CHANGELOG.md b/stable/artifactory-jcr/CHANGELOG.md
index 9d3a2d71d..5531fe037 100644
--- a/stable/artifactory-jcr/CHANGELOG.md
+++ b/stable/artifactory-jcr/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Container Registry Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.98.7] - Feb 20, 2024
+## [107.98.9] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024
diff --git a/stable/artifactory-jcr/Chart.yaml b/stable/artifactory-jcr/Chart.yaml
index 9427485f6..562854965 100644
--- a/stable/artifactory-jcr/Chart.yaml
+++ b/stable/artifactory-jcr/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.98.7
+  version: 107.98.9
 description: JFrog Container Registry
 home: https://jfrog.com/container-registry/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-jcr/logo/jcr-logo.png
@@ -22,4 +22,4 @@ name: artifactory-jcr
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.98.7
+version: 107.98.9
diff --git a/stable/artifactory-oss/CHANGELOG.md b/stable/artifactory-oss/CHANGELOG.md
index 6bc5fbddc..ef742e01c 100644
--- a/stable/artifactory-oss/CHANGELOG.md
+++ b/stable/artifactory-oss/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory OSS Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.98.7] - Feb 20, 2024
+## [107.98.9] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024
diff --git a/stable/artifactory-oss/Chart.yaml b/stable/artifactory-oss/Chart.yaml
index 1807a0f05..dee351989 100644
--- a/stable/artifactory-oss/Chart.yaml
+++ b/stable/artifactory-oss/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.98.7
+  version: 107.98.9
 description: JFrog Artifactory OSS
 home: https://www.jfrog.com/artifactory/
 icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory/logo/artifactory-logo.png
@@ -20,4 +20,4 @@ name: artifactory-oss
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.98.7
+version: 107.98.9
diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
index b7aaca364..ded52aaec 100644
--- a/stable/artifactory/CHANGELOG.md
+++ b/stable/artifactory/CHANGELOG.md
@@ -1,12 +1,13 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.98.7] - Oct 02, 2024
+## [107.98.9] - Nov 06, 2024
 * Add support for `extraEnvironmentVariables` on filebeat Sidecar [GH-1377](https://github.com/jfrog/charts/pull/1377)
 * Support for SSL offload HTTPS proto override in Nginx service (ClusterIP, LoadBalancer) layer. Introduced `nginx.service.ssloffloadForceHttps` field with boolean type. [GH-1906](https://github.com/jfrog/charts/pull/1906)
 * Enable Access workers integration when artifactory.worker.enabled is true
 * Added `signedUrlExpirySeconds` option to artifactory.persistence.type of `google-storage`, `google-storage-v2`, and `google-storage-v2-direct` [GH-1858](https://github.com/jfrog/charts/pull/1858)
 * Added support to bootstrap jfconnect custom certs to jfconnect trusted directory
+* Fixed the type of `.Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds` in binarystore.xml from boolean to integer
 
 ## [107.96.0] - Sep 10, 2024
 * Merged Artifactory sizing templates to a single file per size
@@ -25,7 +26,7 @@ All changes to this chart will be documented in this file.
 ## [107.91.0] - July 18, 2024
 * Remove X-JFrog-Override-Base-Url port when using default `443/80` ports
 
-## [107.90.15] - July 18, 2024
+## [107.90.0] - July 18, 2024
 * Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
 * Added new `nginx.hosts` to use Nginx server_name directive instead of `ingress.hosts`
 * Added a deprecation notice of ingress.hosts when `ngnix.enabled` is true
diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
index 7ba8a6f1e..cdef1dc77 100644
--- a/stable/artifactory/Chart.yaml
+++ b/stable/artifactory/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.98.7
+version: 107.98.9
diff --git a/stable/artifactory/files/binarystore.xml b/stable/artifactory/files/binarystore.xml
index b02ac8ad5..8d71072e2 100644
--- a/stable/artifactory/files/binarystore.xml
+++ b/stable/artifactory/files/binarystore.xml
@@ -180,9 +180,7 @@
         <path>{{ .Values.artifactory.persistence.googleStorage.path }}</path>
         <bucketExists>{{ .Values.artifactory.persistence.googleStorage.bucketExists }}</bucketExists>
         {{- if .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds }}
-        <signedUrlExpirySeconds>true</signedUrlExpirySeconds>
-        {{- else }}
-        <signedUrlExpirySeconds>false</signedUrlExpirySeconds>
+        <signedUrlExpirySeconds>{{ .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds | int64 }}</signedUrlExpirySeconds>
         {{- end }}
     </provider>
 </config>
diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
index 98817a91c..5fe8e0e1f 100644
--- a/stable/artifactory/values.yaml
+++ b/stable/artifactory/values.yaml
@@ -867,7 +867,7 @@ artifactory:
       bucketExists: false
       useInstanceCredentials: false
       enableSignedUrlRedirect: false
-      # signedUrlExpirySeconds: false
+      # signedUrlExpirySeconds: 30
     ## For artifactory.persistence.type aws-s3-v3, s3-storage-v3-direct, cluster-s3-storage-v3, s3-storage-v3-archive
     awsS3V3:
       testConnection: false
diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md
index f9def9ece..e7bfe0674 100644
--- a/stable/jfrog-platform/CHANGELOG.md
+++ b/stable/jfrog-platform/CHANGELOG.md
@@ -1,6 +1,12 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
+## [10.20.1] - Nov 25, 2024
+* Fix jfrog url with duplicate artifactory string when release name has artifactory
+* Updated kubectl image to version `1.31.2`
+* Update dependency artifactory chart version to 107.98.9
+* Update dependency xray chart version to 103.107.11
+
 ## [10.20.0] - Oct 29, 2024
 * **IMPORTANT**
 * Added new dependency chart `worker` which is disabled by default and set `worker.enabled: true` to enable it. More info [here](https://jfrog.com/help/r/jfrog-installation-setup-documentation/installing-jfrog-worker)
diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock
index 67d2c4161..8c5acddea 100644
--- a/stable/jfrog-platform/Chart.lock
+++ b/stable/jfrog-platform/Chart.lock
@@ -7,10 +7,10 @@ dependencies:
   version: 11.9.3
 - name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.98.7
+  version: 107.98.9
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.104.18
+  version: 103.107.11
 - name: distribution
   repository: https://charts.jfrog.io/
   version: 102.27.2
@@ -23,5 +23,5 @@ dependencies:
 - name: worker
   repository: https://charts.jfrog.io/
   version: 101.95.1
-digest: sha256:2fb3be33472a516a0de2dc53a2cf93bd5d93a504f866c811749b7081780c7c6a
-generated: "2024-10-30T07:32:40.338187+05:30"
+digest: sha256:602c005909577fd36db25644f96b3895de318f1df5e4e3071e9a5cd777034c76
+generated: "2024-11-26T07:09:43.088388+05:30"
diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml
index a16262dd1..f8f447445 100644
--- a/stable/jfrog-platform/Chart.yaml
+++ b/stable/jfrog-platform/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -12,11 +12,11 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.98.7
+  version: 107.98.9
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.104.18
+  version: 103.107.11
 - condition: distribution.enabled
   name: distribution
   repository: https://charts.jfrog.io/
@@ -55,4 +55,4 @@ name: jfrog-platform
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 10.20.0
+version: 10.20.1
diff --git a/stable/jfrog-platform/templates/_helpers.tpl b/stable/jfrog-platform/templates/_helpers.tpl
index 2ae2ad3f0..29e40ea9c 100644
--- a/stable/jfrog-platform/templates/_helpers.tpl
+++ b/stable/jfrog-platform/templates/_helpers.tpl
@@ -6,6 +6,19 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Handle uscases where the release name contains artifactory as part of it
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "jfrog-platform.artifactory.fullname" -}}
+{{- $name := "artifactory" -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -269,7 +282,7 @@ Define database name
 Resolve jfrog url
 */}}
 {{- define "jfrog-platform.jfrogUrl" -}}
-{{- printf "http://%s-artifactory:8082" .Release.Name -}}
+{{- printf "http://%s:8082" (include "jfrog-platform.artifactory.fullname" .) -}}
 {{- end -}}
 
 {{/*
diff --git a/stable/jfrog-platform/templates/upgrade-hook.yaml b/stable/jfrog-platform/templates/upgrade-hook.yaml
index aab5080f2..b2d7cb150 100644
--- a/stable/jfrog-platform/templates/upgrade-hook.yaml
+++ b/stable/jfrog-platform/templates/upgrade-hook.yaml
@@ -145,8 +145,8 @@ spec:
                 {{- end }}
 
                 {{- if not .Values.artifactory.mc.enabled }}
-                    systemYamlUnifiedSecret={{ .Release.Name }}-artifactory-unified-secret
-                    systemYamlSecret={{ .Release.Name }}-artifactory-systemyaml
+                    systemYamlUnifiedSecret={{ include "jfrog-platform.artifactory.fullname" . }}-unified-secret
+                    systemYamlSecret={{ include "jfrog-platform.artifactory.fullname" . }}-systemyaml
                     systemYamlEncoded=$(kubectl get secrets "$systemYamlUnifiedSecret" -o jsonpath="{.data.system\.yaml}")
                     if [ $? -ne 0 ]; then
                       systemYamlEncoded=$(kubectl get secrets "$systemYamlSecret" -o jsonpath="{.data.system\.yaml}")
diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml
index 7331bf9da..58a47a5c9 100644
--- a/stable/jfrog-platform/values.yaml
+++ b/stable/jfrog-platform/values.yaml
@@ -191,7 +191,7 @@ rabbitmq:
     image:
       registry: "{{ .Values.global.imageRegistry }}"
       repository: bitnami/kubectl
-      tag: 1.24.12
+      tag: 1.31.2
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -232,7 +232,7 @@ rabbitmq:
 artifactory:
   enabled: true
   unifiedUpgradeAllowed: true
-  installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.20.0-%s" .Chart.AppVersion  }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}'
+  installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.20.1-%s" .Chart.AppVersion  }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}'
   postgresql:
     enabled: false
   waitForDatabase: false
@@ -361,7 +361,7 @@ preUpgradeHook:
   image:
     registry: "{{ .Values.global.imageRegistry }}"
     repository: bitnami/kubectl
-    tag: 1.24.12
+    tag: 1.31.2
     pullPolicy: IfNotPresent
   resources:
     requests:
diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md
index a35b93863..7bc16624c 100644
--- a/stable/xray/CHANGELOG.md
+++ b/stable/xray/CHANGELOG.md
@@ -1,7 +1,14 @@
 # JFrog Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [103.104.18] - July 17, 2024
+## [103.107.11] - September 26, 2024
+* Added support to read rabbitmq and database secrets from mounted secret files
+
+## [103.105.0] - August 22, 2024
+* Added support for `serviceAccount.annotations`to be passed to chart [GH-1841](https://github.com/jfrog/charts/pull/1841)
+* Updated rabbitmq multi-arch tag version to to `3.13.6-debian-12-r1`
+
+## [103.102.0] - July 17, 2024
 * Added support of specifying resources constraints for RabbitMQ's pre-upgrade-hook job
 * Fixed formatting error associated to the `volumeMounts` for the `panoramic` microservice [GH-1895](https://github.com/jfrog/charts/issues/1895)
 
diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml
index 5c9269029..7a5ea04c2 100644
--- a/stable/xray/Chart.yaml
+++ b/stable/xray/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.104.18
+appVersion: 3.107.11
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -24,4 +24,4 @@ name: xray
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 103.104.18
+version: 103.107.11
diff --git a/stable/xray/files/system.yaml b/stable/xray/files/system.yaml
index c11372548..b7c16140d 100644
--- a/stable/xray/files/system.yaml
+++ b/stable/xray/files/system.yaml
@@ -82,4 +82,9 @@ contextualAnalysis:
 exposures:
   container:
     registry: {{ include "xray.getRegistryByService" (list . "exposures") }}
-    image: {{ .Values.exposures.image.repository }}
\ No newline at end of file
+    image: {{ .Values.exposures.image.repository }}
+{{- if .Values.jas.healthcheck.enabled }}
+jas:
+  healthCheckApi:
+    enabled: true
+{{- end }}
\ No newline at end of file
diff --git a/stable/xray/templates/_helpers.tpl b/stable/xray/templates/_helpers.tpl
index 3b4ae9023..1b2e7affb 100644
--- a/stable/xray/templates/_helpers.tpl
+++ b/stable/xray/templates/_helpers.tpl
@@ -693,6 +693,26 @@ Set xray env variables if rabbitmq.tls is enabled.
 {{- end }}
 {{- end -}}
 
+{{- define "xray.resolveUsedMasterKeySecretName" -}}
+{{- if or .Values.xray.masterKey .Values.xray.masterKeySecretName .Values.global.masterKey .Values.global.masterKeySecretName -}}
+{{- if or (not .Values.xray.unifiedSecretInstallation) (or .Values.xray.masterKeySecretName .Values.global.masterKeySecretName) -}}
+{{- include "xray.masterKeySecretName" . -}}
+{{- else -}}
+{{ template "xray.name" . }}-unified-secret
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "xray.resolveUsedJoinKeySecretName" -}}
+{{- if or .Values.xray.joinKey .Values.xray.joinKeySecretName .Values.global.joinKey .Values.global.joinKeySecretName -}}
+{{- if or (not .Values.xray.unifiedSecretInstallation) (or .Values.xray.joinKeySecretName .Values.global.joinKeySecretName) -}}
+{{- include "xray.joinKeySecretName" . -}}
+{{- else -}}
+{{ template "xray.name" . }}-unified-secret
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "xray.envVariables" }}
 - name: XRAY_CHART_FULL_NAME
   value: '{{ include "xray.fullname" . }}'
@@ -704,6 +724,10 @@ Set xray env variables if rabbitmq.tls is enabled.
   value: "{{ .Values.systemYamlOverride.existingSecret }}"
 - name: XRAY_CHART_SYSTEM_YAML_OVERRIDE_DATA_KEY
   value: "{{ .Values.systemYamlOverride.dataKey }}"
+- name: XRAY_CHART_MASTER_KEY_SECRET_NAME
+  value: '{{ include "xray.resolveUsedMasterKeySecretName" . }}'
+- name: XRAY_CHART_JOIN_KEY_SECRET_NAME
+  value: '{{ include "xray.resolveUsedJoinKeySecretName" . }}'
 {{- end }}
 
 {{/*
diff --git a/stable/xray/templates/migration-hook.yaml b/stable/xray/templates/migration-hook.yaml
index 908fd71a0..3f4eab618 100644
--- a/stable/xray/templates/migration-hook.yaml
+++ b/stable/xray/templates/migration-hook.yaml
@@ -16,6 +16,9 @@ metadata:
     annotations:
         helm.sh/hook: "pre-upgrade"
         helm.sh/hook-weight: "-10"
+{{- with .Values.rabbitmq.migration.serviceAccount.annotations }}
+{{ toYaml . | indent 8 }}
+{{- end }}
 automountServiceAccountToken: {{ .Values.rabbitmq.migration.serviceAccount.automountServiceAccountToken }}
 {{- end }}
 {{- end }}
diff --git a/stable/xray/templates/xray-ipa-deployment.yaml b/stable/xray/templates/xray-ipa-deployment.yaml
index 6e7439e9b..ecc6b6ece 100644
--- a/stable/xray/templates/xray-ipa-deployment.yaml
+++ b/stable/xray/templates/xray-ipa-deployment.yaml
@@ -136,6 +136,28 @@ spec:
           echo "Copy masterKey to {{ .Values.xray.persistence.mountPath }}/etc/security";
           mkdir -p {{ .Values.xray.persistence.mountPath }}/etc/security;
           echo ${XRAY_MASTER_KEY} > {{ .Values.xray.persistence.mountPath }}/etc/security/master.key;
+        {{- end }}
+          if set | grep -q "^XRAY_RABBITMQ_PASSWORD="; then
+          echo "Copy rabbitmq password to {{ .Values.xray.persistence.mountPath }}/etc/security";
+          mkdir -p {{ .Values.xray.persistence.mountPath }}/etc/security;
+          echo ${XRAY_RABBITMQ_PASSWORD} > {{ .Values.xray.persistence.mountPath }}/etc/security/rabbitmq.password;
+          else
+            if test -f "{{ .Values.xray.persistence.mountPath }}/etc/security/rabbitmq.password"; then
+            echo "XRAY_RABBITMQ_PASSWORD is not set, removing existing rabbitmq.password file.";
+            rm -f {{ .Values.xray.persistence.mountPath }}/etc/security/rabbitmq.password;
+            fi
+          fi
+        {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+          if set | grep -q "^XRAY_POSTGRES_PASSWORD="; then
+          echo "Copy postgres password to {{ .Values.xray.persistence.mountPath }}/etc/security";
+          mkdir -p {{ .Values.xray.persistence.mountPath }}/etc/security;
+          echo ${XRAY_POSTGRES_PASSWORD} > {{ .Values.xray.persistence.mountPath }}/etc/security/postgres.password;
+          else
+            if test -f "{{ .Values.xray.persistence.mountPath }}/etc/security/postgres.password"; then
+            echo "XRAY_POSTGRES_PASSWORD is not set, removing existing postgres.password file.";
+            rm -f {{ .Values.xray.persistence.mountPath }}/etc/security/postgres.password;
+            fi
+          fi
         {{- end }}
         env:
         {{- if or .Values.xray.joinKey .Values.xray.joinKeySecretName .Values.global.joinKey .Values.global.joinKeySecretName }}
@@ -160,6 +182,39 @@ spec:
               {{- end }}
               key: master-key
         {{- end }}
+        {{- if and .Values.rabbitmq.external.secrets (not .Values.common.rabbitmq.connectionConfigFromEnvironment) }}
+        - name: XRAY_RABBITMQ_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
+              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
+        {{- end }}
+        {{- if .Values.common.rabbitmq.connectionConfigFromEnvironment }}
+        - name: XRAY_RABBITMQ_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "rabbitmq.passwordSecretName" .}}
+              key: rabbitmq-password
+        {{- end }}
+        {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: XRAY_POSTGRES_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.xray.unifiedSecretInstallation }}
+              name: {{ template "xray.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "xray.name" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+        {{- end }}
         volumeMounts:
         - name: data-volume
           mountPath: {{ .Values.xray.persistence.mountPath | quote }}
@@ -437,11 +492,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -480,25 +530,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -520,11 +551,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_HA_NODE_ID
           valueFrom:
@@ -606,11 +632,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -649,25 +670,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -689,11 +691,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_HA_NODE_ID
           valueFrom:
@@ -776,11 +773,6 @@ spec:
               secretKeyRef:
                 name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
                 key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-          - name: JF_SHARED_RABBITMQ_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-                key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
           - name: JF_SHARED_RABBITMQ_URL
             valueFrom:
               secretKeyRef:
@@ -819,25 +811,6 @@ spec:
                 key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-          - name: JF_SHARED_DATABASE_PASSWORD
-            valueFrom:
-              secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-                name: {{ tpl .Values.database.secrets.password.name . }}
-                key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-                name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-                name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-                key: db-password
-        {{- else if .Values.postgresql.enabled }}
-                name: {{ .Release.Name }}-postgresql
-                key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
           - name: JF_SHARED_DATABASE_URL
             valueFrom:
@@ -859,11 +832,6 @@ spec:
             value: {{ include "rabbitmq.user" .}}
           - name: JF_SHARED_RABBITMQ_URL
             value: {{ include "rabbitmq.url" .}}
-          - name: JF_SHARED_RABBITMQ_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ include "rabbitmq.passwordSecretName" .}}
-                key: rabbitmq-password
       {{- end }}
           - name: XRAY_HA_NODE_ID
             valueFrom:
@@ -946,11 +914,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -989,25 +952,6 @@ spec:
               key: db-actualUsername
       {{- end }}
     {{- end }}
-    {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-      {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-      {{- else if .Values.database.password }}
-            {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-            {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-            {{- end }}
-              key: db-password
-      {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-      {{- end }}
-    {{- end }}
     {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -1029,11 +973,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
     {{- end }}
         - name: XRAY_HA_NODE_ID
           valueFrom:
@@ -1115,11 +1054,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -1158,25 +1092,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -1198,11 +1113,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_HA_NODE_ID
           valueFrom:
@@ -1272,11 +1182,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -1315,25 +1220,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -1355,11 +1241,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_K8S_ENV
           value: "true"
diff --git a/stable/xray/templates/xray-server-deployment.yaml b/stable/xray/templates/xray-server-deployment.yaml
index a481b4fe5..b0406cc6b 100644
--- a/stable/xray/templates/xray-server-deployment.yaml
+++ b/stable/xray/templates/xray-server-deployment.yaml
@@ -133,6 +133,28 @@ spec:
           echo "Copy masterKey to {{ .Values.xray.persistence.mountPath }}/etc/security";
           mkdir -p {{ .Values.xray.persistence.mountPath }}/etc/security;
           echo ${XRAY_MASTER_KEY} > {{ .Values.xray.persistence.mountPath }}/etc/security/master.key;
+        {{- end }}
+          if set | grep -q "^XRAY_RABBITMQ_PASSWORD="; then
+          echo "Copy rabbitmq password to {{ .Values.xray.persistence.mountPath }}/etc/security";
+          mkdir -p {{ .Values.xray.persistence.mountPath }}/etc/security;
+          echo ${XRAY_RABBITMQ_PASSWORD} > {{ .Values.xray.persistence.mountPath }}/etc/security/rabbitmq.password;
+          else
+            if test -f "{{ .Values.xray.persistence.mountPath }}/etc/security/rabbitmq.password"; then
+            echo "XRAY_RABBITMQ_PASSWORD is not set, removing existing rabbitmq.password file.";
+            rm -f {{ .Values.xray.persistence.mountPath }}/etc/security/rabbitmq.password;
+            fi
+          fi
+        {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+          if set | grep -q "^XRAY_POSTGRES_PASSWORD="; then
+          echo "Copy postgres password to {{ .Values.xray.persistence.mountPath }}/etc/security";
+          mkdir -p {{ .Values.xray.persistence.mountPath }}/etc/security;
+          echo ${XRAY_POSTGRES_PASSWORD} > {{ .Values.xray.persistence.mountPath }}/etc/security/postgres.password;
+          else
+            if test -f "{{ .Values.xray.persistence.mountPath }}/etc/security/postgres.password"; then
+            echo "XRAY_POSTGRES_PASSWORD is not set, removing existing postgres.password file.";
+            rm -f {{ .Values.xray.persistence.mountPath }}/etc/security/postgres.password;
+            fi
+          fi
         {{- end }}
         env:
         {{- if or .Values.xray.joinKey .Values.xray.joinKeySecretName .Values.global.joinKey .Values.global.joinKeySecretName }}
@@ -157,6 +179,39 @@ spec:
               {{- end }}
               key: master-key
         {{- end }}
+        {{- if and .Values.rabbitmq.external.secrets (not .Values.common.rabbitmq.connectionConfigFromEnvironment) }}
+        - name: XRAY_RABBITMQ_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
+              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
+        {{- end }}
+        {{- if .Values.common.rabbitmq.connectionConfigFromEnvironment }}
+        - name: XRAY_RABBITMQ_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "rabbitmq.passwordSecretName" .}}
+              key: rabbitmq-password
+        {{- end }}
+        {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: XRAY_POSTGRES_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.xray.unifiedSecretInstallation }}
+              name: {{ template "xray.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "xray.name" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+        {{- end }}
         volumeMounts:
         - name: data-volume
           mountPath: {{ .Values.xray.persistence.mountPath | quote }}
@@ -432,11 +487,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -475,25 +525,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -515,11 +546,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_K8S_ENV
           value: "true"
diff --git a/stable/xray/templates/xray-serviceaccount.yaml b/stable/xray/templates/xray-serviceaccount.yaml
index bdc545321..70cf777a2 100644
--- a/stable/xray/templates/xray-serviceaccount.yaml
+++ b/stable/xray/templates/xray-serviceaccount.yaml
@@ -2,6 +2,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+{{- with .Values.serviceAccount.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
   labels:
     app: {{ template "xray.name" . }}
     chart: {{ template "xray.chart" . }}
diff --git a/stable/xray/templates/xray-statefulset.yaml b/stable/xray/templates/xray-statefulset.yaml
index 7d92bc25f..212f69c4b 100644
--- a/stable/xray/templates/xray-statefulset.yaml
+++ b/stable/xray/templates/xray-statefulset.yaml
@@ -133,6 +133,28 @@ spec:
           echo "Copy masterKey to {{ .Values.xray.persistence.mountPath }}/etc/security";
           mkdir -p {{ .Values.xray.persistence.mountPath }}/etc/security;
           echo ${XRAY_MASTER_KEY} > {{ .Values.xray.persistence.mountPath }}/etc/security/master.key;
+        {{- end }}
+          if set | grep -q "^XRAY_RABBITMQ_PASSWORD="; then
+          echo "Copy rabbitmq password to {{ .Values.xray.persistence.mountPath }}/etc/security";
+          mkdir -p {{ .Values.xray.persistence.mountPath }}/etc/security;
+          echo ${XRAY_RABBITMQ_PASSWORD} > {{ .Values.xray.persistence.mountPath }}/etc/security/rabbitmq.password;
+          else
+            if test -f "{{ .Values.xray.persistence.mountPath }}/etc/security/rabbitmq.password"; then
+            echo "XRAY_RABBITMQ_PASSWORD is not set, removing existing rabbitmq.password file.";
+            rm -f {{ .Values.xray.persistence.mountPath }}/etc/security/rabbitmq.password;
+            fi
+          fi
+        {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+          if set | grep -q "^XRAY_POSTGRES_PASSWORD="; then
+          echo "Copy postgres password to {{ .Values.xray.persistence.mountPath }}/etc/security";
+          mkdir -p {{ .Values.xray.persistence.mountPath }}/etc/security;
+          echo ${XRAY_POSTGRES_PASSWORD} > {{ .Values.xray.persistence.mountPath }}/etc/security/postgres.password;
+          else
+            if test -f "{{ .Values.xray.persistence.mountPath }}/etc/security/postgres.password"; then
+            echo "XRAY_POSTGRES_PASSWORD is not set, removing existing postgres.password file.";
+            rm -f {{ .Values.xray.persistence.mountPath }}/etc/security/postgres.password;
+            fi
+          fi
         {{- end }}
         env:
         {{- if or .Values.xray.joinKey .Values.xray.joinKeySecretName .Values.global.joinKey .Values.global.joinKeySecretName }}
@@ -157,6 +179,39 @@ spec:
               {{- end }}
               key: master-key
         {{- end }}
+        {{- if and .Values.rabbitmq.external.secrets (not .Values.common.rabbitmq.connectionConfigFromEnvironment) }}
+        - name: XRAY_RABBITMQ_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
+              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
+        {{- end }}
+        {{- if .Values.common.rabbitmq.connectionConfigFromEnvironment }}
+        - name: XRAY_RABBITMQ_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "rabbitmq.passwordSecretName" .}}
+              key: rabbitmq-password
+        {{- end }}
+        {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: XRAY_POSTGRES_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.xray.unifiedSecretInstallation }}
+              name: {{ template "xray.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "xray.name" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+        {{- end }}
         volumeMounts:
         - name: data-volume
           mountPath: {{ .Values.xray.persistence.mountPath | quote }}
@@ -432,11 +487,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -475,25 +525,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -515,11 +546,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_K8S_ENV
           value: "true"
@@ -594,11 +620,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -637,25 +658,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -677,11 +679,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_HA_NODE_ID
           valueFrom:
@@ -761,11 +758,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -804,25 +796,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -844,11 +817,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_HA_NODE_ID
           valueFrom:
@@ -931,11 +899,6 @@ spec:
               secretKeyRef:
                 name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
                 key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-          - name: JF_SHARED_RABBITMQ_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-                key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
           - name: JF_SHARED_RABBITMQ_URL
             valueFrom:
               secretKeyRef:
@@ -974,25 +937,6 @@ spec:
                 key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-          - name: JF_SHARED_DATABASE_PASSWORD
-            valueFrom:
-              secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-                name: {{ tpl .Values.database.secrets.password.name . }}
-                key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-                name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-                name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-                key: db-password
-        {{- else if .Values.postgresql.enabled }}
-                name: {{ .Release.Name }}-postgresql
-                key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
           - name: JF_SHARED_DATABASE_URL
             valueFrom:
@@ -1014,11 +958,6 @@ spec:
             value: {{ include "rabbitmq.user" .}}
           - name: JF_SHARED_RABBITMQ_URL
             value: {{ include "rabbitmq.url" .}}
-          - name: JF_SHARED_RABBITMQ_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ include "rabbitmq.passwordSecretName" .}}
-                key: rabbitmq-password
       {{- end }}
           - name: XRAY_HA_NODE_ID
             valueFrom:
@@ -1097,11 +1036,6 @@ spec:
               secretKeyRef:
                 name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
                 key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-          - name: JF_SHARED_RABBITMQ_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-                key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
           - name: JF_SHARED_RABBITMQ_URL
             valueFrom:
               secretKeyRef:
@@ -1140,25 +1074,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -1180,11 +1095,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_HA_NODE_ID
           valueFrom:
@@ -1253,11 +1163,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -1296,25 +1201,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -1336,11 +1222,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_HA_NODE_ID
           valueFrom:
@@ -1408,11 +1289,6 @@ spec:
             secretKeyRef:
               name: {{ tpl .Values.rabbitmq.external.secrets.username.name . }}
               key: {{ tpl .Values.rabbitmq.external.secrets.username.key . }}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ tpl .Values.rabbitmq.external.secrets.password.name . }}
-              key: {{ tpl .Values.rabbitmq.external.secrets.password.key . }}
         - name: JF_SHARED_RABBITMQ_URL
           valueFrom:
             secretKeyRef:
@@ -1451,25 +1327,6 @@ spec:
               key: db-actualUsername
         {{- end }}
       {{- end }}
-      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
-        - name: JF_SHARED_DATABASE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-        {{- if .Values.database.secrets.password }}
-              name: {{ tpl .Values.database.secrets.password.name . }}
-              key: {{ tpl .Values.database.secrets.password.key . }}
-        {{- else if .Values.database.password }}
-              {{- if not .Values.xray.unifiedSecretInstallation }}
-              name: {{ template "xray.fullname" . }}-database-creds
-              {{- else }}
-              name: "{{ template "xray.name" . }}-unified-secret"
-              {{- end }}
-              key: db-password
-        {{- else if .Values.postgresql.enabled }}
-              name: {{ .Release.Name }}-postgresql
-              key: postgresql-password
-        {{- end }}
-      {{- end }}
       {{- if or .Values.database.secrets.url .Values.database.url }}
         - name: JF_SHARED_DATABASE_URL
           valueFrom:
@@ -1491,11 +1348,6 @@ spec:
           value: {{ include "rabbitmq.user" .}}
         - name: JF_SHARED_RABBITMQ_URL
           value: {{ include "rabbitmq.url" .}}
-        - name: JF_SHARED_RABBITMQ_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rabbitmq.passwordSecretName" .}}
-              key: rabbitmq-password
       {{- end }}
         - name: XRAY_K8S_ENV
           value: "true"
diff --git a/stable/xray/values.yaml b/stable/xray/values.yaml
index 1932e2f25..d13de9eb5 100644
--- a/stable/xray/values.yaml
+++ b/stable/xray/values.yaml
@@ -356,6 +356,8 @@ serviceAccount:
   ## The name of the ServiceAccount to use.
   ## If not set and create is true, a name is generated using the fullname template
   name:
+  ## Service Account annotations
+  annotations: {}
   ## Explicitly mounts the API credentials for the Service Account
   automountServiceAccountToken: true
 
@@ -457,7 +459,7 @@ rabbitmq:
   image:
     registry: releases-docker.jfrog.io
     repository: bitnami/rabbitmq
-    tag: 3.12.13-debian-11-r0
+    tag: 3.13.6-debian-12-r1
   extraPlugins: "rabbitmq_management"
 
   auth:
@@ -651,6 +653,8 @@ rabbitmq:
       ## If not set and create is true, a name is generated using the fullname template
       name:
       ## Explicitly mounts the API credentials for the Service Account
+      ## Service Account annotations
+      annotations: {}
       automountServiceAccountToken: true
       rbac:
         create: true
@@ -1361,6 +1365,10 @@ server:
   #    memory: "2Gi"
   #    cpu: "1"
 
+## JAS periodic health check
+jas:
+  healthcheck:
+    enabled: false
 contextualAnalysis:
   image:
     registry: releases-docker.jfrog.io
@@ -1376,7 +1384,7 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.124.1
+    tag: 7.135.1
     imagePullPolicy: IfNotPresent
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled.
@@ -1459,7 +1467,7 @@ observability:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/observability
-    tag: 1.30.0
+    tag: 1.31.5
     imagePullPolicy: IfNotPresent
   internalPort: 8036
   resources: {}