diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
index 30d3301d13e3..5d92b3fa64cf 100644
--- a/production/helm/loki-stack/Chart.yaml
+++ b/production/helm/loki-stack/Chart.yaml
@@ -1,5 +1,5 @@
 name: loki-stack
-version: 0.9.0
+version: 0.9.1
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."
diff --git a/production/helm/loki/templates/deployment.yaml b/production/helm/loki/templates/deployment.yaml
index 8f3257eff545..9bf061704449 100644
--- a/production/helm/loki/templates/deployment.yaml
+++ b/production/helm/loki/templates/deployment.yaml
@@ -39,9 +39,9 @@ spec:
       serviceAccountName: {{ template "loki.serviceAccountName" . }}
     {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
+    {{- end }}
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
-    {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
index 97c5129a8731..47897514e17b 100644
--- a/production/helm/promtail/Chart.yaml
+++ b/production/helm/promtail/Chart.yaml
@@ -1,5 +1,5 @@
 name: promtail
-version: 0.7.1
+version: 0.7.2
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"
diff --git a/production/helm/promtail/templates/configmap.yaml b/production/helm/promtail/templates/configmap.yaml
index 3072048aa5be..68dad71d39e1 100644
--- a/production/helm/promtail/templates/configmap.yaml
+++ b/production/helm/promtail/templates/configmap.yaml
@@ -9,4 +9,255 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   promtail.yaml: |
-    {{- tpl (toYaml .Values.config | nindent 4 ) . }}
+    {{- toYaml .Values.config | nindent 4 }}
+    scrape_configs:
+    {{- if .Values.scrapeConfigs }}
+    {{- toYaml .Values.scrapeConfigs | nindent 4 }}
+    {{- else }}
+    - job_name: kubernetes-pods-name
+      pipeline_stages:
+        {{- toYaml .Values.pipelineStages | nindent 8 }}
+      kubernetes_sd_configs:
+      - role: pod
+      relabel_configs:
+      - source_labels:
+        - __meta_kubernetes_pod_label_name
+        target_label: __service__
+      - source_labels:
+        - __meta_kubernetes_pod_node_name
+        target_label: __host__
+      - action: drop
+        regex: ^$
+        source_labels:
+        - __service__
+      - action: replace
+        replacement: $1
+        separator: /
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __service__
+        target_label: job
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_namespace
+        target_label: namespace
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_name
+        target_label: instance
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_container_name
+        target_label: container_name
+      - action: labelmap
+        regex: __meta_kubernetes_pod_label_(.+)
+      - replacement: /var/log/pods/*$1/*.log
+        separator: /
+        source_labels:
+        - __meta_kubernetes_pod_uid
+        - __meta_kubernetes_pod_container_name
+        target_label: __path__
+    - job_name: kubernetes-pods-app
+      pipeline_stages:
+        {{- toYaml .Values.pipelineStages | nindent 8 }}
+      kubernetes_sd_configs:
+      - role: pod
+      relabel_configs:
+      - action: drop
+        regex: .+
+        source_labels:
+        - __meta_kubernetes_pod_label_name
+      - source_labels:
+        - __meta_kubernetes_pod_label_app
+        target_label: __service__
+      - source_labels:
+        - __meta_kubernetes_pod_node_name
+        target_label: __host__
+      - action: drop
+        regex: ^$
+        source_labels:
+        - __service__
+      - action: replace
+        replacement: $1
+        separator: /
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __service__
+        target_label: job
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_namespace
+        target_label: namespace
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_name
+        target_label: instance
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_container_name
+        target_label: container_name
+      - action: labelmap
+        regex: __meta_kubernetes_pod_label_(.+)
+      - replacement: /var/log/pods/*$1/*.log
+        separator: /
+        source_labels:
+        - __meta_kubernetes_pod_uid
+        - __meta_kubernetes_pod_container_name
+        target_label: __path__
+    - job_name: kubernetes-pods-direct-controllers
+      pipeline_stages:
+        {{- toYaml .Values.pipelineStages | nindent 8 }}
+      kubernetes_sd_configs:
+      - role: pod
+      relabel_configs:
+      - action: drop
+        regex: .+
+        separator: ''
+        source_labels:
+        - __meta_kubernetes_pod_label_name
+        - __meta_kubernetes_pod_label_app
+      - action: drop
+        regex: ^([0-9a-z-.]+)(-[0-9a-f]{8,10})$
+        source_labels:
+        - __meta_kubernetes_pod_controller_name
+      - source_labels:
+        - __meta_kubernetes_pod_controller_name
+        target_label: __service__
+      - source_labels:
+        - __meta_kubernetes_pod_node_name
+        target_label: __host__
+      - action: drop
+        regex: ^$
+        source_labels:
+        - __service__
+      - action: replace
+        replacement: $1
+        separator: /
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __service__
+        target_label: job
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_namespace
+        target_label: namespace
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_name
+        target_label: instance
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_container_name
+        target_label: container_name
+      - action: labelmap
+        regex: __meta_kubernetes_pod_label_(.+)
+      - replacement: /var/log/pods/*$1/*.log
+        separator: /
+        source_labels:
+        - __meta_kubernetes_pod_uid
+        - __meta_kubernetes_pod_container_name
+        target_label: __path__
+    - job_name: kubernetes-pods-indirect-controller
+      pipeline_stages:
+        {{- toYaml .Values.pipelineStages | nindent 8 }}
+      kubernetes_sd_configs:
+      - role: pod
+      relabel_configs:
+      - action: drop
+        regex: .+
+        separator: ''
+        source_labels:
+        - __meta_kubernetes_pod_label_name
+        - __meta_kubernetes_pod_label_app
+      - action: keep
+        regex: ^([0-9a-z-.]+)(-[0-9a-f]{8,10})$
+        source_labels:
+        - __meta_kubernetes_pod_controller_name
+      - action: replace
+        regex: ^([0-9a-z-.]+)(-[0-9a-f]{8,10})$
+        source_labels:
+        - __meta_kubernetes_pod_controller_name
+        target_label: __service__
+      - source_labels:
+        - __meta_kubernetes_pod_node_name
+        target_label: __host__
+      - action: drop
+        regex: ^$
+        source_labels:
+        - __service__
+      - action: replace
+        replacement: $1
+        separator: /
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __service__
+        target_label: job
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_namespace
+        target_label: namespace
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_name
+        target_label: instance
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_container_name
+        target_label: container_name
+      - action: labelmap
+        regex: __meta_kubernetes_pod_label_(.+)
+      - replacement: /var/log/pods/*$1/*.log
+        separator: /
+        source_labels:
+        - __meta_kubernetes_pod_uid
+        - __meta_kubernetes_pod_container_name
+        target_label: __path__
+    - job_name: kubernetes-pods-static
+      pipeline_stages:
+        {{- toYaml .Values.pipelineStages | nindent 8 }}
+      kubernetes_sd_configs:
+      - role: pod
+      relabel_configs:
+      - action: drop
+        regex: ^$
+        source_labels:
+        - __meta_kubernetes_pod_annotation_kubernetes_io_config_mirror
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_label_component
+        target_label: __service__
+      - source_labels:
+        - __meta_kubernetes_pod_node_name
+        target_label: __host__
+      - action: drop
+        regex: ^$
+        source_labels:
+        - __service__
+      - action: replace
+        replacement: $1
+        separator: /
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __service__
+        target_label: job
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_namespace
+        target_label: namespace
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_name
+        target_label: instance
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_container_name
+        target_label: container_name
+      - action: labelmap
+        regex: __meta_kubernetes_pod_label_(.+)
+      - replacement: /var/log/pods/*$1/*.log
+        separator: /
+        source_labels:
+        - __meta_kubernetes_pod_annotation_kubernetes_io_config_mirror
+        - __meta_kubernetes_pod_container_name
+        target_label: __path__
+    {{- end }}
diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
index 285dbc640166..46943240ba99 100644
--- a/production/helm/promtail/values.yaml
+++ b/production/helm/promtail/values.yaml
@@ -26,6 +26,9 @@ nameOverride: promtail
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
 nodeSelector: {}
 
+pipelineStages:
+- docker: {}
+
 ## Pod Labels
 podLabels: {}
 
@@ -61,6 +64,9 @@ resources: {}
 #    cpu: 100m
 #    memory: 128Mi
 
+# Custom scrape_configs to override the default ones in the configmap
+scrapeConfigs: []
+
 securityContext:
   readOnlyRootFilesystem: true
   runAsGroup: 0
@@ -121,250 +127,4 @@ config:
   target_config:
     # Period to resync directories being watched and files being tailed
     sync_period: 10s
-  scrape_configs:
-  - job_name: kubernetes-pods-name
-    pipeline_stages:
-      - docker: {}
-    kubernetes_sd_configs:
-    - role: pod
-    relabel_configs:
-    - source_labels:
-      - __meta_kubernetes_pod_label_name
-      target_label: __service__
-    - source_labels:
-      - __meta_kubernetes_pod_node_name
-      target_label: __host__
-    - action: drop
-      regex: ^$
-      source_labels:
-      - __service__
-    - action: replace
-      replacement: $1
-      separator: /
-      source_labels:
-      - __meta_kubernetes_namespace
-      - __service__
-      target_label: job
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_namespace
-      target_label: namespace
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_name
-      target_label: instance
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_container_name
-      target_label: container_name
-    - action: labelmap
-      regex: __meta_kubernetes_pod_label_(.+)
-    - replacement: /var/log/pods/*$1/*.log
-      separator: /
-      source_labels:
-      - __meta_kubernetes_pod_uid
-      - __meta_kubernetes_pod_container_name
-      target_label: __path__
-  - job_name: kubernetes-pods-app
-    pipeline_stages:
-      - docker: {}
-    kubernetes_sd_configs:
-    - role: pod
-    relabel_configs:
-    - action: drop
-      regex: .+
-      source_labels:
-      - __meta_kubernetes_pod_label_name
-    - source_labels:
-      - __meta_kubernetes_pod_label_app
-      target_label: __service__
-    - source_labels:
-      - __meta_kubernetes_pod_node_name
-      target_label: __host__
-    - action: drop
-      regex: ^$
-      source_labels:
-      - __service__
-    - action: replace
-      replacement: $1
-      separator: /
-      source_labels:
-      - __meta_kubernetes_namespace
-      - __service__
-      target_label: job
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_namespace
-      target_label: namespace
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_name
-      target_label: instance
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_container_name
-      target_label: container_name
-    - action: labelmap
-      regex: __meta_kubernetes_pod_label_(.+)
-    - replacement: /var/log/pods/*$1/*.log
-      separator: /
-      source_labels:
-      - __meta_kubernetes_pod_uid
-      - __meta_kubernetes_pod_container_name
-      target_label: __path__
-  - job_name: kubernetes-pods-direct-controllers
-    pipeline_stages:
-      - docker: {}
-    kubernetes_sd_configs:
-    - role: pod
-    relabel_configs:
-    - action: drop
-      regex: .+
-      separator: ''
-      source_labels:
-      - __meta_kubernetes_pod_label_name
-      - __meta_kubernetes_pod_label_app
-    - action: drop
-      regex: ^([0-9a-z-.]+)(-[0-9a-f]{8,10})$
-      source_labels:
-      - __meta_kubernetes_pod_controller_name
-    - source_labels:
-      - __meta_kubernetes_pod_controller_name
-      target_label: __service__
-    - source_labels:
-      - __meta_kubernetes_pod_node_name
-      target_label: __host__
-    - action: drop
-      regex: ^$
-      source_labels:
-      - __service__
-    - action: replace
-      replacement: $1
-      separator: /
-      source_labels:
-      - __meta_kubernetes_namespace
-      - __service__
-      target_label: job
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_namespace
-      target_label: namespace
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_name
-      target_label: instance
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_container_name
-      target_label: container_name
-    - action: labelmap
-      regex: __meta_kubernetes_pod_label_(.+)
-    - replacement: /var/log/pods/*$1/*.log
-      separator: /
-      source_labels:
-      - __meta_kubernetes_pod_uid
-      - __meta_kubernetes_pod_container_name
-      target_label: __path__
-  - job_name: kubernetes-pods-indirect-controller
-    pipeline_stages:
-      - docker: {}
-    kubernetes_sd_configs:
-    - role: pod
-    relabel_configs:
-    - action: drop
-      regex: .+
-      separator: ''
-      source_labels:
-      - __meta_kubernetes_pod_label_name
-      - __meta_kubernetes_pod_label_app
-    - action: keep
-      regex: ^([0-9a-z-.]+)(-[0-9a-f]{8,10})$
-      source_labels:
-      - __meta_kubernetes_pod_controller_name
-    - action: replace
-      regex: ^([0-9a-z-.]+)(-[0-9a-f]{8,10})$
-      source_labels:
-      - __meta_kubernetes_pod_controller_name
-      target_label: __service__
-    - source_labels:
-      - __meta_kubernetes_pod_node_name
-      target_label: __host__
-    - action: drop
-      regex: ^$
-      source_labels:
-      - __service__
-    - action: replace
-      replacement: $1
-      separator: /
-      source_labels:
-      - __meta_kubernetes_namespace
-      - __service__
-      target_label: job
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_namespace
-      target_label: namespace
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_name
-      target_label: instance
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_container_name
-      target_label: container_name
-    - action: labelmap
-      regex: __meta_kubernetes_pod_label_(.+)
-    - replacement: /var/log/pods/*$1/*.log
-      separator: /
-      source_labels:
-      - __meta_kubernetes_pod_uid
-      - __meta_kubernetes_pod_container_name
-      target_label: __path__
-  - job_name: kubernetes-pods-static
-    pipeline_stages:
-      - docker: {}
-    kubernetes_sd_configs:
-    - role: pod
-    relabel_configs:
-    - action: drop
-      regex: ^$
-      source_labels:
-      - __meta_kubernetes_pod_annotation_kubernetes_io_config_mirror
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_label_component
-      target_label: __service__
-    - source_labels:
-      - __meta_kubernetes_pod_node_name
-      target_label: __host__
-    - action: drop
-      regex: ^$
-      source_labels:
-      - __service__
-    - action: replace
-      replacement: $1
-      separator: /
-      source_labels:
-      - __meta_kubernetes_namespace
-      - __service__
-      target_label: job
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_namespace
-      target_label: namespace
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_name
-      target_label: instance
-    - action: replace
-      source_labels:
-      - __meta_kubernetes_pod_container_name
-      target_label: container_name
-    - action: labelmap
-      regex: __meta_kubernetes_pod_label_(.+)
-    - replacement: /var/log/pods/*$1/*.log
-      separator: /
-      source_labels:
-      - __meta_kubernetes_pod_annotation_kubernetes_io_config_mirror
-      - __meta_kubernetes_pod_container_name
-      target_label: __path__
+