diff --git a/charts/deep-distributed/Chart.yaml b/charts/deep-distributed/Chart.yaml
index a5aef9c..c017376 100644
--- a/charts/deep-distributed/Chart.yaml
+++ b/charts/deep-distributed/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.2
+version: 1.0.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/deep-distributed/values.yaml b/charts/deep-distributed/values.yaml
index 45ce1bb..30887c0 100644
--- a/charts/deep-distributed/values.yaml
+++ b/charts/deep-distributed/values.yaml
@@ -1032,7 +1032,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/unhealthy_ring_node/
           summary: One or more ring members are unhealthy
       - alert: Required Ring Member Missing
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name=~"ingester|tracepoint"} == 0
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name=~"ingester|tracepoint"} == 0
         labels:
           severity: critical
         annotations:
@@ -1040,7 +1040,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Tracepoint ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="tracepoint"} != {{ .Values.tracepoint.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="tracepoint"} != {{ .Values.tracepoint.replicas }}
         labels:
           severity: critical
         annotations:
@@ -1048,7 +1048,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Ingester ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="ingester"} != {{ .Values.ingester.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="ingester"} != {{ .Values.ingester.replicas }}
         labels:
           severity: critical
         annotations:
@@ -1056,7 +1056,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Compactor ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="compactor"} != {{ .Values.compactor.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="compactor"} != {{ .Values.compactor.replicas }}
         labels:
           severity: critical
         annotations:
@@ -1064,7 +1064,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Metrics Generator ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="metrics-generator"} != {{ if .Values.metricsGenerator.enabled }} {{.Values.distributor.replicas }} {{else}}0{{end}}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="metrics-generator"} != {{ if .Values.metricsGenerator.enabled }} {{.Values.distributor.replicas }} {{else}}0{{end}}
         labels:
           severity: critical
         annotations:
@@ -1072,7 +1072,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Rapid increase in blocks
-        expr: delta(deep_db_blocklist_length{cluster="{{ include "deep.clusterName" (dict "ctx" $)}}"}[24h]) > 30
+        expr: delta(deep_db_blocklist_length{cluster="{{ include "deep.clusterName" .}}"}[24h]) > 30
         for: 48h
         labels:
           severity: warning
diff --git a/charts/deep/Chart.yaml b/charts/deep/Chart.yaml
index 75a2c98..da8f61f 100644
--- a/charts/deep/Chart.yaml
+++ b/charts/deep/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.16
+version: 1.0.17
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/deep/values.yaml b/charts/deep/values.yaml
index 58755c8..2cf449c 100644
--- a/charts/deep/values.yaml
+++ b/charts/deep/values.yaml
@@ -477,7 +477,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/unhealthy_ring_node/
           summary: One or more ring members are unhealthy
       - alert: Required Ring Member Missing
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name=~"ingester|tracepoint"} == 0
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name=~"ingester|tracepoint"} == 0
         labels:
           severity: critical
         annotations:
@@ -485,7 +485,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Tracepoint ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="tracepoint"} != {{ .Values.tracepoint.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="tracepoint"} != {{ .Values.deep.replicas }}
         labels:
           severity: critical
         annotations:
@@ -493,7 +493,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Ingester ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="ingester"} != {{ .Values.ingester.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="ingester"} != {{ .Values.deep.replicas }}
         labels:
           severity: critical
         annotations:
@@ -501,7 +501,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Compactor ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="compactor"} != {{ .Values.compactor.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="compactor"} != {{ .Values.deep.replicas }}
         labels:
           severity: critical
         annotations:
@@ -509,7 +509,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Metrics Generator ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="metrics-generator"} != {{ if .Values.metricsGenerator.enabled }} {{.Values.distributor.replicas }} {{else}}0{{end}}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="metrics-generator"} != {{ if .Values.metricsGenerator.enabled }} {{.Values.deep.replicas }} {{else}}0{{end}}
         labels:
           severity: critical
         annotations:
@@ -517,7 +517,7 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Rapid increase in blocks
-        expr: delta(deep_db_blocklist_length{cluster="{{ include "deep.clusterName" (dict "ctx" $)}}"}[24h]) > 30
+        expr: delta(deep_db_blocklist_length{cluster="{{ include "deep.clusterName" .}}"}[24h]) > 30
         for: 48h
         labels:
           severity: warning