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: