diff --git a/assets/icons/cf-runtime.png b/assets/icons/cf-runtime.png
new file mode 100644
index 000000000..0a9dcfff5
Binary files /dev/null and b/assets/icons/cf-runtime.png differ
diff --git a/assets/icons/citrix-adc-istio-ingress-gateway.png b/assets/icons/citrix-adc-istio-ingress-gateway.png
new file mode 100644
index 000000000..c9328a280
Binary files /dev/null and b/assets/icons/citrix-adc-istio-ingress-gateway.png differ
diff --git a/assets/icons/citrix-cpx-istio-sidecar-injector.png b/assets/icons/citrix-cpx-istio-sidecar-injector.png
new file mode 100644
index 000000000..c9328a280
Binary files /dev/null and b/assets/icons/citrix-cpx-istio-sidecar-injector.png differ
diff --git a/assets/icons/citrix-cpx-with-ingress-controller.png b/assets/icons/citrix-cpx-with-ingress-controller.png
new file mode 100644
index 000000000..c9328a280
Binary files /dev/null and b/assets/icons/citrix-cpx-with-ingress-controller.png differ
diff --git a/assets/icons/citrix-ingress-controller.png b/assets/icons/citrix-ingress-controller.png
new file mode 100644
index 000000000..c9328a280
Binary files /dev/null and b/assets/icons/citrix-ingress-controller.png differ
diff --git a/index.yaml b/index.yaml
index 91c19b9cd..9665fa862 100644
--- a/index.yaml
+++ b/index.yaml
@@ -3678,7 +3678,7 @@ entries:
     description: A Helm chart for Codefresh Runner
     digest: 7b4be556cd168420dde71eb39f7dd8c84d20016b6d52380469837746028f448d
     home: https://github.com/codefresh-io/venona
-    icon: https://partner-charts.rancher.io/assets/logos/codefresh.jpg
+    icon: file://assets/icons/cf-runtime.png
     keywords:
     - codefresh
     - runner
@@ -3700,7 +3700,7 @@ entries:
     description: A Helm chart for Codefresh Runner
     digest: e3a0791a8d57bfda54b818e41acb74021c7dd7797dd04987fcef8086bc7063b5
     home: https://github.com/codefresh-io/venona
-    icon: https://partner-charts.rancher.io/assets/logos/codefresh.jpg
+    icon: file://assets/icons/cf-runtime.png
     keywords:
     - codefresh
     - runner
@@ -3813,7 +3813,7 @@ entries:
       Service Mesh on Kubernetes platform
     digest: 97fbe0c1968d5125c060b8ce706c743da4be20273c5ace5f2c9eeb8477cf2bcf
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-adc-istio-ingress-gateway.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: dhiraj.gedam@citrix.com
@@ -3837,7 +3837,7 @@ entries:
       Service Mesh on Kubernetes platform
     digest: 266363a16af780e162de5e1d68a8ac5a943803586f95f415cf856c31645026ed
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-xds-adaptor/master/docs/media/Citrix_Logo_Trademark.png
+    icon: file://assets/icons/citrix-adc-istio-ingress-gateway.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: dhiraj.gedam@citrix.com
@@ -3863,7 +3863,7 @@ entries:
       Service Mesh on Kubernetes platform
     digest: f4b2f27fdcfbc79b1f201f0fac579bc55205e861f1022b206c202b0d1792c6d8
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-xds-adaptor/master/docs/media/Citrix_Logo_Trademark.png
+    icon: file://assets/icons/citrix-adc-istio-ingress-gateway.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: dhiraj.gedam@citrix.com
@@ -3888,7 +3888,7 @@ entries:
       Service Mesh on Kubernetes platform
     digest: 41121dad6ac7271f2ada14e5f8cbc7d398e1e656db95e1937ab1dc5bab563e4c
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-adc-istio-ingress-gateway.png
     maintainers:
     - email: dhiraj.gedam@citrix.com
       name: dheerajng
