diff --git a/charts/dispatch/Chart.yaml b/charts/dispatch/Chart.yaml
index acebc10..e92ea5d 100644
--- a/charts/dispatch/Chart.yaml
+++ b/charts/dispatch/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: dispatch
 description: Netflix Dispatch incident management system
-version: 0.1.6
+version: 0.1.8
diff --git a/charts/dispatch/templates/scheduler-deployment.yaml b/charts/dispatch/templates/scheduler-deployment.yaml
index 84c19fc..633fd50 100644
--- a/charts/dispatch/templates/scheduler-deployment.yaml
+++ b/charts/dispatch/templates/scheduler-deployment.yaml
@@ -19,7 +19,7 @@ spec:
         - name: scheduler
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command: {{ .Values.scheduler.command }}
+          command: {{ .Values.scheduler.container.command }}
           envFrom:
             - secretRef:
                 name: {{ .Values.scheduler.container.envFrom.secretRef.name }}
diff --git a/charts/dispatch/templates/web-deployment.yaml b/charts/dispatch/templates/web-deployment.yaml
index 4c46e2a..4a1ffd3 100644
--- a/charts/dispatch/templates/web-deployment.yaml
+++ b/charts/dispatch/templates/web-deployment.yaml
@@ -23,7 +23,7 @@ spec:
         - name: web
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command: {{ .Values.web.command }}
+          command: {{ .Values.web.container.command }}
           ports:
             - containerPort: {{ .Values.web.container.port }}
           envFrom:
diff --git a/charts/dispatch/values.yaml b/charts/dispatch/values.yaml
index dfd0d9a..02eb060 100644
--- a/charts/dispatch/values.yaml
+++ b/charts/dispatch/values.yaml
@@ -14,8 +14,10 @@ initContainers:
 
 core:
   enabled: true
-  secretRef:
-    name: dispatch-secret
+  container:
+    envFrom:
+      secretRef:
+        name: dispatch-secret
 
 web:
   enabled: true
@@ -31,9 +33,8 @@ web:
 
 scheduler:
   enabled: true
-  command: ["dispatch", "scheduler", "start"]
   container:
-    command: ["dispatch", "scheduler"]
+    command: ["dispatch", "scheduler", "start"]
     envFrom:
       secretRef:
         name: dispatch-secret