diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4eb5e91..1fe8414 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 2024-09-19
+### Changed
+- Fluentd collector container image uptake to 1.5.0 having OS update, Ruby 3.3.1 upgrade and other dependency gem updates.
+  - Similar updates to build files (Dockerfile, Gemfile) that helps building custom container image.
+
 ## 2024-07-08
 ### Added
 - Option to disable JRE default security property for Agent.
diff --git a/charts/logan/Chart.yaml b/charts/logan/Chart.yaml
index ebaa639..d022905 100644
--- a/charts/logan/Chart.yaml
+++ b/charts/logan/Chart.yaml
@@ -5,7 +5,7 @@ apiVersion: v2
 name: oci-onm-logan
 description: Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Objects information to OCI Logging Analytics.
 type: application
-version: 3.4.4
+version: 3.5.0
 appVersion: "3.0.0"
 
 dependencies:
diff --git a/charts/logan/values.yaml b/charts/logan/values.yaml
index e19fc03..46a1d38 100644
--- a/charts/logan/values.yaml
+++ b/charts/logan/values.yaml
@@ -48,7 +48,7 @@ image:
    # Image pull secrets for. Secret must be in the namespace defined by namespace
    imagePullSecrets:
    # -- Replace this value with actual docker image url
-   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.3
+   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.5.0
    # -- Image pull policy
    imagePullPolicy: Always
 
diff --git a/charts/oci-onm/Chart.yaml b/charts/oci-onm/Chart.yaml
index bceb8a9..de85b97 100644
--- a/charts/oci-onm/Chart.yaml
+++ b/charts/oci-onm/Chart.yaml
@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.4.4
+version: 3.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -32,7 +32,7 @@ dependencies:
   repository: "file://../common"
   condition: oci-onm-common.enabled
 - name: oci-onm-logan
-  version: "3.4.4"
+  version: "3.5.0"
   repository: "file://../logan"
   condition: oci-onm-logan.enabled
 - name: oci-onm-mgmt-agent
diff --git a/charts/oci-onm/values.yaml b/charts/oci-onm/values.yaml
index 8bdcf18..fcc1a28 100644
--- a/charts/oci-onm/values.yaml
+++ b/charts/oci-onm/values.yaml
@@ -31,7 +31,7 @@ oci-onm-logan:
   kubernetesClusterID: "{{ .Values.global.kubernetesClusterID }}"
   kubernetesClusterName: "{{ .Values.global.kubernetesClusterName }}"
   image:
-    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.3
+    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.5.0
   # Go to OCI Logging Analytics Administration, click Service Details, and note the namespace value.
   ociLANamespace:
   # OCI Logging Analytics Default Log Group OCID
diff --git a/logan/docker-images/v1.0/oraclelinux/8-slim/Dockerfile b/logan/docker-images/v1.0/oraclelinux/8-slim/Dockerfile
index 710832e..f72a551 100644
--- a/logan/docker-images/v1.0/oraclelinux/8-slim/Dockerfile
+++ b/logan/docker-images/v1.0/oraclelinux/8-slim/Dockerfile
@@ -11,21 +11,21 @@ USER root
 WORKDIR /fluentd
 
 # Environment variables
-ENV PATH /fluentd/vendor/bundle/ruby/3.1.0/bin:$PATH
-ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.1.0:$GEM_PATH
-ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.1.0
+ENV PATH /fluentd/vendor/bundle/ruby/3.3/bin:$PATH
+ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.3:$GEM_PATH
+ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.3
 # skip runtime bundler installation
 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
 
 COPY Gemfile* /fluentd/
 
 # Install ruby, ruby-libs along with rubygems and bundler.
-RUN microdnf -y module enable ruby:3.1 \
+RUN microdnf -y module enable ruby:3.3 \
 # Install ruby and ruby-libs, disabling week dependencies
  && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby ruby-libs \
 # Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies
  && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems \
- && gem install bundler -v 2.3.25 \
+ && gem install bundler -v 2.5.16 \
 # Install development dependent packages for gems native installation
  && microdnf --enablerepo ol8_codeready_builder -y install --nodocs gcc make redhat-rpm-config openssl ruby-devel gcc-c++ libtool libffi-devel bzip2 git libyaml-devel \
 # Install Fluentd, it's dependencies along with other run time dependencies for OCI Logging Analytics Solution
@@ -50,19 +50,19 @@ USER root
 WORKDIR /fluentd
 
 # Environment variables
-ENV PATH /fluentd/vendor/bundle/ruby/3.1.0/bin:$PATH
-ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.1.0:$GEM_PATH
-ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.1.0
+ENV PATH /fluentd/vendor/bundle/ruby/3.3/bin:$PATH
+ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.3:$GEM_PATH
+ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.3
 # skip runtime bundler installation
 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
 
 # Install ruby, ruby-libs along with rubygems and bundler.
-RUN microdnf -y module enable ruby:3.1 \
+RUN microdnf -y module enable ruby:3.3 \
 # Install ruby and ruby-libs, disabling week dependencies
  && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby ruby-libs \ 
 # Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies
  && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems \ 
- && gem install bundler -v 2.3.25 \
+ && gem install bundler -v 2.5.16 \
  && bundle config --local path /fluentd/vendor/bundle \
 # clear caches
  && microdnf clean all \
diff --git a/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile b/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile
index 6d1be99..6a425a2 100644
--- a/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile
+++ b/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile
@@ -3,16 +3,16 @@
 
 source "https://rubygems.org"
 
-gem "oj", "3.16.1"
-gem "json", "2.7.1"
-gem "fluentd", "1.16.2"
+gem "oj", "3.16.4"
+gem "json", "2.7.2"
+gem "fluentd", "1.17.1"
 gem "fluent-plugin-oci-logging-analytics", "2.0.6"
 gem "fluent-plugin-concat", "~> 2.5.0"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
 gem "fluent-plugin-parser-cri", "~> 0.1.1"
-gem "fluent-plugin-kubernetes_metadata_filter", "3.3.0"
-gem "oci-logging-analytics-kubernetes-discovery", "1.0.1"
-gem "fluent-plugin-record-modifier", "2.1.1"
+gem "fluent-plugin-kubernetes_metadata_filter", "3.5.0"
+gem "oci-logging-analytics-kubernetes-discovery", "1.0.2"
+gem "fluent-plugin-record-modifier", "2.2.0"
 gem "fluent-plugin-cloudwatch-logs", "0.14.3"
 gem "fluent-plugin-s3", "1.7.2"
-gem "rexml", "3.2.6"
+gem "rexml", "3.3.7"
diff --git a/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile.lock b/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile.lock
index 07bd9c6..93382da 100644
--- a/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile.lock
+++ b/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile.lock
@@ -1,167 +1,177 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.813.0)
-    aws-sdk-cloudwatchlogs (1.69.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.181.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.134.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sdk-sqs (1.62.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.6.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-    concurrent-ruby (1.2.3)
-    cool.io (1.8.0)
-    event_stream_parser (1.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    fluent-config-regexp-type (1.0.0)
-      fluentd (> 1.0.0, < 2)
-    fluent-plugin-cloudwatch-logs (0.14.3)
-      aws-sdk-cloudwatchlogs (~> 1.0)
-      fluentd (>= 1.8.0)
-    fluent-plugin-concat (2.5.0)
-      fluentd (>= 0.14.0, < 2)
-    fluent-plugin-kubernetes_metadata_filter (3.3.0)
-      fluentd (>= 0.14.0, < 1.17)
-      kubeclient (>= 4.0.0, < 5.0.0)
-      lru_redux
-    fluent-plugin-oci-logging-analytics (2.0.6)
-      fluentd (>= 0.14.10, < 2)
-      oci (~> 2.16)
-      prometheus-client (~> 4.0)
-      rubyzip (~> 2.3.2)
-      yajl-ruby (~> 1.4, >= 1.4.3)
-    fluent-plugin-parser-cri (0.1.1)
-      fluentd (>= 1)
-    fluent-plugin-record-modifier (2.1.1)
-      fluentd (>= 1.0, < 2)
-    fluent-plugin-rewrite-tag-filter (2.4.0)
-      fluent-config-regexp-type
-      fluentd (>= 0.14.2, < 2)
-    fluent-plugin-s3 (1.7.2)
-      aws-sdk-s3 (~> 1.60)
-      aws-sdk-sqs (~> 1.23)
-      fluentd (>= 0.14.22, < 2)
-    fluentd (1.16.2)
-      bundler
-      cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.9.0)
-      msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.3.2, < 3.0.0)
-      sigdump (~> 0.2.5)
-      strptime (>= 0.2.4, < 1.0.0)
-      tzinfo (>= 1.0, < 3.0)
-      tzinfo-data (~> 1.0)
-      webrick (~> 1.4)
-      yajl-ruby (~> 1.0)
-    http (4.4.1)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-accept (1.7.0)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
-    http-form_data (2.3.0)
-    http-parser (1.2.3)
-      ffi-compiler (>= 1.0, < 2.0)
-    http_parser.rb (0.8.0)
-    inifile (3.0.0)
-    jmespath (1.6.2)
-    json (2.7.1)
-    jsonpath (1.1.4)
-      multi_json
-    jwt (2.7.1)
-    kubeclient (4.9.3)
-      http (>= 3.0, < 5.0)
-      jsonpath (~> 1.0)
-      recursive-open-struct (~> 1.1, >= 1.1.1)
-      rest-client (~> 2.0)
-    lru_redux (1.1.0)
-    mime-types (3.5.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1003)
-    msgpack (1.7.2)
-    multi_json (1.15.0)
-    netrc (0.11.0)
-    oci (2.21.0)
-      event_stream_parser (~> 1.0.0)
-      inifile (~> 3.0, >= 3.0.0)
-      json (>= 1.4.6, < 3.0.0)
-      jwt (~> 2.1)
-      psych (>= 5.0.1, < 5.1.2)
-    oci-logging-analytics-kubernetes-discovery (1.0.1)
-      concurrent-ruby (~> 1.2.2)
-      kubeclient (~> 4.9.3)
-      oci (~> 2.20)
-      rubyzip (~> 2.3.2)
-      yajl-ruby (~> 1.0)
-    oj (3.16.1)
-    prometheus-client (4.0.0)
-    psych (5.0.1)
-      stringio
-    public_suffix (5.0.3)
-    rake (13.0.6)
-    recursive-open-struct (1.1.3)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rexml (3.2.6)
-    rubyzip (2.3.2)
-    serverengine (2.3.2)
-      sigdump (~> 0.2.2)
-    sigdump (0.2.5)
-    stringio (3.1.0)
-    strptime (0.2.5)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.3)
-      tzinfo (>= 1.0.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    webrick (1.8.1)
-    yajl-ruby (1.4.3)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  fluent-plugin-cloudwatch-logs (= 0.14.3)
-  fluent-plugin-concat (~> 2.5.0)
-  fluent-plugin-kubernetes_metadata_filter (= 3.3.0)
-  fluent-plugin-oci-logging-analytics (= 2.0.6)
-  fluent-plugin-parser-cri (~> 0.1.1)
-  fluent-plugin-record-modifier (= 2.1.1)
-  fluent-plugin-rewrite-tag-filter (~> 2.4.0)
-  fluent-plugin-s3 (= 1.7.2)
-  fluentd (= 1.16.2)
-  json (= 2.7.1)
-  oci-logging-analytics-kubernetes-discovery (= 1.0.1)
-  oj (= 3.16.1)
-  rexml (= 3.2.6)
-
-BUNDLED WITH
-   2.3.25
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.958.0)
+    aws-sdk-cloudwatchlogs (1.87.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-core (3.201.3)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-sqs (1.80.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.9.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.3)
+    cool.io (1.8.1)
+    csv (3.3.0)
+    domain_name (0.6.20240107)
+    drb (2.2.1)
+    event_stream_parser (1.0.0)
+    ffi (1.15.5)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.15.5)
+      rake
+    fluent-config-regexp-type (1.0.0)
+      fluentd (> 1.0.0, < 2)
+    fluent-plugin-cloudwatch-logs (0.14.3)
+      aws-sdk-cloudwatchlogs (~> 1.0)
+      fluentd (>= 1.8.0)
+    fluent-plugin-concat (2.5.0)
+      fluentd (>= 0.14.0, < 2)
+    fluent-plugin-kubernetes_metadata_filter (3.5.0)
+      fluentd (>= 0.14.0, < 1.18)
+      kubeclient (>= 4.0.0, < 5.0.0)
+      lru_redux
+    fluent-plugin-oci-logging-analytics (2.0.6)
+      fluentd (>= 0.14.10, < 2)
+      oci (~> 2.16)
+      prometheus-client (~> 4.0)
+      rubyzip (~> 2.3.2)
+      yajl-ruby (~> 1.4, >= 1.4.3)
+    fluent-plugin-parser-cri (0.1.1)
+      fluentd (>= 1)
+    fluent-plugin-record-modifier (2.2.0)
+      fluentd (>= 1.1, < 2)
+    fluent-plugin-rewrite-tag-filter (2.4.0)
+      fluent-config-regexp-type
+      fluentd (>= 0.14.2, < 2)
+    fluent-plugin-s3 (1.7.2)
+      aws-sdk-s3 (~> 1.60)
+      aws-sdk-sqs (~> 1.23)
+      fluentd (>= 0.14.22, < 2)
+    fluentd (1.17.1)
+      base64 (~> 0.2)
+      bundler
+      cool.io (>= 1.4.5, < 2.0.0)
+      csv (~> 3.2)
+      drb (~> 2.2)
+      http_parser.rb (>= 0.5.1, < 0.9.0)
+      logger (~> 1.6)
+      msgpack (>= 1.3.1, < 2.0.0)
+      serverengine (>= 2.3.2, < 3.0.0)
+      sigdump (~> 0.2.5)
+      strptime (>= 0.2.4, < 1.0.0)
+      tzinfo (>= 1.0, < 3.0)
+      tzinfo-data (~> 1.0)
+      webrick (~> 1.4)
+      yajl-ruby (~> 1.0)
+    http (5.2.0)
+      addressable (~> 2.8)
+      base64 (~> 0.1)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.5.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.6)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    http_parser.rb (0.8.0)
+    inifile (3.0.0)
+    jmespath (1.6.2)
+    json (2.7.2)
+    jsonpath (1.1.5)
+      multi_json
+    jwt (2.8.2)
+      base64
+    kubeclient (4.12.0)
+      http (>= 3.0, < 6.0)
+      jsonpath (~> 1.0)
+      recursive-open-struct (~> 1.1, >= 1.1.1)
+      rest-client (~> 2.0)
+    llhttp-ffi (0.5.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
+    logger (1.6.1)
+    lru_redux (1.1.0)
+    mime-types (3.5.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2024.0702)
+    msgpack (1.7.2)
+    multi_json (1.15.0)
+    netrc (0.11.0)
+    oci (2.21.1)
+      event_stream_parser (~> 1.0.0)
+      inifile (~> 3.0, >= 3.0.0)
+      json (>= 1.4.6, < 3.0.0)
+      jwt (~> 2.1)
+      psych (~> 5.0, >= 5.0.1)
+    oci-logging-analytics-kubernetes-discovery (1.0.2)
+      concurrent-ruby (~> 1.2, >= 1.2.2)
+      kubeclient (~> 4.9, >= 4.9.3)
+      oci (~> 2.20)
+      rubyzip (~> 2.3.2)
+      yajl-ruby (~> 1.0)
+    oj (3.16.4)
+      bigdecimal (>= 3.0)
+    prometheus-client (4.2.3)
+      base64
+    psych (5.1.2)
+      stringio
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    recursive-open-struct (1.2.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rexml (3.3.7)
+    rubyzip (2.3.2)
+    serverengine (2.3.2)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.5)
+    stringio (3.1.1)
+    strptime (0.2.5)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2024.1)
+      tzinfo (>= 1.0.0)
+    webrick (1.8.1)
+    yajl-ruby (1.4.3)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  fluent-plugin-cloudwatch-logs (= 0.14.3)
+  fluent-plugin-concat (~> 2.5.0)
+  fluent-plugin-kubernetes_metadata_filter (= 3.5.0)
+  fluent-plugin-oci-logging-analytics (= 2.0.6)
+  fluent-plugin-parser-cri (~> 0.1.1)
+  fluent-plugin-record-modifier (= 2.2.0)
+  fluent-plugin-rewrite-tag-filter (~> 2.4.0)
+  fluent-plugin-s3 (= 1.7.2)
+  fluentd (= 1.17.1)
+  json (= 2.7.2)
+  oci-logging-analytics-kubernetes-discovery (= 1.0.2)
+  oj (= 3.16.4)
+  rexml (= 3.3.7)
+
+BUNDLED WITH
+   2.5.16