diff --git a/charts/ocean-kubernetes-controller/Chart.yaml b/charts/ocean-kubernetes-controller/Chart.yaml
index ea6a394..bc8f3a1 100644
--- a/charts/ocean-kubernetes-controller/Chart.yaml
+++ b/charts/ocean-kubernetes-controller/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: ocean-kubernetes-controller
 description: A Helm chart for Ocean Kubernetes Controller
 type: application
-version: 0.1.53
+version: 0.1.54
 appVersion: 2.0.65
 kubeVersion: ">=1.20.0-0"
 maintainers:
diff --git a/charts/ocean-kubernetes-controller/README.md b/charts/ocean-kubernetes-controller/README.md
index 44c492d..d212839 100644
--- a/charts/ocean-kubernetes-controller/README.md
+++ b/charts/ocean-kubernetes-controller/README.md
@@ -1,6 +1,6 @@
 # ocean-kubernetes-controller
 
-![Version: 0.1.53](https://img.shields.io/badge/Version-0.1.53-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.65](https://img.shields.io/badge/AppVersion-2.0.65-informational?style=flat-square)
+![Version: 0.1.54](https://img.shields.io/badge/Version-0.1.54-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.65](https://img.shields.io/badge/AppVersion-2.0.65-informational?style=flat-square)
 
 A Helm chart for Ocean Kubernetes Controller.
 
diff --git a/charts/ocean-kubernetes-controller/templates/_helpers.tpl b/charts/ocean-kubernetes-controller/templates/_helpers.tpl
index 1f3e477..1b0e5ac 100644
--- a/charts/ocean-kubernetes-controller/templates/_helpers.tpl
+++ b/charts/ocean-kubernetes-controller/templates/_helpers.tpl
@@ -199,17 +199,6 @@ Controller affinity
 {{- end }}
 {{- end }}
 
-{{/*
-Controller tolerations
-*/}}
-{{- define "ocean-kubernetes-controller.tolerations" -}}
-{{- if kindIs "invalid" .Values.tolerations -}}
-{{- include "ocean-kubernetes-controller.defaultTolerations" . }}
-{{- else }}
-{{- .Values.tolerations | toYaml -}}
-{{- end }}
-{{- end }}
-
 {{/*
 Controller topology spread constraints
 */}}
@@ -352,4 +341,4 @@ or if another log shipping destination host is specified.
 true
 {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/ocean-kubernetes-controller/templates/deployment.yaml b/charts/ocean-kubernetes-controller/templates/deployment.yaml
index 8c464ec..a937455 100644
--- a/charts/ocean-kubernetes-controller/templates/deployment.yaml
+++ b/charts/ocean-kubernetes-controller/templates/deployment.yaml
@@ -241,7 +241,14 @@ spec:
       {{- end }}
       affinity:
         {{- include "ocean-kubernetes-controller.affinity" . | nindent 8 }}
+      {{- if kindIs "invalid" .Values.tolerations }}
       tolerations:
-        {{- include "ocean-kubernetes-controller.tolerations" . | nindent 6 }}
+        {{- include "ocean-kubernetes-controller.defaultTolerations" . | nindent 6 }}
+      {{- else }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- . | toYaml | nindent 6 }}
+      {{- end }}
+      {{- end }}
       topologySpreadConstraints:
         {{- include "ocean-kubernetes-controller.topologySpreadConstraints" . | nindent 6 }}