diff --git a/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml b/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml
index a9ed0cb12b7..5c1a8e3a7d3 100644
--- a/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml
+++ b/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml
@@ -17,7 +17,7 @@ crds:
 defaultCRConfig:
   image:
     repository: "docker.elastic.co/elastic-agent/elastic-agent"
-    tag: "9.0.3"
+    tag: "9.0.4"
   targetAllocator:
     enabled: false # Enable/disable the Operator's Target allocator.
     # Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator
diff --git a/deploy/helm/edot-collector/kube-stack/values.yaml b/deploy/helm/edot-collector/kube-stack/values.yaml
index f956101a1a5..d882282d89c 100644
--- a/deploy/helm/edot-collector/kube-stack/values.yaml
+++ b/deploy/helm/edot-collector/kube-stack/values.yaml
@@ -17,7 +17,7 @@ crds:
 defaultCRConfig:
   image:
     repository: "docker.elastic.co/elastic-agent/elastic-agent"
-    tag: "9.0.3"
+    tag: "9.0.4"
   targetAllocator:
     enabled: false # Enable/disable the Operator's Target allocator.
     # Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator
diff --git a/deploy/helm/elastic-agent/Chart.yaml b/deploy/helm/elastic-agent/Chart.yaml
index 3a70fd617bf..b8d67a3069f 100644
--- a/deploy/helm/elastic-agent/Chart.yaml
+++ b/deploy/helm/elastic-agent/Chart.yaml
@@ -3,8 +3,8 @@ name: elastic-agent
 description: Elastic-Agent Helm Chart
 kubeVersion: ">= 1.27.0-0"
 type: application
-appVersion: 9.0.3
-version: 9.0.3-beta
+appVersion: 9.0.4
+version: 9.0.4-beta
 dependencies:
   - name: kube-state-metrics
     version: "5.30.1"
diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
index d13e17de13d..c8117efe1ee 100644
--- a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
@@ -22,10 +22,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -36,10 +36,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -50,10 +50,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -288,10 +288,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -620,10 +620,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -702,10 +702,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -806,10 +806,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -827,10 +827,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -962,14 +962,14 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
-  version: 9.0.3
+  version: 9.0.4
   configRef:
     secretName: agent-pernode-example
   elasticsearchRefs:
@@ -993,7 +993,7 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
           imagePullPolicy: IfNotPresent
           name: agent
           resources:
@@ -1045,14 +1045,14 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
-  version: 9.0.3
+  version: 9.0.4
   configRef:
     secretName: agent-clusterwide-example
   elasticsearchRefs:
@@ -1076,7 +1076,7 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
           imagePullPolicy: IfNotPresent
           name: agent
           resources:
diff --git a/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml
index 4b0fe8b09cd..67330e40abd 100644
--- a/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/fleet-managed-certificates/rendered/manifest.yaml
@@ -22,10 +22,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -34,10 +34,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -234,10 +234,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -336,10 +336,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -384,10 +384,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -432,7 +432,7 @@ spec:
           value: fleetToken
         - name: FLEET_ENROLL
           value: "true"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml
index 5a2936f6434..5eb5de53515 100644
--- a/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/rendered/manifest.yaml
@@ -414,7 +414,7 @@ spec:
           value: fleetToken
         - name: FLEET_ENROLL
           value: "true"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
index e44c5ef615a..b3e012370b3 100644
--- a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
@@ -22,10 +22,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -34,10 +34,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -212,10 +212,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -314,10 +314,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -362,10 +362,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -402,7 +402,7 @@ spec:
           value: fleetToken
         - name: FLEET_ENROLL
           value: "true"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml
index 98ebb317ca3..bc0c066c4b3 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-custom-output/rendered/manifest.yaml
@@ -22,10 +22,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -34,10 +34,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -46,10 +46,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -337,10 +337,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -722,10 +722,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -802,10 +802,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -904,10 +904,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -923,10 +923,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -971,10 +971,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -1015,7 +1015,7 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1182,10 +1182,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -1226,7 +1226,7 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
index 03874d3449f..d7a7800aadd 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
@@ -22,10 +22,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -34,10 +34,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -46,10 +46,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -289,10 +289,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -626,10 +626,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -706,10 +706,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -808,10 +808,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -827,10 +827,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -875,10 +875,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -909,7 +909,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1056,10 +1056,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -1090,7 +1090,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
index 7df7075277b..2b15565c494 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
@@ -22,10 +22,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -34,10 +34,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -46,10 +46,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -289,10 +289,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -629,10 +629,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -709,10 +709,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -811,10 +811,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -830,10 +830,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -878,10 +878,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -912,7 +912,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1059,10 +1059,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -1093,7 +1093,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml
index 01a6c20fe66..5e081d29897 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-ksm-sharding/rendered/manifest.yaml
@@ -22,10 +22,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -34,10 +34,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -46,10 +46,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -102,10 +102,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -634,10 +634,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -714,10 +714,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -816,10 +816,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -835,10 +835,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -939,10 +939,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -983,7 +983,7 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1045,10 +1045,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -1089,7 +1089,7 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1253,7 +1253,7 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
index b2d058cb38b..6bd4bb28497 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
@@ -6,10 +6,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -18,10 +18,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -110,10 +110,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -190,10 +190,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -210,10 +210,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -244,7 +244,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
index 09565008a53..a2cd4110c70 100644
--- a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
@@ -22,10 +22,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -34,10 +34,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -46,10 +46,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -315,10 +315,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -655,10 +655,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -735,10 +735,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -837,10 +837,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -856,10 +856,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -904,10 +904,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -938,7 +938,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1075,10 +1075,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -1109,7 +1109,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml
index 46f55acf315..1acf41b1700 100644
--- a/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/netflow-service/rendered/manifest.yaml
@@ -6,10 +6,10 @@ metadata:
   name: agent-netflow-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -69,10 +69,10 @@ metadata:
   name: agent-netflow-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   type: ClusterIP
   selector:
@@ -89,10 +89,10 @@ metadata:
   name: agent-netflow-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -131,7 +131,7 @@ spec:
             secretKeyRef:
               key: api_key
               name: es-api-secret
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         ports:
diff --git a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
index b8093b7b060..d8011b4be5c 100644
--- a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
@@ -6,10 +6,10 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -61,10 +61,10 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -93,7 +93,7 @@ spec:
               fieldPath: metadata.name
         - name: STATE_PATH
           value: /usr/share/elastic-agent/state
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         securityContext:
diff --git a/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml
index d095dc777b0..8250c8d3cf9 100644
--- a/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/priority-class/rendered/manifest.yaml
@@ -32,10 +32,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -44,10 +44,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -56,10 +56,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -299,10 +299,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -636,10 +636,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -716,10 +716,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -818,10 +818,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -837,10 +837,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -885,10 +885,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -919,7 +919,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1067,10 +1067,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -1101,7 +1101,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
index e2d1b37dabb..aec386ea8e5 100644
--- a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
@@ -6,10 +6,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -18,10 +18,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -190,10 +190,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -270,10 +270,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -290,10 +290,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -324,7 +324,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml
index 408dbdf6b52..78f113674ec 100644
--- a/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/user-cluster-role/rendered/manifest.yaml
@@ -6,10 +6,10 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     elastic-agent.k8s.elastic.co/preset: nginx
     elastic-agent.k8s.elastic.co/sa: nginx
@@ -21,10 +21,10 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     elastic-agent.k8s.elastic.co/preset: nginx
 stringData:
@@ -77,10 +77,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-nginx-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     elastic-agent.k8s.elastic.co/preset: nginx
 subjects:
@@ -99,10 +99,10 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -132,7 +132,7 @@ spec:
               fieldPath: metadata.name
         - name: STATE_PATH
           value: /usr/share/elastic-agent/state
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         securityContext:
diff --git a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
index bb4263ad224..3961f2ae3a5 100644
--- a/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
@@ -22,10 +22,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -265,10 +265,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 stringData:
 
   agent.yml: |-
