diff --git a/charts/podinfo/templates/configmap.yaml b/charts/podinfo/templates/configmap.yaml
new file mode 100644
index 000000000..a93748fda
--- /dev/null
+++ b/charts/podinfo/templates/configmap.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "podinfo.fullname" . }}
+  labels:
+    app: {{ template "podinfo.name" . }}
+    chart: {{ template "podinfo.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  config.yaml: |-
+    # http settings
+    http-client-timeout: 1m
+    http-server-timeout: 30s
+    http-server-shutdown-timeout: 5s
diff --git a/charts/podinfo/templates/deployment.yaml b/charts/podinfo/templates/deployment.yaml
index 20a6751e6..5eec44ad7 100644
--- a/charts/podinfo/templates/deployment.yaml
+++ b/charts/podinfo/templates/deployment.yaml
@@ -33,6 +33,7 @@ spec:
             - --level={{ .Values.logLevel }}
             - --random-delay={{ .Values.faults.delay }}
             - --random-error={{ .Values.faults.error }}
+            - --config-path=/podinfo/config
           env:
           {{- if .Values.message }}
           - name: PODINFO_UI_MESSAGE
@@ -67,6 +68,9 @@ spec:
           volumeMounts:
           - name: data
             mountPath: /data
+          - name: config
+            mountPath: /podinfo/config
+            readOnly: true
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}
@@ -84,3 +88,6 @@ spec:
       volumes:
       - name: data
         emptyDir: {}
+      - name: config
+        configMap:
+          name: {{ template "podinfo.fullname" . }}
diff --git a/charts/podinfo/templates/hpa.yaml b/charts/podinfo/templates/hpa.yaml
index dcb36d3a4..9905cda64 100644
--- a/charts/podinfo/templates/hpa.yaml
+++ b/charts/podinfo/templates/hpa.yaml
@@ -3,6 +3,11 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "podinfo.fullname" . }}
+  labels:
+    app: {{ template "podinfo.name" . }}
+    chart: {{ template "podinfo.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1beta2
diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml
index 3768d6180..3240abe54 100644
--- a/charts/podinfo/values.yaml
+++ b/charts/podinfo/values.yaml
@@ -25,7 +25,7 @@ canary:
     host:
   analysis:
     # schedule interval (default 60s)
-    interval: 15s
+    interval: 10s
     # max number of failed metric checks before rollback
     threshold: 10
     # max traffic percentage routed to canary
@@ -33,7 +33,7 @@ canary:
     maxWeight: 50
     # canary increment step
     # percentage (0-100)
-    stepWeight: 2
+    stepWeight: 5
   thresholds:
     # minimum req success rate (non 5xx responses)
     # percentage (0-100)