diff --git a/Openshift4/RedHatImages/Dockerfile.redhat-ubi-jfrog-rabbitmq b/Openshift4/RedHatImages/Dockerfile.redhat-ubi-jfrog-rabbitmq
index f24bbf69..16922820 100644
--- a/Openshift4/RedHatImages/Dockerfile.redhat-ubi-jfrog-rabbitmq
+++ b/Openshift4/RedHatImages/Dockerfile.redhat-ubi-jfrog-rabbitmq
@@ -3,7 +3,7 @@
 # JFROG REDHAT UBI PORT TO WORK IN BITNAMI RABBITMQ HELM CHARTS
 
 
-FROM bitnami/rabbitmq:3.12.10-debian-11-r1 as base
+FROM bitnami/rabbitmq:3.12.13-debian-11-r0 as base
 
 FROM registry.access.redhat.com/ubi9
 
@@ -15,7 +15,7 @@ LABEL name="JFrog Rabbit MQ" \
       summary="JFrog Rabbit MQ (Red Hat UBI)" \
       com.jfrog.license_terms="https://jfrog.com/platform/enterprise-plus-eula/"
 
-ARG RABBITMQ_VERSION=3.12.10-debian-11-r1
+ARG RABBITMQ_VERSION=3.12.13-debian-11-r0
 
 LABEL io.k8s.description="Lightweight open source message broker" \
     io.k8s.display-name="RabbitMQ" \
diff --git a/Openshift4/helm/openshift-xray/CHANGELOG.md b/Openshift4/helm/openshift-xray/CHANGELOG.md
index 58bf8cc5..a00f35a5 100644
--- a/Openshift4/helm/openshift-xray/CHANGELOG.md
+++ b/Openshift4/helm/openshift-xray/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [103.104.18] Oct 22, 2024
+* Updating to Xray chart version 103.104.18 and Xray app version 3.104.18
+
 ## [103.91.3] Mar 25, 2024
 * Updating to Xray chart version 103.85.5 and Xray app version 3.91.3
 
diff --git a/Openshift4/helm/openshift-xray/Chart.lock b/Openshift4/helm/openshift-xray/Chart.lock
index 8551e85d..b097e335 100644
--- a/Openshift4/helm/openshift-xray/Chart.lock
+++ b/Openshift4/helm/openshift-xray/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.91.3
-digest: sha256:7b3ca7fab7810d37cda0f048fac77e49dc97d9bbb987d67242b9820506099de5
-generated: "2024-03-25T15:14:14.045347+05:30"
+  version: 103.104.18
+digest: sha256:6bc7df926b8d63a3a271fa3d2123edfb8012ec0b71953e8a43dcfbeedaf00a70
+generated: "2024-10-17T13:12:40.010794+05:30"
diff --git a/Openshift4/helm/openshift-xray/Chart.yaml b/Openshift4/helm/openshift-xray/Chart.yaml
index a5ec8346..ced2fec5 100644
--- a/Openshift4/helm/openshift-xray/Chart.yaml
+++ b/Openshift4/helm/openshift-xray/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 3.91.3
+appVersion: 3.104.18
 description: Universal component scan for security and license inventory and impact analysis
 dependencies:
   - name: xray
-    version: 103.91.3
+    version: 103.104.18
     repository: https://charts.jfrog.io/
 sources:
 - https://bintray.com/jfrog/product/xray/view
@@ -17,4 +17,4 @@ maintainers:
 - email: johnp@jfrog.com
   name: John Peterson
 name: openshift-xray
-version: 103.91.3
+version: 103.104.18
diff --git a/Openshift4/helm/openshift-xray/rabbitmq.yaml b/Openshift4/helm/openshift-xray/rabbitmq.yaml
index 0d591e72..8bb23d99 100644
--- a/Openshift4/helm/openshift-xray/rabbitmq.yaml
+++ b/Openshift4/helm/openshift-xray/rabbitmq.yaml
@@ -16,7 +16,7 @@ spec:
         app: rabbitmq
     spec:
       containers:
-        - image: registry.connect.redhat.com/jfrog/xray-rabbitmq:3.91.3
+        - image: registry.connect.redhat.com/jfrog/xray-rabbitmq:3.104.18
           imagePullPolicy: "Always"
           name: xray-rabbitmq
           ports:
diff --git a/Openshift4/helm/openshift-xray/values.yaml b/Openshift4/helm/openshift-xray/values.yaml
index cfaa2a56..4fb5324e 100755
--- a/Openshift4/helm/openshift-xray/values.yaml
+++ b/Openshift4/helm/openshift-xray/values.yaml
@@ -17,7 +17,7 @@ xray:
       connectionConfigFromEnvironment: true
     xrayUserId: "1000721035"
     xrayGroupId: "1000721035"
