diff --git a/charts/das/Chart.yaml b/charts/das/Chart.yaml
index 498140b..7868cf3 100644
--- a/charts/das/Chart.yaml
+++ b/charts/das/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
 
 type: application
 
-version: 0.5.20
+version: 0.5.21
 
 appVersion: "v3.5.5-90ee45c"
diff --git a/charts/das/templates/statefulset.yaml b/charts/das/templates/statefulset.yaml
index a34fa33..2dccb11 100644
--- a/charts/das/templates/statefulset.yaml
+++ b/charts/das/templates/statefulset.yaml
@@ -69,12 +69,8 @@ spec:
           command: ["sleep"]
           args: ["infinity"]
           {{- else if .Values.commandOverride.enabled }}
-          {{- with .Values.commandOverride.command }}
-          command: {{- toYaml . | nindent 8}}
-          {{- end }}
-          {{- with .Values.commandOverride.args }}
-          args: {{- toYaml . | nindent 8 }}
-          {{- end }}
+          command: {{ .Values.commandOverride.command | toJson }}
+          args: {{ .Values.commandOverride.args | toJson }}
           {{- else }}
           command: [/usr/local/bin/daserver]
           args:
@@ -87,6 +83,7 @@ spec:
             {{- range $key, $value := .Values.customArgs }}
             - --{{ $key }}={{ $value | quote }}
             {{- end }}
+          {{- end }}
           ports:
             {{- if and .Values.configmap.data.http .Values.configmap.data.http.port}}
             - name: http-rpc
@@ -194,7 +191,6 @@ spec:
           {{- with .Values.extraEnv }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- end }}
           lifecycle:
           {{- include "das.lifecycle" . | nindent 12 }}
           {{- with .Values.lifecycle }}
diff --git a/charts/nitro/Chart.yaml b/charts/nitro/Chart.yaml
index 0c96689..c301462 100644
--- a/charts/nitro/Chart.yaml
+++ b/charts/nitro/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
 
 type: application
 
-version: 0.6.32
+version: 0.6.33
 
 appVersion: "v3.5.5-90ee45c"
diff --git a/charts/nitro/templates/statefulset.yaml b/charts/nitro/templates/statefulset.yaml
index e4336d1..68c8fa9 100644
--- a/charts/nitro/templates/statefulset.yaml
+++ b/charts/nitro/templates/statefulset.yaml
@@ -63,12 +63,8 @@ spec:
           command: ["sleep"]
           args: ["infinity"]
           {{- else if .Values.commandOverride.enabled }}
-          {{- with .Values.commandOverride.command }}
-          command: {{- toYaml . | nindent 8}}
-          {{- end }}
-          {{- with .Values.commandOverride.args }}
-          args: {{- toYaml . | nindent 8 }}
-          {{- end }}
+          command: {{ .Values.commandOverride.command | toJson }}
+          args: {{ .Values.commandOverride.args | toJson }}
           {{- else }}
           command: [/usr/local/bin/nitro]
           args:
@@ -81,6 +77,7 @@ spec:
             {{- if .Values.customArgs }}
             {{- include "nitro.customArgs" . | nindent 12 }}
             {{- end }}
+          {{- end }}
           ports:
             {{- if and .Values.configmap.data.http .Values.configmap.data.http.port}}
             - name: http-rpc
@@ -138,7 +135,6 @@ spec:
             failureThreshold: {{ .Values.startupProbe.failureThreshold }}
             periodSeconds: {{ .Values.startupProbe.periodSeconds }}
           {{- end }}
-          {{- end }}
           env:
             - name: POD_NAME
               valueFrom:
diff --git a/charts/relay/Chart.yaml b/charts/relay/Chart.yaml
index 14fd7fc..c282cb3 100644
--- a/charts/relay/Chart.yaml
+++ b/charts/relay/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
 
 type: application
 
-version: 0.5.17
+version: 0.5.18
 
 appVersion: "v3.5.5-90ee45c"
diff --git a/charts/relay/templates/deployment.yaml b/charts/relay/templates/deployment.yaml
index b4b1431..735cca5 100644
--- a/charts/relay/templates/deployment.yaml
+++ b/charts/relay/templates/deployment.yaml
@@ -43,12 +43,8 @@ spec:
           command: ["sleep"]
           args: ["infinity"]
           {{- else if .Values.commandOverride.enabled }}
-          {{- with .Values.commandOverride.command }}
-          command: {{- toYaml . | nindent 8}}
-          {{- end }}
-          {{- with .Values.commandOverride.args }}
-          args: {{- toYaml . | nindent 8 }}
-          {{- end }}
+          command: {{ .Values.commandOverride.command | toJson }}
+          args: {{ .Values.commandOverride.args | toJson }}
           {{- else }}
           command: [/usr/local/bin/relay]
           args:
@@ -61,6 +57,7 @@ spec:
             {{- range $key, $value := .Values.customArgs }}
             - --{{ $key }}={{ $value | quote }}
             {{- end }}
+          {{- end }}
           ports:
             {{- if and .Values.configmap.data.node .Values.configmap.data.node.feed .Values.configmap.data.node.feed.output .Values.configmap.data.node.feed.output.port }}
             - name: feed
@@ -101,7 +98,6 @@ spec:
           {{- with .Values.extraEnv }}
           {{- toYaml . | nindent 8 }}
           {{- end }}
-          {{- end }}
           lifecycle:
           {{- include "relay.lifecycle" . | nindent 12 }}
           {{- with .Values.lifecycle }}