@@ -602,10 +602,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     elastic-agent.k8s.elastic.co/cr: nginx
 rules:
@@ -684,10 +684,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
   annotations:
     elastic-agent.k8s.elastic.co/cr: nginx
 rules:
@@ -788,10 +788,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: user-sa-clusterWide
@@ -807,10 +807,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 subjects:
   - kind: ServiceAccount
     name: user-sa-perNode
@@ -855,10 +855,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -889,7 +889,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1036,10 +1036,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-9.0.3-beta
+    helm.sh/chart: elastic-agent-9.0.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 9.0.3
+    app.kubernetes.io/version: 9.0.4
 spec:
   selector:
     matchLabels:
@@ -1070,7 +1070,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/values.yaml b/deploy/helm/elastic-agent/values.yaml
index ca0af90517e..ff3d5c6b934 100644
--- a/deploy/helm/elastic-agent/values.yaml
+++ b/deploy/helm/elastic-agent/values.yaml
@@ -334,13 +334,13 @@ extraIntegrations: {}
 agent:
   # -- elastic-agent version
   # @section -- 6 - Elastic-Agent Configuration
-  version: 9.0.3
+  version: 9.0.4
   # -- image configuration
   # @section -- 6 - Elastic-Agent Configuration
   image:
     repository: docker.elastic.co/elastic-agent/elastic-agent
     pullPolicy: IfNotPresent
-    tag: "9.0.3-SNAPSHOT"
+    tag: "9.0.4-SNAPSHOT"
   # -- image pull secrets
   # @section -- 6 - Elastic-Agent Configuration
   imagePullSecrets: []
diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
index e914d9c6f93..8c7bfa9e2db 100644
--- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
+++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL
diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
index 23afaef2e47..f70f9e9fdb1 100644
--- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
+++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
-      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +40,7 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent
diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
index 66605402b3d..667c6eff61e 100644
--- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
+++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL
diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
index 6da49f00323..302ad0d634b 100644
--- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
+++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
@@ -27,7 +27,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL
diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
index db3e3bd3d09..bc6c68bad69 100644
--- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
+++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
-      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +40,7 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent
diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
index e17ccc14237..72b9bad01e1 100644
--- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
+++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
@@ -28,7 +28,7 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
-      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
       #    command: ['bash']
       #    args:
       #      - -c
@@ -40,7 +40,7 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent
diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml
index c1d934056ae..35cdf7a542a 100644
--- a/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml
+++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-hints/elastic-agent-standalone/kustomization.yaml
@@ -19,7 +19,7 @@ patches:
         spec:
           initContainers:
             - name: k8s-templates-downloader
-              image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+              image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
               command: ['bash']
               args:
                 - -c
diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
index a3841a5087c..7a08d7b1922 100644
--- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
+++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
@@ -27,7 +27,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
           env:
             # Set to 1 for enrollment into Fleet server. If not set, Elastic Agent is run in standalone mode
             - name: FLEET_ENROLL
diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
index f665d8b9204..e65df6141cf 100644
--- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
+++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
@@ -704,7 +704,7 @@ spec:
       # Uncomment if using hints feature
       #initContainers:
       #  - name: k8s-templates-downloader
-      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
       #    command: ['bash']
       #    args:
       #      - -c
@@ -716,7 +716,7 @@ spec:
       #        mountPath: /etc/elastic-agent/inputs.d
       containers:
         - name: elastic-agent-standalone
-          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:9.0.4
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
           env:
             # The API Key with access privilleges to connect to Elasticsearch. https://www.elastic.co/guide/en/fleet/current/grant-access-to-elasticsearch.html#create-api-key-standalone-agent
diff --git a/version/version.go b/version/version.go
index 03d81d1b936..6edba402f46 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,5 +4,5 @@
 
 package version
 
-const defaultBeatVersion = "9.0.3"
+const defaultBeatVersion = "9.0.4"
 const Agent = defaultBeatVersion