@@ -3913,7 +3913,7 @@ entries:
       Istio Service Mesh as sidecar in application pod
     digest: 3f47026101ddc3f23ad6e9d7b15137aa8ac9c474bb066c4cc78c886b32ee44bd
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-istio-sidecar-injector.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: dhiraj.gedam@citrix.com
@@ -3937,7 +3937,7 @@ entries:
       Istio Service Mesh as sidecar in application pod
     digest: bf1aee48044ff55d859db570c7402a2ce64f6cc948623a2aacf413a2df55a26f
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-xds-adaptor/master/docs/media/Citrix_Logo_Trademark.png
+    icon: file://assets/icons/citrix-cpx-istio-sidecar-injector.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: dhiraj.gedam@citrix.com
@@ -3963,7 +3963,7 @@ entries:
       Istio Service Mesh as sidecar in application pod
     digest: 1db7acf729270779c316cef63f55237fba3d6aef78ca0d9966fb447ad3a20fe8
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-xds-adaptor/master/docs/media/Citrix_Logo_Trademark.png
+    icon: file://assets/icons/citrix-cpx-istio-sidecar-injector.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: dhiraj.gedam@citrix.com
@@ -3991,7 +3991,7 @@ entries:
       as sidecar.
     digest: 10ed63a7510ac3c4dca9909de63da761fa2150a934c6175e08e3ee01141a06c2
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-with-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4016,7 +4016,7 @@ entries:
       as sidecar.
     digest: b278133babdb46def355267203690ffa4fb563fd7e5dc990c96ff5b4497e2bf0
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-with-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4041,7 +4041,7 @@ entries:
       as sidecar.
     digest: aa18ea4e9648da71df522861fc6047f6434488d1af5434439c8914b3c78d94a4
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-with-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4066,7 +4066,7 @@ entries:
       as sidecar.
     digest: 8cfcd0ce55c67c7e2ae9de9a5f56db9d71444f2426bde068851774c4d5a0ef5d
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-with-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4091,7 +4091,7 @@ entries:
       as sidecar.
     digest: 308454271cadf829f623f1f77d65d045fa7368b50841d8b837aef608b67325db
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-with-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4116,7 +4116,7 @@ entries:
       as sidecar.
     digest: 4ba2b04429dc71e584c981fb01452b03ecdad399a8de57092711fdd1a46587b7
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-with-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@citrix.com
@@ -4141,7 +4141,7 @@ entries:
       as sidecar.
     digest: b83a201a83c9d0909538512649f413f7bc03c957fcaf6c8a8191ff33a0ed82ec
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-with-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@citrix.com
@@ -4166,7 +4166,7 @@ entries:
       as sidecar.
     digest: cdd942918f67ddbae6aaabd7fbbcc51f0435351f12c2225b45f6c380bff8d54a
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-with-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@citrix.com
@@ -4189,7 +4189,7 @@ entries:
       as sidecar.
     digest: 298c1472ff1afea8333346f2d67dc4bb6fb64779b4b90378b18e57180995286e
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-cpx-with-ingress-controller.png
     maintainers:
     - email: priyanka.sharma@citrix.com
       name: priyankash-citrix
@@ -4213,7 +4213,7 @@ entries:
     description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
     digest: ca0f72c6f4ade0fbe19da8a72e8dfb01f56ba05ea496d07a1a9c82429079f138
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4237,7 +4237,7 @@ entries:
     description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
     digest: 25786c3a766966cb906575322c81086925bbc810ab423a331463d3ad23e32b33
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4261,7 +4261,7 @@ entries:
     description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
     digest: 33941f4732bd8e237a3a184864e4d29b8dec1ff401ff6f3c4e47bc4138b27707
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4285,7 +4285,7 @@ entries:
     description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
     digest: 384c5aa00cfcbab4f1acd31a2f3a2f26feb6c87517e8542aaec94bc0520f6451
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4309,7 +4309,7 @@ entries:
     description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
     digest: 237c89c729a9d25e43564e02aabece169795beff9d44c03efba7c06da9aa79a5
     home: https://www.cloud.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@cloud.com
@@ -4333,7 +4333,7 @@ entries:
     description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
     digest: 5dd112bd395139c089286c8b678dc0b71cb35e51f221e746405fce7c630a98ac
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@citrix.com
@@ -4357,7 +4357,7 @@ entries:
     description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
     digest: 0fb2a3087b1f8c4f95050e9c2ac74b12717b7f819e17cc5fb164569e0a66d77d
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@citrix.com
@@ -4381,7 +4381,7 @@ entries:
     description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
     digest: 236a9b2e391bf5a89d0e77ebf8f5af174421ed0c81dabea2268f50d6b66d935a
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
+    icon: file://assets/icons/citrix-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@citrix.com
@@ -4404,7 +4404,7 @@ entries:
     description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
     digest: 86681aaf64c859e9d64e4a5249a5190b8efc2b4aca64a126eb31e8137bfd8ba2
     home: https://www.citrix.com
-    icon: https://raw.githubusercontent.com/citrix/citrix-xds-adaptor/master/docs/media/Citrix_Logo_Trademark.png
+    icon: file://assets/icons/citrix-ingress-controller.png
     kubeVersion: '>=v1.16.0-0'
     maintainers:
     - email: priyanka.sharma@citrix.com
@@ -35971,4 +35971,4 @@ entries:
     urls:
     - assets/netfoundry/ziti-host-1.5.1.tgz
     version: 1.5.1
-generated: "2024-07-12T16:35:38.654385766Z"
+generated: "2024-07-15T17:20:08.547638282-06:00"
diff --git a/packages/codefresh/cf-runtime/upstream.yaml b/packages/codefresh/cf-runtime/upstream.yaml
index 30576216d..7d770a42f 100644
--- a/packages/codefresh/cf-runtime/upstream.yaml
+++ b/packages/codefresh/cf-runtime/upstream.yaml
@@ -4,5 +4,4 @@ GitHubRelease: true
 Vendor: Codefresh
 DisplayName: Codefresh
 ChartMetadata:
-  icon: https://partner-charts.rancher.io/assets/logos/codefresh.jpg
   kubeVersion: '>=1.18-0'