diff --git a/charts/bigdata-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml
index 6f28bd8..144929e 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.21
+version: 0.5.22
 appVersion: 0.5.4
 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 9695a99..288f813 100644
--- a/charts/bigdata-spark-watcher/templates/deployment.yaml
+++ b/charts/bigdata-spark-watcher/templates/deployment.yaml
@@ -60,10 +60,33 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- with .Values.envVars }}
           env:
-          {{- toYaml . | nindent 12 }}
-          {{- end }}
+            - name: SPOTINST_BASE_URL
+              value: {{ .Values.spotBaseUrl }}
+            - name: APP_SYNC_PERIOD
+              value: {{ .Values.appSyncPeriod }}
+            - name: APP_SYNC_KILL_GRACE_PERIOD
+              value: {{ .Values.appSyncKillGracePeriod }}
+            - name: APP_SYNC_GHOST_GRACE_PERIOD
+              value: {{ .Values.appSyncKillGhostGracePeriod }}
+            - name: APP_SYNC_REVERSE_GHOST_GRACE_PERIOD
+              value: {{ .Values.appSyncReverseGhostGracePeriod }}
+            - name: KUBE_EVENT_LOG_COLLECTION_BUCKET_PREFIX
+              value: {{ .Values.k8sEventLogCollector.bucketPrefix }}
+            - name: KUBE_EVENT_LOG_COLLECTION_ENVIRONMENT
+              value: {{ .Values.k8sEventLogCollector.environment }}
+            - name: AWS_CREDENTIALS_FILE
+              value: /creds/aws
+            - name: GCP_CREDENTIALS_FILE
+              value: /creds/gcp
+            - name: AZURE_CREDENTIALS_FILE
+              value: /creds/azure
+            - name: CREDS_REFRESH_INTERVAL
+              value: 2m
+            - name: SPARK_APP_FAILED_EXECUTOR_LIMIT
+              value: {{ .Values.sparkAppFailedExecutorLimit | quote }}
+            - name: SPARK_APP_TERMINATED_CRITICAL_SIDECAR_GRACE_PERIOD
+              value: {{ .Values.sparkAppTerminatedCriticalSidecarGracePeriod }}
             - name: HTTP_PROXY
               valueFrom:
                 configMapKeyRef:
diff --git a/charts/bigdata-spark-watcher/values.yaml b/charts/bigdata-spark-watcher/values.yaml
index 0afbe62..b57d346 100644
--- a/charts/bigdata-spark-watcher/values.yaml
+++ b/charts/bigdata-spark-watcher/values.yaml
@@ -16,31 +16,7 @@ imagePullSecrets:
 nameOverride: ""
 fullnameOverride: ""
 
-envVars:
-  - name: SPOTINST_BASE_URL
-    value: https://api.spotinst.io
-  - name: APP_SYNC_PERIOD
-    value: 5m
-  - name: APP_SYNC_KILL_GRACE_PERIOD
-    value: 5m
-  - name: APP_SYNC_GHOST_GRACE_PERIOD
-    value: 6m
-  - name: APP_SYNC_REVERSE_GHOST_GRACE_PERIOD
-    value: 30s
-  - name: KUBE_EVENT_LOG_COLLECTION_BUCKET_PREFIX
-    value: "spot-bigdata-logcollector"
-  - name: AWS_CREDENTIALS_FILE
-    value: /creds/aws
-  - name: GCP_CREDENTIALS_FILE
-    value: /creds/gcp
-  - name: AZURE_CREDENTIALS_FILE
-    value: /creds/azure
-  - name: CREDS_REFRESH_INTERVAL
-    value: 2m
-  - name: SPARK_APP_FAILED_EXECUTOR_LIMIT
-    value: "200"
-  - name: SPARK_APP_TERMINATED_CRITICAL_SIDECAR_GRACE_PERIOD
-    value: 3m
+spotBaseUrl: "https://api.spotinst.io"
 
 # Spark Application watch label - used to select sparkApplication custom resources
 saWatchLabel: ""
@@ -53,7 +29,18 @@ logLevel: debug
 
 killSyncerEnabled: true
 ghostSyncerEnabled: true
+
+appSyncKillGracePeriod: 5m
+appSyncKillGhostGracePeriod: 5m
+appSyncReverseGhostGracePeriod: 30s
+appSyncPeriod: 5m
+sparkAppFailedExecutorLimit: 200
+sparkAppTerminatedCriticalSidecarGracePeriod: 3m
+
 k8sEventLogCollectorEnabled: true
+k8sEventLogCollector:
+  bucketPrefix: "spot-bigdata-logcollector"
+  environment: ""
 
 serviceAccount:
   create: true