diff --git a/helm-chart/templates/04-hub-deployment.yaml b/helm-chart/templates/04-hub-deployment.yaml
index cf6ff5162..659d11eea 100644
--- a/helm-chart/templates/04-hub-deployment.yaml
+++ b/helm-chart/templates/04-hub-deployment.yaml
@@ -29,7 +29,9 @@ spec:
         - name: kubeshark-hub
           command:
             - ./hub
-            {{ .Values.tap.debug | ternary "- -debug" "" }}
+          {{- if .Values.tap.debug }}
+            - -debug
+          {{- end }}
           env:
           - name: POD_NAME
             valueFrom:
diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml
index 4c5d6b692..97f4785cb 100644
--- a/helm-chart/templates/09-worker-daemon-set.yaml
+++ b/helm-chart/templates/09-worker-daemon-set.yaml
@@ -32,11 +32,17 @@ spec:
             - any
             - -port
             - '{{ .Values.tap.proxy.worker.srvport }}'
-            {{ .Values.tap.servicemesh | ternary "- -servicemesh" "" }}
+          {{- if .Values.tap.servicemesh }}
+            - -servicemesh
+          {{- end }}
             - -procfs
             - /hostproc
-            {{ .Values.tap.debug | ternary "- -debug" "" }}
-            {{ .Values.tap.nokernelmodule | ternary "- -no-kernel-module" "" }}
+          {{- if .Values.tap.debug }}
+            - -debug
+          {{- end }}
+          {{- if .Values.tap.nokernelmodule }}
+            - -no-kernel-module
+          {{- end }}
           image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.tag }}'
           imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }}
           name: sniffer
@@ -98,7 +104,9 @@ spec:
             - ./tracer
             - -procfs
             - /hostproc
-            {{ .Values.tap.debug | ternary "- -debug" "" }}
+          {{- if .Values.tap.debug }}
+            - -debug
+          {{- end }}
           image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.tag }}'
           imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }}
           name: tracer