diff --git a/stable/artifactory-cpp-ce/CHANGELOG.md b/stable/artifactory-cpp-ce/CHANGELOG.md
index e80ec1ce6..041c14fed 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.84.14] - Feb 20, 2024
+## [107.84.17] - 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 4a73c0ca2..1ee14c32e 100644
--- a/stable/artifactory-cpp-ce/Chart.yaml
+++ b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.84.14
+appVersion: 7.84.17
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.84.14
+  version: 107.84.17
 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.84.14
+version: 107.84.17
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
index 3b1d19a9f..86d59a0c6 100644
--- a/stable/artifactory-ha/CHANGELOG.md
+++ b/stable/artifactory-ha/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.84.14] - May 29, 2024
+## [107.84.17] - June 27, 2024
 * Added image section for `initContainers` instead of `initContainerImage`
 * Renamed `router.image.imagePullPolicy` to `router.image.pullPolicy`
 * Removed loggers.image section
@@ -23,6 +23,7 @@ All changes to this chart will be documented in this file
 * Fixed resource constraints for "setup" initContainer of nginx deployment [GH-962] (https://github.com/jfrog/charts/issues/962)
 * Added .Values.artifactory.unifiedSecretsPrependReleaseName` for unified secret to prepend release name
 * Fixed maxCacheSize and cacheProviderDir mix up under azure-blob-storage-v2-direct template in binarystore.xml
+* Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
 
 ## [107.83.0] - Mar 12, 2024
 * Added image section for `metadata` and `observability`
diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
index af1e000b7..63b091756 100644
--- a/stable/artifactory-ha/Chart.yaml
+++ b/stable/artifactory-ha/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
-  artifactoryServiceVersion: 7.84.17
+  artifactoryServiceVersion: 7.84.20
 apiVersion: v2
-appVersion: 7.84.14
+appVersion: 7.84.17
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -23,4 +23,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.84.14
+version: 107.84.17
diff --git a/stable/artifactory-ha/templates/_helpers.tpl b/stable/artifactory-ha/templates/_helpers.tpl
index 1ad5af4de..a0d318ba6 100644
--- a/stable/artifactory-ha/templates/_helpers.tpl
+++ b/stable/artifactory-ha/templates/_helpers.tpl
@@ -321,8 +321,7 @@ Return the proper artifactory chart image names
 Return the proper artifactory app version
 */}}
 {{- define "artifactory-ha.app.version" -}}
-{{- $image := split ":" ((include "artifactory-ha.getImageInfoByValue" (list . "artifactory")) | toString) -}}
-{{- $tag := $image._1 -}}
+{{- $tag := (splitList ":" ((include "artifactory-ha.getImageInfoByValue" (list . "artifactory" )))) | last | toString -}}
 {{- printf "%s" $tag -}}
 {{- end -}}
 
diff --git a/stable/artifactory-ha/templates/artifactory-license-secret.yaml b/stable/artifactory-ha/templates/artifactory-license-secret.yaml
index 73f900863..0018fa044 100644
--- a/stable/artifactory-ha/templates/artifactory-license-secret.yaml
+++ b/stable/artifactory-ha/templates/artifactory-license-secret.yaml
@@ -1,4 +1,4 @@
-{{ if and (not .Values.artifactory.unifiedSecretInstallation) (not .Values.artifactory.license.secret) (not .Values.artifactory.license.licenseKey) }}
+{{ if and (not .Values.artifactory.unifiedSecretInstallation) (not .Values.artifactory.license.secret) }}
 {{- with .Values.artifactory.license.licenseKey }}
 apiVersion: v1
 kind: Secret
diff --git a/stable/artifactory-jcr/CHANGELOG.md b/stable/artifactory-jcr/CHANGELOG.md
index 0462ef636..c552c32fa 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.84.14] - Feb 20, 2024
+## [107.84.17] - 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 d7cb967c0..54843d171 100644
--- a/stable/artifactory-jcr/Chart.yaml
+++ b/stable/artifactory-jcr/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.84.14
+appVersion: 7.84.17
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.84.14
+  version: 107.84.17
 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.84.14
+version: 107.84.17
diff --git a/stable/artifactory-oss/CHANGELOG.md b/stable/artifactory-oss/CHANGELOG.md
index ca1a5fffa..79840e36e 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.84.14] - Feb 20, 2024
+## [107.84.17] - 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 222fe1fa6..589aeb441 100644
--- a/stable/artifactory-oss/Chart.yaml
+++ b/stable/artifactory-oss/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.84.14
+appVersion: 7.84.17
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.84.14
+  version: 107.84.17
 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.84.14
+version: 107.84.17
diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
index 7774a8f8d..f9abf951c 100644
--- a/stable/artifactory/CHANGELOG.md
+++ b/stable/artifactory/CHANGELOG.md
@@ -1,7 +1,7 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.84.14] - May 29, 2024
+## [107.84.17] - June 27, 2024
 * Added image section for `initContainers` instead of `initContainerImage`
 * Renamed `router.image.imagePullPolicy` to `router.image.pullPolicy`
 * Removed image section for `loggers`
@@ -21,6 +21,7 @@ All changes to this chart will be documented in this file.
 * Fixed resource constraints for "setup" initContainer of nginx deployment [GH-962] (https://github.com/jfrog/charts/issues/962)
 * Added .Values.artifactory.unifiedSecretPrependReleaseName` for unified secret to prepend release name
 * Fixed maxCacheSize and cacheProviderDir mix up under azure-blob-storage-v2-direct template in binarystore.xml
+* Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
 
 ## [107.82.0] - Mar 04, 2024
 * Added `disableRouterBypass` flag as experimental feature, to disable the artifactoryPath /artifactory/ and route all traffic through the Router.
diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
index a75fa648a..bd74e94a6 100644
--- a/stable/artifactory/Chart.yaml
+++ b/stable/artifactory/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.84.14
+appVersion: 7.84.17
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.84.14
+version: 107.84.17
diff --git a/stable/artifactory/templates/_helpers.tpl b/stable/artifactory/templates/_helpers.tpl
index 1cf6cc365..9aa1940d9 100644
--- a/stable/artifactory/templates/_helpers.tpl
+++ b/stable/artifactory/templates/_helpers.tpl
@@ -255,8 +255,7 @@ Return the proper artifactory chart image names
 Return the proper artifactory app version
 */}}
 {{- define "artifactory.app.version" -}}
