diff --git a/chart/templates/monitoring/monitoring-helmrelease.yaml b/chart/templates/monitoring/monitoring-helmrelease.yaml
index 1ce11e1b350b4dc78ecee9a00ef43867cbb3b213..91a558e1582b182c83942162d0924f80d17e3272 100644
--- a/chart/templates/monitoring/monitoring-helmrelease.yaml
+++ b/chart/templates/monitoring/monitoring-helmrelease.yaml
@@ -45,6 +45,20 @@ spec:
     hostname: {{ .Values.hostname }}
     istio:
       enabled: {{ .Values.istio.enabled }}
+    {{- if .Values.monitoring.sso.enabled }}
+      prometheus:
+        enabled: true
+        service: authservice-haproxy-sso
+        port: 8080
+        namespace: authservice
+      alertmanager:
+        enabled: true
+        service: authservice-haproxy-sso
+        port: 8080
+        namespace: authservice
+      grafana:
+        enabled: true
+    {{- end }}
     sso:
       enabled: {{ .Values.monitoring.sso.enabled }}
     global:
@@ -79,17 +93,6 @@ spec:
     kube-state-metrics:
       imagePullSecrets:
       - name: private-registry
-{{- if .Values.monitoring.sso.enabled }}
-    ingress:
-      prometheus:
-        service: authservice-haproxy-sso
-        port: 8080
-        namespace: authservice
-      alertmanager:
-        service: authservice-haproxy-sso
-        port: 8080
-        namespace: authservice
-{{- end }}
 
   # TODO: DRY this up
   {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}
diff --git a/chart/values.yaml b/chart/values.yaml
index c3de0ad0b0863fe1d9d7e05ee3b1c9cf6f23ed32..ce9ef5657092b0f6288fc13f173b937d3fc072df 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -158,7 +158,7 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
     path: "./chart"
-    tag: "11.0.0-bb.10"
+    tag: "11.0.0-bb.12"
   sso:
     enabled: false
     prometheus: