diff --git a/loki/helm/loki/Chart.yaml b/loki/helm/loki/Chart.yaml
index 554c42bc9..0297b9feb 100644
--- a/loki/helm/loki/Chart.yaml
+++ b/loki/helm/loki/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: loki
 description: helm chart for loki
 type: application
-version: 0.1.14
+version: 0.1.15
 appVersion: "v2.6.1"
 dependencies:
 - name: loki-distributed
diff --git a/loki/helm/loki/values.yaml.tpl b/loki/helm/loki/values.yaml.tpl
index 9e08e16ce..16bd666ef 100644
--- a/loki/helm/loki/values.yaml.tpl
+++ b/loki/helm/loki/values.yaml.tpl
@@ -1,4 +1,5 @@
-{{ $traceShield := and .Configuration (index .Configuration "grafana-agent") }}
+{{ $traceShield := and .Configuration (index .Configuration "trace-shield") }}
+{{ $grafanaAgent := and .Configuration (index .Configuration "grafana-agent") }}
 {{ $redisNamespace := namespace "redis" }}
 {{ $redisValues := .Applications.HelmValues "redis" }}
 {{ $monitoringNamespace := namespace "monitoring" }}
@@ -16,7 +17,7 @@ basicAuth:
   password: {{ .Values.basicAuth.password }}
 {{- end }}
 
-{{- if $traceShield }}
+{{- if $grafanaAgent }}
 promtail:
   enabled: false
 {{- end }}
diff --git a/mimir/helm/mimir/Chart.yaml b/mimir/helm/mimir/Chart.yaml
index 9ebd29a7b..71c8f3b2f 100644
--- a/mimir/helm/mimir/Chart.yaml
+++ b/mimir/helm/mimir/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: mimir
 description: helm chart for mimir
 type: application
-version: 0.1.1
+version: 0.1.2
 appVersion: 2.7.1
 dependencies:
 - name: mimir-distributed
diff --git a/mimir/helm/mimir/values.yaml.tpl b/mimir/helm/mimir/values.yaml.tpl
index 59903f3e6..e99ecd2ee 100644
--- a/mimir/helm/mimir/values.yaml.tpl
+++ b/mimir/helm/mimir/values.yaml.tpl
@@ -1,4 +1,4 @@
-{{ $traceShield := (dig "Configuration" "trace-shield" .) }}
+{{ $traceShield := and .Configuration (index .Configuration "trace-shield") }}
 
 {{- if eq .Provider "azure" }}
 global:
diff --git a/monitoring/helm/monitoring/Chart.yaml b/monitoring/helm/monitoring/Chart.yaml
index cc7248190..96bfb44ec 100644
--- a/monitoring/helm/monitoring/Chart.yaml
+++ b/monitoring/helm/monitoring/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: monitoring
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.25
+version: 0.2.26
 appVersion: "0.1.0"
 dependencies:
 - name: kube-prometheus-stack
diff --git a/monitoring/helm/monitoring/values.yaml.tpl b/monitoring/helm/monitoring/values.yaml.tpl
index 2af4c692b..7ba4668a4 100644
--- a/monitoring/helm/monitoring/values.yaml.tpl
+++ b/monitoring/helm/monitoring/values.yaml.tpl
@@ -1,3 +1,4 @@
+{{ $grafanaAgent := and .Configuration (index .Configuration "grafana-agent") }}
 global:
   rbac:
     pspEnabled: false
@@ -6,12 +7,12 @@ global:
 kube-prometheus-stack:
   grafana:
     namespaceOverride: {{ $monitoringNamespace }}
-{{- if dig "Configuration" "grafana-agent" . }}
+{{- if $grafanaAgent }}
   alertmanager:
     enabled: false
 {{- end }}
   prometheus:
-    {{- if dig "Configuration" "grafana-agent" . }}
+    {{- if $grafanaAgent }}
     enabled: false
     {{- end }}
     prometheusSpec:
diff --git a/trace-shield/helm/trace-shield/Chart.yaml b/trace-shield/helm/trace-shield/Chart.yaml
index 7bcfa87f1..784ffb008 100644
--- a/trace-shield/helm/trace-shield/Chart.yaml
+++ b/trace-shield/helm/trace-shield/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: trace-shield
 description: helm chart for trace-shield
 type: application
-version: 0.1.2
+version: 0.1.3
 appVersion: "v0.1.1"
 dependencies:
 - name: kratos
diff --git a/trace-shield/helm/trace-shield/deps.yaml b/trace-shield/helm/trace-shield/deps.yaml
index 08dc0442b..8146ea3cc 100644
--- a/trace-shield/helm/trace-shield/deps.yaml
+++ b/trace-shield/helm/trace-shield/deps.yaml
@@ -17,6 +17,10 @@ spec:
     name: postgres
     repo: postgres
     version: ">= 0.1.6"
+  - type: helm
+    name: grafana-agent
+    repo: grafana-agent
+    version: ">= 0.1.0"
   - type: terraform
     name: kube
     repo: trace-shield
diff --git a/trace-shield/plural/recipes/trace-shield-aws.yaml b/trace-shield/plural/recipes/trace-shield-aws.yaml
index 3ef714f24..5feec1bbf 100644
--- a/trace-shield/plural/recipes/trace-shield-aws.yaml
+++ b/trace-shield/plural/recipes/trace-shield-aws.yaml
@@ -8,6 +8,8 @@ dependencies:
   name: ingress-nginx-aws
 - repo: postgres
   name: aws-postgres
+- repo: grafana-agent
+  name: grafana-agent-aws
 sections:
 - name: trace-shield
   configuration:
diff --git a/trace-shield/plural/recipes/trace-shield-azure.yaml b/trace-shield/plural/recipes/trace-shield-azure.yaml
index 2b4106500..6676e8510 100644
--- a/trace-shield/plural/recipes/trace-shield-azure.yaml
+++ b/trace-shield/plural/recipes/trace-shield-azure.yaml
@@ -8,6 +8,8 @@ dependencies:
   name: ingress-nginx-azure
 - repo: postgres
   name: azure-postgres
+- repo: grafana-agent
+  name: grafana-agent-azure
 sections:
 - name: trace-shield
   configuration:
diff --git a/trace-shield/plural/recipes/trace-shield-gcp.yaml b/trace-shield/plural/recipes/trace-shield-gcp.yaml
index 009e4e905..c254ea867 100644
--- a/trace-shield/plural/recipes/trace-shield-gcp.yaml
+++ b/trace-shield/plural/recipes/trace-shield-gcp.yaml
@@ -8,6 +8,8 @@ dependencies:
   name: ingress-nginx-gcp
 - repo: postgres
   name: gcp-postgres
+- repo: grafana-agent
+  name: grafana-agent-gcp
 sections:
 - name: trace-shield
   configuration: