diff --git a/charts/logan/Chart.yaml b/charts/logan/Chart.yaml
index d8e0fd0..378679d 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.5.3
+version: 3.5.4
 appVersion: "3.0.0"
 
 dependencies:
diff --git a/charts/logan/templates/_helpers.tpl b/charts/logan/templates/_helpers.tpl
index 1518d17..8dc9a14 100644
--- a/charts/logan/templates/_helpers.tpl
+++ b/charts/logan/templates/_helpers.tpl
@@ -50,4 +50,4 @@
   {{- else -}}
     {{- "UNDEFINED" -}}
   {{- end -}}
-{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/logan/templates/discovery-cronjob.yaml b/charts/logan/templates/discovery-cronjob.yaml
index 85969fc..f47084b 100644
--- a/charts/logan/templates/discovery-cronjob.yaml
+++ b/charts/logan/templates/discovery-cronjob.yaml
@@ -22,6 +22,10 @@ spec:
         spec:
           restartPolicy: {{ .Values.k8sDiscovery.objects.restartPolicy }}
           serviceAccountName: {{ $serviceAccount }}
+          {{- if .Values.tolerations }}
+          tolerations:
+            {{- toYaml .Values.tolerations | nindent 12 }}
+          {{- end }}
           {{- if .Values.image.imagePullSecrets }}
           imagePullSecrets:
           - name: {{ .Values.image.imagePullSecrets }}
diff --git a/charts/logan/templates/fluentd-daemonset.yaml b/charts/logan/templates/fluentd-daemonset.yaml
index 3338789..172c5d7 100644
--- a/charts/logan/templates/fluentd-daemonset.yaml
+++ b/charts/logan/templates/fluentd-daemonset.yaml
@@ -35,6 +35,9 @@ spec:
         effect: NoSchedule
       - key: node-role.kubernetes.io/control-plane
         effect: NoSchedule
+      {{- if .Values.tolerations }}
+        {{- toYaml .Values.tolerations | nindent 6 }}
+      {{- end }}
       {{- if $imagePullSecrets }}
       imagePullSecrets:
       - name: {{ .Values.image.imagePullSecrets }}
diff --git a/charts/logan/templates/fluentd-deployment.yaml b/charts/logan/templates/fluentd-deployment.yaml
index 251a6eb..9c8b174 100644
--- a/charts/logan/templates/fluentd-deployment.yaml
+++ b/charts/logan/templates/fluentd-deployment.yaml
@@ -31,6 +31,10 @@ spec:
         version: v1
     spec:
       serviceAccountName: {{ include "logan.serviceAccount" . }}
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
       {{- if $imagePullSecrets }}
       imagePullSecrets:
       - name: {{ .Values.image.imagePullSecrets }}
diff --git a/charts/logan/values.yaml b/charts/logan/values.yaml
index aab5796..d49f8dd 100644
--- a/charts/logan/values.yaml
+++ b/charts/logan/values.yaml
@@ -77,6 +77,9 @@ kubernetesClusterName:
 # e.g. ocid1.loganalyticsentity.oc1.phx.amaaaaaabulluiqabqeq4delvhdlmd7aqcjrdla57n2szsxyz7pfdvnhwuua
 ociLAClusterEntityID:
 
+# Add custom Tolerations for resources
+tolerations: 
+
 # -- Kubernetes Security Context privileged flag
 # Default: 'false'. This is not a required for OKE clusters.
 # In Kubernetes environments where SELinux mode is enforced, set this flag to 'true' to allow fluentd pods to access log files.
diff --git a/charts/mgmt-agent/Chart.yaml b/charts/mgmt-agent/Chart.yaml
index cf5ab74..c8d77f7 100644
--- a/charts/mgmt-agent/Chart.yaml
+++ b/charts/mgmt-agent/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.0.4
+version: 3.0.5
 
 # 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
diff --git a/charts/mgmt-agent/templates/_helpers.tpl b/charts/mgmt-agent/templates/_helpers.tpl
index 1bb7162..a483b0c 100644
--- a/charts/mgmt-agent/templates/_helpers.tpl
+++ b/charts/mgmt-agent/templates/_helpers.tpl
@@ -40,4 +40,4 @@
   {{- else -}}
     {{- "UNDEFINED" -}}
   {{- end -}}
-{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/mgmt-agent/templates/metric_server.yaml b/charts/mgmt-agent/templates/metric_server.yaml
index e8c11fb..bee0620 100644
--- a/charts/mgmt-agent/templates/metric_server.yaml
+++ b/charts/mgmt-agent/templates/metric_server.yaml
@@ -135,6 +135,10 @@ spec:
       labels:
         k8s-app: metrics-server
     spec:
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
       containers:
       - args:
         - --cert-dir=/tmp
diff --git a/charts/mgmt-agent/templates/mgmt-agent-daemonset.yaml b/charts/mgmt-agent/templates/mgmt-agent-daemonset.yaml
index b0f6b79..83afbdf 100644
--- a/charts/mgmt-agent/templates/mgmt-agent-daemonset.yaml
+++ b/charts/mgmt-agent/templates/mgmt-agent-daemonset.yaml
@@ -22,6 +22,10 @@ spec:
       labels:
         app: {{ include "mgmt-agent.resourceNamePrefix" . }}-mgmt-agent
     spec:
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
       securityContext:
         runAsUser: {{ default 0 .Values.deployment.security.runAsUser }}
         runAsGroup: {{ default 0 .Values.deployment.security.runAsGroup }}
diff --git a/charts/mgmt-agent/templates/mgmt-agent-statefulset.yaml b/charts/mgmt-agent/templates/mgmt-agent-statefulset.yaml
index 5cf8da1..20bcb90 100644
--- a/charts/mgmt-agent/templates/mgmt-agent-statefulset.yaml
+++ b/charts/mgmt-agent/templates/mgmt-agent-statefulset.yaml
@@ -23,6 +23,10 @@ spec:
       labels:
         app: {{ include "mgmt-agent.resourceNamePrefix" . }}-mgmt-agent
     spec:
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
       securityContext:
         runAsUser: {{ default 0 .Values.deployment.security.runAsUser }}
         runAsGroup: {{ default 0 .Values.deployment.security.runAsGroup }}
diff --git a/charts/mgmt-agent/values.yaml b/charts/mgmt-agent/values.yaml
index 0ac47f8..7436db2 100644
--- a/charts/mgmt-agent/values.yaml
+++ b/charts/mgmt-agent/values.yaml
@@ -49,6 +49,9 @@ serviceAccount: "{{ .Values.global.resourceNamePrefix }}"
 # -- By default, metric server will be deployed and used by Management Agent to collect metrics. You can set this to false if you already have metric server installed on your cluster
 deployMetricServer: true
 
+# Add custom Tolerations for resources
+tolerations: 
+
 # Kubernetes Cluster details to monitor
 kubernetesCluster:
    # -- OCI Compartment Id to push Kubernetes Monitoring metrics. If not specified default is same as Agent compartment
diff --git a/charts/oci-onm/Chart.yaml b/charts/oci-onm/Chart.yaml
index f130703..d1c713b 100644
--- a/charts/oci-onm/Chart.yaml
+++ b/charts/oci-onm/Chart.yaml
@@ -32,10 +32,10 @@ dependencies:
   repository: "file://../common"
   condition: oci-onm-common.enabled
 - name: oci-onm-logan
-  version: "3.5.3"
+  version: "3.5.4"
   repository: "file://../logan"
   condition: oci-onm-logan.enabled
 - name: oci-onm-mgmt-agent
-  version: "3.0.4"
+  version: "3.0.5"
   repository: "file://../mgmt-agent"
   condition: oci-onm-mgmt-agent.enabled
diff --git a/charts/oci-onm/values.yaml b/charts/oci-onm/values.yaml
index 88faf3c..8ab52d5 100644
--- a/charts/oci-onm/values.yaml
+++ b/charts/oci-onm/values.yaml
@@ -42,12 +42,16 @@ oci-onm-logan:
   # Format: <oci-region>.oci.<oci_domain>
   # Example: us-ashburn-1.oci.oraclecloud.com
   ociDomain:
+  # Add custom Tolerations for resources
+  tolerations: 
 
 oci-onm-mgmt-agent:
   oci-onm-common:
     enabled: false
   namespace: "{{ .Values.global.namespace }}"
   serviceAccount: "{{ .Values.global.resourceNamePrefix }}"
+  # Add custom Tolerations for resources
+  tolerations: 
   kubernetesCluster:
     name: "{{ .Values.global.kubernetesClusterName }}"
   mgmtagent: