diff --git a/chart/templates/monitoring/monitoring.yaml b/chart/templates/monitoring/monitoring.yaml
index 695710848426b07edb4b2c78e49a4159ecc9493d..befc0cfc115b5fd0abb8aa131538eba39c8cfb86 100644
--- a/chart/templates/monitoring/monitoring.yaml
+++ b/chart/templates/monitoring/monitoring.yaml
@@ -38,18 +38,21 @@ spec:
       valuesKey: "monitoring.yaml"
 
   values:
+    hostname: {{ .Values.hostname }}
+
     global:
       imagePullSecrets:
         - name: private-registry
 
-    grafana:
-      image:
-        pullSecrets:
-        - private-registry
+    kubePrometheusStack:
+      grafana:
+        image:
+          pullSecrets:
+          - private-registry
 
-    prometheusOperator:
-      createCustomResource: true
-      manageCrds: true
+      prometheusOperator:
+        createCustomResource: true
+        manageCrds: true
 
   # TODO: DRY this up
   {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}
diff --git a/chart/templates/twistlock/twistlock-helmrelease.yaml b/chart/templates/twistlock/twistlock-helmrelease.yaml
index fd64e701cadc9be91fb86ef4f09970dddf3b7393..5280a66b5e2b011ffaa98bd78e64b106826c3a51 100644
--- a/chart/templates/twistlock/twistlock-helmrelease.yaml
+++ b/chart/templates/twistlock/twistlock-helmrelease.yaml
@@ -54,5 +54,9 @@ spec:
     - name: istio
       namespace: {{ .Release.Namespace }}
     {{- end }}
+    {{- if .Values.monitoring.enabled }}
+    - name: monitoring
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
   {{- end }}
 {{- end }}
\ No newline at end of file