-    xrayVersion: "3.91.3"
+    xrayVersion: "3.104.18"
     customInitContainers: |
       - name: "prepare-uid-persistent-volume"
         image: "{{ .Values.initContainerImage }}"
@@ -71,7 +71,7 @@ xray:
       registry: registry.connect.redhat.com
       repository: jfrog/xray-router
       imagePullPolicy: IfNotPresent
-      tag: 3.91.3
+      tag: 3.104.18
   
   # RabbitMQ
   ## Configuration values for the rabbitmq dependency
@@ -85,7 +85,7 @@ xray:
     image: 
       registry: registry.connect.redhat.com
       repository: jfrog/xray-rabbitmq
-      tag: 3.91.3
+      tag: 3.104.18
 
     podSecurityContext:
       fsGroup: 1000721001
diff --git a/Openshift4/operator/xray-operator/CHANGELOG.md b/Openshift4/operator/xray-operator/CHANGELOG.md
index fa96765f..1c3e8a93 100644
--- a/Openshift4/operator/xray-operator/CHANGELOG.md
+++ b/Openshift4/operator/xray-operator/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to this chart will be documented in this file.
 
+## [2.1.5] Oct 22, 2024
+
+* Deploying JFrog Xray 3.104.18 as an Operator into Openshift
+
 ## [2.1.5] Mar 25, 2024
 
 - Deploying JFrog Xray 3.91.3 as an Operator into Openshift
diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md
index 58bf8cc5..a00f35a5 100644
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog  Openshift Artifactory-Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [103.104.18] Oct 22, 2024
+* Updating to Xray chart version 103.104.18 and Xray app version 3.104.18
+
 ## [103.91.3] Mar 25, 2024
 * Updating to Xray chart version 103.85.5 and Xray app version 3.91.3
 
diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock
index 8551e85d..76442966 100644
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.91.3
-digest: sha256:7b3ca7fab7810d37cda0f048fac77e49dc97d9bbb987d67242b9820506099de5
-generated: "2024-03-25T15:14:14.045347+05:30"
+  version: 103.104.18
+digest: sha256:6bc7df926b8d63a3a271fa3d2123edfb8012ec0b71953e8a43dcfbeedaf00a70
+generated: "2024-10-17T13:13:14.17138+05:30"
diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml
index a5ec8346..ced2fec5 100644
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 3.91.3
+appVersion: 3.104.18
 description: Universal component scan for security and license inventory and impact analysis
 dependencies:
   - name: xray
-    version: 103.91.3
+    version: 103.104.18
     repository: https://charts.jfrog.io/
 sources:
 - https://bintray.com/jfrog/product/xray/view
@@ -17,4 +17,4 @@ maintainers:
 - email: johnp@jfrog.com
   name: John Peterson
 name: openshift-xray
-version: 103.91.3
+version: 103.104.18
diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml
index 0d591e72..8bb23d99 100644
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/rabbitmq.yaml
@@ -16,7 +16,7 @@ spec:
         app: rabbitmq
     spec:
       containers:
-        - image: registry.connect.redhat.com/jfrog/xray-rabbitmq:3.91.3
+        - image: registry.connect.redhat.com/jfrog/xray-rabbitmq:3.104.18
           imagePullPolicy: "Always"
           name: xray-rabbitmq
           ports:
diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml
index cfaa2a56..4fb5324e 100755
--- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml
+++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml
@@ -17,7 +17,7 @@ xray:
       connectionConfigFromEnvironment: true
     xrayUserId: "1000721035"
     xrayGroupId: "1000721035"
-    xrayVersion: "3.91.3"
+    xrayVersion: "3.104.18"
     customInitContainers: |
       - name: "prepare-uid-persistent-volume"
         image: "{{ .Values.initContainerImage }}"
@@ -71,7 +71,7 @@ xray:
       registry: registry.connect.redhat.com
       repository: jfrog/xray-router
       imagePullPolicy: IfNotPresent
-      tag: 3.91.3
+      tag: 3.104.18
   
   # RabbitMQ
   ## Configuration values for the rabbitmq dependency
@@ -85,7 +85,7 @@ xray:
     image: 
       registry: registry.connect.redhat.com
       repository: jfrog/xray-rabbitmq
-      tag: 3.91.3
+      tag: 3.104.18
 
     podSecurityContext:
       fsGroup: 1000721001