diff --git a/charts/bigdata-spark-watcher/templates/deployment.yaml b/charts/bigdata-spark-watcher/templates/deployment.yaml
index 2e0d19a6..eeaceb4f 100644
--- a/charts/bigdata-spark-watcher/templates/deployment.yaml
+++ b/charts/bigdata-spark-watcher/templates/deployment.yaml
@@ -31,6 +31,8 @@ spec:
       containers:
         - name: manager
           args:
+          - --enable-event-log-collector
+          - {{ .Values.eventLogCollectorEnabled}}
           - --metrics-bind-address
           - ":8080"
           - --watch-label
diff --git a/charts/bigdata-spark-watcher/values.yaml b/charts/bigdata-spark-watcher/values.yaml
index 1ad3db2a..473e7273 100644
--- a/charts/bigdata-spark-watcher/values.yaml
+++ b/charts/bigdata-spark-watcher/values.yaml
@@ -27,10 +27,8 @@ envVars:
     value: 6m
   - name: APP_SYNC_REVERSE_GHOST_GRACE_PERIOD
     value: 30s
-  - name: KUBE_EVENT_LOG_COLLECTION_BUCKET
-    value: "spot-bigdata-logcollector-"
-  - name: KUBE_EVENT_LOG_COLLECTION_ENABLED
-    value: "true"
+  - name: KUBE_EVENT_LOG_COLLECTION_BUCKET_PREFIX
+    value: "spot-bigdata-logcollector"
   - name: CREDS_REFRESH_INTERVAL
     value: 5m
   - name: SPARK_APP_FAILED_EXECUTOR_LIMIT
@@ -77,6 +75,9 @@ resources:
     cpu: 2000m
     memory: 2000Mi
 
+eventLogCollectorEnabled:
+  true
+
 telemetry:
   enabled: false
   fluentbit: