diff --git a/chart/templates/grafana/values.yaml b/chart/templates/grafana/values.yaml
index d6f8d481a9350df15c2208dfae7ca0cefda5d8c9..cc7ab5920837e006535c0ac52974edf340028835 100644
--- a/chart/templates/grafana/values.yaml
+++ b/chart/templates/grafana/values.yaml
@@ -109,7 +109,7 @@ datasources:
       type: prometheus
       uid: mimir
       access: proxy
-      url: http://mimir-mimir-nginx.mimir.svc.cluster.local/prometheus
+      url: http://mimir-mimir-gateway.mimir.svc.cluster.local/prometheus
       editable: true
     {{- end }}
     {{- if .Values.monitoring.enabled }}
diff --git a/chart/templates/monitoring/values.yaml b/chart/templates/monitoring/values.yaml
index 92f24bb116ae65738a26cb69ccdffc98a6fe312b..886110eeee9a09a3619ca20d4d9e6b07f1e55a2d 100644
--- a/chart/templates/monitoring/values.yaml
+++ b/chart/templates/monitoring/values.yaml
@@ -173,9 +173,9 @@ prometheus:
     remoteWrite:
       {{- if .Values.istio.enabled }}
       # I promise it's not a typo; the port is 80 even though it's TLS
-      - url: https://mimir-mimir-nginx.mimir.svc.cluster.local:80/api/v1/push
+      - url: https://mimir-mimir-gateway.mimir.svc.cluster.local:80/api/v1/push
       {{- else }}
-      - url: http://mimir-mimir-nginx.mimir.svc.cluster.local/api/v1/push
+      - url: http://mimir-mimir-gateway.mimir.svc.cluster.local/api/v1/push
       {{- end }}
         {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.addons.mimir.values) "STRICT") }}
         tlsConfig:
diff --git a/chart/values.yaml b/chart/values.yaml
index 5adb0970c8410acb1a02eaf89d6547c5e676bb09..a21870693872b84346c03e257052210c6b2d4249 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -2125,12 +2125,12 @@ addons:
 
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/mimir.git
-      tag: "5.5.1-bb.4"
+      tag: "5.5.1-bb.6"
       path: "./chart"
     helmRepo:
       repoName: "registry1"
       chartName: "mimir"
-      tag: "5.5.1-bb.4"
+      tag: "5.5.1-bb.6"
 
     # -- Enable Mimir Enterprise
     enterprise: