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 648f9c09db2..6b17c7844cb 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/beats/elastic-agent"
-    tag: "8.17.3"
+    tag: "8.17.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 e6449179a6a..69587d5b1b2 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: "8.17.3"
+    tag: "8.17.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 bf6209a8422..fca7cfb6c07 100644
--- a/deploy/helm/elastic-agent/Chart.yaml
+++ b/deploy/helm/elastic-agent/Chart.yaml
@@ -3,5 +3,5 @@ name: elastic-agent
 description: Elastic-Agent Helm Chart
 kubeVersion: ">= 1.27.0-0"
 type: application
-appVersion: 8.17.3
-version: 8.17.3-beta
+appVersion: 8.17.4
+version: 8.17.4-beta
diff --git a/deploy/helm/elastic-agent/README.md b/deploy/helm/elastic-agent/README.md
index 47093750205..00e210d0ed5 100644
--- a/deploy/helm/elastic-agent/README.md
+++ b/deploy/helm/elastic-agent/README.md
@@ -5,7 +5,7 @@
 
 # elastic-agent
 
-![Version: 8.17.3-beta](https://img.shields.io/badge/Version-8.17.3--beta-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.17.3](https://img.shields.io/badge/AppVersion-8.17.3-informational?style=flat-square)
+![Version: 8.17.4-beta](https://img.shields.io/badge/Version-8.17.4--beta-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.17.4](https://img.shields.io/badge/AppVersion-8.17.4-informational?style=flat-square)
 
 Elastic-Agent Helm Chart
 
@@ -143,8 +143,8 @@ The chart built-in [kubernetes integration](https://docs.elastic.co/integrations
 ### 6 - Elastic-Agent Configuration
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| agent.version | string | `"8.17.3"` | elastic-agent version |
-| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/elastic-agent/elastic-agent","tag":"8.17.3-SNAPSHOT"}` | image configuration |
+| agent.version | string | `"8.17.4"` | elastic-agent version |
+| agent.image | object | `{"pullPolicy":"IfNotPresent","repository":"docker.elastic.co/elastic-agent/elastic-agent","tag":"8.17.4-SNAPSHOT"}` | image configuration |
 | agent.imagePullSecrets | list | `[]` | image pull secrets |
 | agent.engine | string | `"k8s"` | generate kubernetes manifests or [ECK](https://github.com/elastic/cloud-on-k8s) CRDs |
 | agent.unprivileged | bool | `false` | enable unprivileged mode |
diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
index 4f482cc6689..534e89abc4a 100644
--- a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
@@ -6,10 +6,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -20,10 +20,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -34,10 +34,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 ---
@@ -48,10 +48,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -100,10 +100,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -389,10 +389,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 stringData:
@@ -566,10 +566,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -690,10 +690,10 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -923,10 +923,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 rules:
@@ -1005,10 +1005,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -1026,10 +1026,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -1047,10 +1047,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 subjects:
@@ -1069,14 +1069,14 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
-  version: 8.17.3
+  version: 8.17.4
   configRef:
     secretName: agent-pernode-example
   elasticsearchRefs:
@@ -1100,7 +1100,7 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
-          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
           imagePullPolicy: IfNotPresent
           name: agent
           resources:
@@ -1172,14 +1172,14 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
-  version: 8.17.3
+  version: 8.17.4
   configRef:
     secretName: agent-clusterwide-example
   elasticsearchRefs:
@@ -1203,7 +1203,7 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
-          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
           imagePullPolicy: IfNotPresent
           name: agent
           resources:
@@ -1240,14 +1240,14 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     eck.k8s.elastic.co/license: basic
 spec:
-  version: 8.17.3
+  version: 8.17.4
   configRef:
     secretName: agent-ksmsharded-example
   elasticsearchRefs:
@@ -1312,7 +1312,7 @@ spec:
             value: /usr/share/elastic-agent/state
           - name: ELASTIC_NETINFO
             value: "false"
-          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 8acd5d7e541..f10124b29be 100644
--- a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
@@ -6,10 +6,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -41,10 +41,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -121,10 +121,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -141,10 +141,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -183,7 +183,7 @@ spec:
           value: "false"
         - name: FLEET_ENROLL
           value: "1"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 dfc935a8f19..f519979dbf4 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
@@ -6,10 +6,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -18,10 +18,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -30,10 +30,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -42,10 +42,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -99,10 +99,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -393,10 +393,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -575,10 +575,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -697,10 +697,10 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -928,10 +928,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -1008,10 +1008,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -1027,10 +1027,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-ksmsharded-example
@@ -1046,10 +1046,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -1066,10 +1066,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1100,7 +1100,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1186,10 +1186,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1220,7 +1220,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1267,10 +1267,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1342,7 +1342,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 82e4efe9bd4..234189b60d4 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
@@ -6,10 +6,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -18,10 +18,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -30,10 +30,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -42,10 +42,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -99,10 +99,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -393,10 +393,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -577,10 +577,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -699,10 +699,10 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -930,10 +930,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -1010,10 +1010,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -1029,10 +1029,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-ksmsharded-example
@@ -1048,10 +1048,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -1068,10 +1068,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1102,7 +1102,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1156,8 +1156,8 @@ spec:
       - args:
         - -c
         - mkdir -p /etc/elastic-agent/inputs.d && mkdir -p /etc/elastic-agent/inputs.d
-          && wget -O - https://github.com/elastic/elastic-agent/archive/v8.17.3.tar.gz
-          | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-8.17.3/deploy/kubernetes/elastic-agent-standalone/templates.d"
+          && wget -O - https://github.com/elastic/elastic-agent/archive/v8.17.4.tar.gz
+          | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-8.17.4/deploy/kubernetes/elastic-agent-standalone/templates.d"
         command:
         - sh
         image: busybox:1.36.1
@@ -1213,10 +1213,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1247,7 +1247,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1294,10 +1294,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1369,7 +1369,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 376d3473493..2fb324e156a 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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -110,10 +110,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 040de4cf020..9807676ac90 100644
--- a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
@@ -6,10 +6,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -18,10 +18,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 ---
 # Source: elastic-agent/templates/agent/service-account.yaml
 apiVersion: v1
@@ -30,10 +30,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -42,10 +42,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -125,10 +125,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -419,10 +419,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -603,10 +603,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -725,10 +725,10 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -956,10 +956,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 rules:
   - apiGroups: [ "" ] # "" indicates the core API group
     resources:
@@ -1036,10 +1036,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-clusterwide-example
@@ -1055,10 +1055,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-ksmsharded-example
@@ -1074,10 +1074,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: agent-pernode-example
@@ -1094,10 +1094,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1128,7 +1128,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1172,8 +1172,8 @@ spec:
       - args:
         - -c
         - mkdir -p /etc/elastic-agent/inputs.d && mkdir -p /etc/elastic-agent/inputs.d
-          && wget -O - https://github.com/elastic/elastic-agent/archive/v8.17.3.tar.gz
-          | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-8.17.3/deploy/kubernetes/elastic-agent-standalone/templates.d"
+          && wget -O - https://github.com/elastic/elastic-agent/archive/v8.17.4.tar.gz
+          | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-8.17.4/deploy/kubernetes/elastic-agent-standalone/templates.d"
         command:
         - sh
         image: busybox:1.36.1
@@ -1229,10 +1229,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1263,7 +1263,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1300,10 +1300,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1375,7 +1375,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
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 cf564638839..72c219a5c69 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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -61,10 +61,10 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         securityContext:
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 1bcb0f52f48..38ccce21f6e 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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -190,10 +190,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 2dc6630822e..f7b8eadb9e5 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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 883c2fbc8a6..40c9093a1ec 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
@@ -6,10 +6,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -63,10 +63,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -357,10 +357,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 stringData:
 
   agent.yml: |-
@@ -539,10 +539,10 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     elastic-agent.k8s.elastic.co/cr: nginx
 rules:
@@ -663,10 +663,10 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     elastic-agent.k8s.elastic.co/cr: nginx
 rules:
@@ -896,10 +896,10 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
   annotations:
     elastic-agent.k8s.elastic.co/cr: nginx
 rules:
@@ -978,10 +978,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: user-sa-clusterWide
@@ -997,10 +997,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: user-sa-ksmSharded
@@ -1016,10 +1016,10 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 subjects:
   - kind: ServiceAccount
     name: user-sa-perNode
@@ -1036,10 +1036,10 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.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:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1156,10 +1156,10 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1190,7 +1190,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
@@ -1237,10 +1237,10 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-8.17.3-beta
+    helm.sh/chart: elastic-agent-8.17.4-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
-    app.kubernetes.io/version: 8.17.3
+    app.kubernetes.io/version: 8.17.4
 spec:
   selector:
     matchLabels:
@@ -1312,7 +1312,7 @@ spec:
           value: /usr/share/elastic-agent/state
         - name: ELASTIC_NETINFO
           value: "false"
-        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.3-SNAPSHOT
+        image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4-SNAPSHOT
         imagePullPolicy: IfNotPresent
         name: agent
         resources:
diff --git a/deploy/helm/elastic-agent/values.yaml b/deploy/helm/elastic-agent/values.yaml
index ce445a32ae8..f3587fc9691 100644
--- a/deploy/helm/elastic-agent/values.yaml
+++ b/deploy/helm/elastic-agent/values.yaml
@@ -325,13 +325,13 @@ extraIntegrations: {}
 agent:
   # -- elastic-agent version
   # @section -- 6 - Elastic-Agent Configuration
-  version: 8.17.3
+  version: 8.17.4
   # -- image configuration
   # @section -- 6 - Elastic-Agent Configuration
   image:
     repository: docker.elastic.co/elastic-agent/elastic-agent
     pullPolicy: IfNotPresent
-    tag: "8.17.3-SNAPSHOT"
+    tag: "8.17.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 b424bef35c4..9b5f3930cff 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:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 53b5b960f4c..569d324c86b 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:8.17.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 5d4c0a07aa3..a696495a4f6 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:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 dbe0725b3ab..cfab77e6002 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:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 99b92a52fcc..6a0de7518cc 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:8.17.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 787c5878b52..57e463aac11 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:8.17.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 25c73bd8831..b89e3d6deff 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:8.17.3
+              image: docker.elastic.co/elastic-agent/elastic-agent:8.17.4
               command: ['bash']
               args:
                 - -c
diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
index 011c41b79aa..3a9cf2f0f5d 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:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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 d3e82fdd011..6d68d184bf1 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:8.17.3
+      #    image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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:8.17.3
+          image: docker.elastic.co/elastic-agent/elastic-agent:8.17.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/docs/version.asciidoc b/version/docs/version.asciidoc
index 921ffdb98ec..9a98987e99e 100644
--- a/version/docs/version.asciidoc
+++ b/version/docs/version.asciidoc
@@ -1,4 +1,4 @@
-:stack-version: 8.17.3
+:stack-version: 8.17.4
 :doc-branch: 8.17
 // FIXME: once elastic.co docs have been switched over to use `main`, remove
 // the `doc-site-branch` line below as well as any references to it in the code.
diff --git a/version/version.go b/version/version.go
index 9c6e410f6f1..754fdf53d94 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,5 +4,5 @@
 
 package version
 
-const defaultBeatVersion = "8.17.3"
+const defaultBeatVersion = "8.17.4"
 const Agent = defaultBeatVersion