diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md
index a07868adb..22fdb9c45 100644
--- a/stable/jfrog-platform/CHANGELOG.md
+++ b/stable/jfrog-platform/CHANGELOG.md
@@ -1,6 +1,11 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
+## [10.18.2] - June 12, 2024
+* Update dependency artifactory chart version to 107.84.14
+* Update dependency xray chart version to 103.96.1
+* Fixed an issue related to chart artifactory fullname
+
 ## [10.18.1] - May 26, 2024
 * Update dependency artifactory chart version to 107.84.12
 * Update dependency xray chart version to 103.95.7
diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock
index 82360eb0e..a9af26054 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.84.12
+  version: 107.84.14
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.95.7
+  version: 103.96.1
 - name: distribution
   repository: https://charts.jfrog.io/
   version: 102.25.1
@@ -20,5 +20,5 @@ dependencies:
 - name: pipelines
   repository: https://charts.jfrog.io/
   version: 101.59.7
-digest: sha256:56341c74ca4be940df92302c2bb4cdcb05b3dc3105f63170e73e1ce11db035d3
-generated: "2024-05-26T20:20:26.257789+05:30"
+digest: sha256:1853186eaabb7b835754a0b337cbc466a6d56738ed8932a26d53573af875856b
+generated: "2024-06-10T14:56:18.190319+05:30"
diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml
index 92b2878b2..6a4fae806 100644
--- a/stable/jfrog-platform/Chart.yaml
+++ b/stable/jfrog-platform/Chart.yaml
@@ -12,11 +12,11 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.84.12
+  version: 107.84.14
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.95.7
+  version: 103.96.1
 - condition: distribution.enabled
   name: distribution
   repository: https://charts.jfrog.io/
@@ -50,4 +50,4 @@ name: jfrog-platform
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 10.18.1
+version: 10.18.2
diff --git a/stable/jfrog-platform/templates/_helpers.tpl b/stable/jfrog-platform/templates/_helpers.tpl
index 25c8262af..026edba4d 100644
--- a/stable/jfrog-platform/templates/_helpers.tpl
+++ b/stable/jfrog-platform/templates/_helpers.tpl
@@ -75,14 +75,14 @@ imagePullSecrets:
 {{- end -}}
 
 {{/*
-Reslove Unified Secret name
+Resolve unifiedSecretInstallation name
 */}}
 {{- define "jfrog-platform.unifiedSecretInstallation" -}}
 {{- if eq .Chart.Name "artifactory" -}}
 {{- if not .Values.artifactory.unifiedSecretInstallation }}
 {{- printf "%s-%s" (include "artifactory.fullname" .) "database-creds" -}}
 {{- else }}
-{{- printf "%s-%s" (include "artifactory.fullname" .) "unified-secret" -}}
+{{- printf "%s-%s" (include "artifactory.unifiedSecretPrependReleaseName" .) "unified-secret" -}}
 {{- end }}
 {{- end -}}
 {{- if eq .Chart.Name "distribution" -}}
diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml
index b94f9803c..60549ffb0 100644
--- a/stable/jfrog-platform/values.yaml
+++ b/stable/jfrog-platform/values.yaml
@@ -247,6 +247,8 @@ artifactory:
     enabled: true
   artifactory:
     unifiedSecretInstallation: true
+    ## unifiedSecretPrependReleaseName Set this flag to false if unifiedSecret should not be created with <release-name> prepended.
+    unifiedSecretPrependReleaseName: true
     # Note: For HA deployments, set replicaCount >1 (recommended 3)
     replicaCount: 1
     migration: