diff --git a/charts/bigdata-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml
index 4c894c91..8ea54ade 100644
--- a/charts/bigdata-spark-watcher/Chart.yaml
+++ b/charts/bigdata-spark-watcher/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-spark-watcher
 description: A Helm chart for the Spot Big Data Spark Watcher
 type: application
-version: 0.5.3
+version: 0.5.4
 appVersion: 0.4.6
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-spark-watcher/templates/deployment.yaml b/charts/bigdata-spark-watcher/templates/deployment.yaml
index 92f11ed7..3590b14c 100644
--- a/charts/bigdata-spark-watcher/templates/deployment.yaml
+++ b/charts/bigdata-spark-watcher/templates/deployment.yaml
@@ -42,10 +42,12 @@ spec:
           - --replica-count
           - "{{ .Values.replicaTagger.replicaCount }}"
           {{- end }}
+          {{- if .Values.ghostSyncerEnabled }}
           - --enable-ghost-syncer
-          - "{{ .Values.ghostSyncerEnabled}}"
+          {{- end }}
+          {{- if .Values.killSyncerEnabled }}
           - --enable-kill-syncer
-          - "{{ .Values.killSyncerEnabled}}"
+          {{- end }}
           ports:
           - name: metrics
             containerPort: 8080
diff --git a/charts/bigdata-spark-watcher/values.yaml b/charts/bigdata-spark-watcher/values.yaml
index 2019d0cb..e6542553 100644
--- a/charts/bigdata-spark-watcher/values.yaml
+++ b/charts/bigdata-spark-watcher/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: 066597193667.dkr.ecr.us-east-1.amazonaws.com/private/bigdata-spark-watcher
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.4.6-58dc6e61
+  tag: 0.4.6-80ff0942
 
 imagePullSecrets:
   - name: spot-bigdata-image-pull