diff --git a/Makefile b/Makefile
index 97b100a7..ebfcca37 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ CONFIG_FILES_IN_DOCKER = $(subst ./, /data/, $(CONFIG_FILES))
 fmt: ## Uses Grafana Agent to fmt the river config
 	@for c in $(CONFIG_FILES_IN_DOCKER); do \
 		echo "$$c"; \
-		docker run -e AGENT_MODE=flow --rm --volume "$(shell pwd):/data" -u $(shell id -u) grafana/agent:v0.40.1 fmt -w $$c ; \
+		docker run -e AGENT_MODE=flow --rm --volume "$(shell pwd):/data" -u $(shell id -u) grafana/agent:v0.40.2 fmt -w $$c ; \
 	done
 
 ##@ Docker compose
diff --git a/docker-compose/common/compose-include/agent-collect-logs.yaml b/docker-compose/common/compose-include/agent-collect-logs.yaml
index 76c77caf..32f7ed37 100644
--- a/docker-compose/common/compose-include/agent-collect-logs.yaml
+++ b/docker-compose/common/compose-include/agent-collect-logs.yaml
@@ -4,7 +4,7 @@ services:
     depends_on:
       gateway:
         condition: service_healthy
-    image: grafana/agent:v0.40.1
+    image: grafana/agent:v0.40.2
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/docker-compose/common/compose-include/agent-collect-metrics.yaml b/docker-compose/common/compose-include/agent-collect-metrics.yaml
index fb576207..737de8b8 100644
--- a/docker-compose/common/compose-include/agent-collect-metrics.yaml
+++ b/docker-compose/common/compose-include/agent-collect-metrics.yaml
@@ -4,7 +4,7 @@ services:
     depends_on:
       gateway:
         condition: service_healthy
-    image: grafana/agent:v0.40.1
+    image: grafana/agent:v0.40.2
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/docker-compose/common/compose-include/agent-collect-profiles.yaml b/docker-compose/common/compose-include/agent-collect-profiles.yaml
index b93fd577..36c2a408 100644
--- a/docker-compose/common/compose-include/agent-collect-profiles.yaml
+++ b/docker-compose/common/compose-include/agent-collect-profiles.yaml
@@ -4,7 +4,7 @@ services:
     depends_on:
       gateway:
         condition: service_started
-    image: grafana/agent:v0.40.1
+    image: grafana/agent:v0.40.2
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/docker-compose/common/compose-include/agent-collect-traces.yaml b/docker-compose/common/compose-include/agent-collect-traces.yaml
index 0f621f83..7496aa74 100644
--- a/docker-compose/common/compose-include/agent-collect-traces.yaml
+++ b/docker-compose/common/compose-include/agent-collect-traces.yaml
@@ -4,7 +4,7 @@ services:
     depends_on:
       gateway:
         condition: service_healthy
-    image: grafana/agent:v0.40.1
+    image: grafana/agent:v0.40.2
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml b/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml
index 858c9213..87004f3f 100644
--- a/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml
+++ b/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml
@@ -18,7 +18,7 @@ services:
         condition: service_healthy
       loki:
         condition: service_healthy
-    image: grafana/agent:v0.40.1
+    image: grafana/agent:v0.40.2
     volumes:
       - ../../common/config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/kubernetes/common/grafana-agent/kustomization.yaml b/kubernetes/common/grafana-agent/kustomization.yaml
index 70c23e59..bd2ea6cc 100644
--- a/kubernetes/common/grafana-agent/kustomization.yaml
+++ b/kubernetes/common/grafana-agent/kustomization.yaml
@@ -6,7 +6,7 @@ namespace: monitoring-system
 helmCharts:
 - name: grafana-agent
   repo: https://grafana.github.io/helm-charts
-  version: 0.35.0
+  version: 0.36.0
   releaseName: grafana-agent
   namespace: monitoring-system
   includeCRDs: false
diff --git a/kubernetes/common/grafana-agent/manifests/k8s-all-in-one.yaml b/kubernetes/common/grafana-agent/manifests/k8s-all-in-one.yaml
index a3fd2a19..08ba294a 100644
--- a/kubernetes/common/grafana-agent/manifests/k8s-all-in-one.yaml
+++ b/kubernetes/common/grafana-agent/manifests/k8s-all-in-one.yaml
@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.40.1
-    helm.sh/chart: grafana-agent-0.35.0
+    app.kubernetes.io/version: v0.40.2
+    helm.sh/chart: grafana-agent-0.36.0
   name: grafana-agent
   namespace: monitoring-system
 ---
@@ -17,8 +17,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.40.1
-    helm.sh/chart: grafana-agent-0.35.0
+    app.kubernetes.io/version: v0.40.2
+    helm.sh/chart: grafana-agent-0.36.0
   name: grafana-agent
 rules:
 - apiGroups:
@@ -119,8 +119,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.40.1
-    helm.sh/chart: grafana-agent-0.35.0
+    app.kubernetes.io/version: v0.40.2
+    helm.sh/chart: grafana-agent-0.36.0
   name: grafana-agent
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -655,8 +655,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.40.1
-    helm.sh/chart: grafana-agent-0.35.0
+    app.kubernetes.io/version: v0.40.2
+    helm.sh/chart: grafana-agent-0.36.0
   name: grafana-agent
   namespace: monitoring-system
 spec:
@@ -694,8 +694,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.40.1
-    helm.sh/chart: grafana-agent-0.35.0
+    app.kubernetes.io/version: v0.40.2
+    helm.sh/chart: grafana-agent-0.36.0
   name: grafana-agent-cluster
   namespace: monitoring-system
 spec:
@@ -733,8 +733,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.40.1
-    helm.sh/chart: grafana-agent-0.35.0
+    app.kubernetes.io/version: v0.40.2
+    helm.sh/chart: grafana-agent-0.36.0
   name: grafana-agent
   namespace: monitoring-system
 spec:
@@ -782,7 +782,7 @@ spec:
         - secretRef:
             name: agent-env
             optional: true
-        image: docker.io/grafana/agent:v0.40.1
+        image: docker.io/grafana/agent:v0.40.2
         imagePullPolicy: IfNotPresent
         name: grafana-agent
         ports:
@@ -849,8 +849,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.40.1
-    helm.sh/chart: grafana-agent-0.35.0
+    app.kubernetes.io/version: v0.40.2
+    helm.sh/chart: grafana-agent-0.36.0
   name: grafana-agent
   namespace: monitoring-system
 spec:
@@ -870,8 +870,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.40.1
-    helm.sh/chart: grafana-agent-0.35.0
+    app.kubernetes.io/version: v0.40.2
+    helm.sh/chart: grafana-agent-0.36.0
   name: grafana-agent
   namespace: monitoring-system
 spec: