diff --git a/production/helm/loki/templates/servicemonitor.yaml b/production/helm/loki/templates/servicemonitor.yaml
index 191c08527bce65d68287c05b017ba84f38316ea8..44358327188440cdbe1c5f273db0b0b38b1b0a1f 100644
--- a/production/helm/loki/templates/servicemonitor.yaml
+++ b/production/helm/loki/templates/servicemonitor.yaml
@@ -8,6 +8,9 @@ metadata:
     chart: {{ template "loki.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- if .Values.serviceMonitor.additionalLabels }}
+{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
@@ -21,4 +24,7 @@ spec:
     {{- if .Values.serviceMonitor.interval }}
     interval: {{ .Values.serviceMonitor.interval }}
     {{- end }}
+    {{- if .Values.serviceMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+    {{- end }}
 {{- end }}
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 603bac50839992f95474bf8b382b799f5c5ab297..826e5ca793fbb796268e43cdca09a618eda4532f 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -169,3 +169,5 @@ updateStrategy:
 serviceMonitor:
   enabled: false
   interval: ""
+  additionalLabels: {}
+  # scrapeTimeout: 10s
diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
index cbd5bb210685e1277d342f52f7d66ff57f2151fe..e0d24bea655333ea9256b0340ba4c2aea1dd2eef 100644
--- a/production/helm/promtail/Chart.yaml
+++ b/production/helm/promtail/Chart.yaml
@@ -1,5 +1,5 @@
 name: promtail
-version: 0.12.0
+version: 0.12.1
 appVersion: v0.3.0
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"
diff --git a/production/helm/promtail/templates/servicemonitor.yaml b/production/helm/promtail/templates/servicemonitor.yaml
index cd3fe02715ba14b3e681e1ae26e433f9d7be0ed8..43f8aac8c245110a91238bffa329ea3a585a35d9 100644
--- a/production/helm/promtail/templates/servicemonitor.yaml
+++ b/production/helm/promtail/templates/servicemonitor.yaml
@@ -8,6 +8,9 @@ metadata:
     chart: {{ template "promtail.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- if .Values.serviceMonitor.additionalLabels }}
+{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
@@ -21,4 +24,7 @@ spec:
     {{- if .Values.serviceMonitor.interval }}
     interval: {{ .Values.serviceMonitor.interval }}
     {{- end }}
+    {{- if .Values.serviceMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+    {{- end }}
 {{- end }}
diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
index 52373505a871a42cf1cb1905a15cb08bf3cf7be6..43559f1400fb6c7bc1b2b1087b48005aeb3ba945 100644
--- a/production/helm/promtail/values.yaml
+++ b/production/helm/promtail/values.yaml
@@ -128,3 +128,5 @@ config:
 serviceMonitor:
   enabled: false
   interval: ""
+  additionalLabels: {}
+  # scrapeTimeout: 10s