-{{- $image := split ":" ((include "artifactory.getImageInfoByValue" (list . "artifactory")) | toString) -}}
-{{- $tag := $image._1 -}}
+{{- $tag := (splitList ":" ((include "artifactory.getImageInfoByValue" (list . "artifactory" )))) | last | toString -}}
 {{- printf "%s" $tag -}}
 {{- end -}}
 
diff --git a/stable/artifactory/templates/artifactory-license-secret.yaml b/stable/artifactory/templates/artifactory-license-secret.yaml
index ba83aaf24..dda734033 100644
--- a/stable/artifactory/templates/artifactory-license-secret.yaml
+++ b/stable/artifactory/templates/artifactory-license-secret.yaml
@@ -1,4 +1,4 @@
-{{ if and (not .Values.artifactory.unifiedSecretInstallation) (not .Values.artifactory.license.secret) (not .Values.artifactory.license.licenseKey) }}
+{{ if and (not .Values.artifactory.unifiedSecretInstallation) (not .Values.artifactory.license.secret) }}
 {{- with .Values.artifactory.license.licenseKey }}
 apiVersion: v1
 kind: Secret
diff --git a/stable/artifactory/templates/artifactory-statefulset.yaml b/stable/artifactory/templates/artifactory-statefulset.yaml
index 93b2ad50f..73fdb7df7 100644
--- a/stable/artifactory/templates/artifactory-statefulset.yaml
+++ b/stable/artifactory/templates/artifactory-statefulset.yaml
@@ -8,6 +8,7 @@ metadata:
     component: {{ .Values.artifactory.name }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
+    version: {{ include "artifactory.app.version" . }}
 {{- with .Values.artifactory.labels }}
 {{ toYaml . | indent 4 }}
 {{- end }}
diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md
index 22fdb9c45..c77e9303f 100644
--- a/stable/jfrog-platform/CHANGELOG.md
+++ b/stable/jfrog-platform/CHANGELOG.md
@@ -1,6 +1,10 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
+## [10.18.3] - July 15, 2024
+* Update dependency artifactory chart version to 107.84.17
+* Update dependency xray chart version to 103.98.5
+
 ## [10.18.2] - June 12, 2024
 * Update dependency artifactory chart version to 107.84.14
 * Update dependency xray chart version to 103.96.1
diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock
index a9af26054..7f7b3030f 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.14
+  version: 107.84.17
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.96.1
+  version: 103.98.5
 - 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:1853186eaabb7b835754a0b337cbc466a6d56738ed8932a26d53573af875856b
-generated: "2024-06-10T14:56:18.190319+05:30"
+digest: sha256:a03647c0b1cf25012f2320e3fc6f953499eab18a8b2b7f461a8e0eeaf36582c6
+generated: "2024-07-15T10:39:47.432479+05:30"
diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml
index 6a4fae806..12cf5e43c 100644
--- a/stable/jfrog-platform/Chart.yaml
+++ b/stable/jfrog-platform/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.84.12
+appVersion: 7.84.17
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -12,11 +12,11 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.84.14
+  version: 107.84.17
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.96.1
+  version: 103.98.5
 - 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.2
+version: 10.18.3
diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml
index 60549ffb0..3218bfcc1 100644
--- a/stable/jfrog-platform/values.yaml
+++ b/stable/jfrog-platform/values.yaml
@@ -27,7 +27,7 @@ global:
   ## For example : For artifactory, using global.versions.artifactory
   ## Note: Order of preference is 1) global.versions 2) .Values.artifactory.image.tag 3) Chart.AppVersion
   versions:
-    router: 7.108.0
+    router: 7.118.0
   #   artifactory:
   #   xray:
   #   distribution:
@@ -232,7 +232,7 @@ rabbitmq:
 artifactory:
   enabled: true
   unifiedUpgradeAllowed: true
-  installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.18.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.18.3-%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
diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md
index b76ae9ab6..e77213009 100644
--- a/stable/xray/CHANGELOG.md
+++ b/stable/xray/CHANGELOG.md
@@ -1,10 +1,10 @@
 # JFrog Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [103.98.2] - May 27, 2024
+## [103.98.5] - May 27, 2024
 * Added chart label to xray pods
 
-## [103.96.1] - Apr 17, 2024
+## [103.96.0] - Apr 17, 2024
 * Added `rabbitmq.containerSecurityContext.allowPrivilegeEscalation` flag to ensure `RunAsUser` commands cannot bypass their existing sets of permissions. Set to `false` by default
 * Updated rabbitmq multi-arch tag version to to `3.12.13-debian-11-r0`
 
diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml
index 49facce15..49634c023 100644
--- a/stable/xray/Chart.yaml
+++ b/stable/xray/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.98.2
+appVersion: 3.98.5
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -24,4 +24,4 @@ name: xray
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 103.98.2
+version: 103.98.5