diff --git a/deploy/helm/elastic-agent/Chart.yaml b/deploy/helm/elastic-agent/Chart.yaml
index ed0a65b6e2c..9a650d65563 100644
--- a/deploy/helm/elastic-agent/Chart.yaml
+++ b/deploy/helm/elastic-agent/Chart.yaml
@@ -3,4 +3,5 @@ name: elastic-agent
 description: Elastic-Agent Helm Chart
 kubeVersion: ">= 1.27.0-0"
 type: application
-version: 0.0.1
+appVersion: 8.18.0
+version: 8.18.0-beta
diff --git a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
index 289ad3cfd96..488a1840709 100644
--- a/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
@@ -6,7 +6,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -20,7 +20,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -34,7 +34,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -48,7 +48,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -100,7 +100,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -389,7 +389,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -566,7 +566,7 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -690,7 +690,7 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -923,7 +923,7 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1005,7 +1005,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1026,7 +1026,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1047,7 +1047,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1069,7 +1069,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1171,7 +1171,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1239,7 +1239,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
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 75b73b0e265..82094162c40 100644
--- a/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
@@ -6,7 +6,7 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -18,7 +18,7 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -38,7 +38,7 @@ kind: ClusterRole
 metadata:
   name: agent-nginx-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -144,7 +144,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-nginx-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -164,7 +164,7 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
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 dc773f42f28..6e96135b2df 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
@@ -6,7 +6,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -18,7 +18,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -30,7 +30,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -42,7 +42,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -99,7 +99,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -393,7 +393,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -575,7 +575,7 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -697,7 +697,7 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -928,7 +928,7 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1008,7 +1008,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1027,7 +1027,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1046,7 +1046,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1066,7 +1066,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1185,7 +1185,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1266,7 +1266,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
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 293daa05358..7347621c8c8 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,7 +6,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -18,7 +18,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -30,7 +30,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -42,7 +42,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -99,7 +99,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -393,7 +393,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -577,7 +577,7 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -699,7 +699,7 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -930,7 +930,7 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1010,7 +1010,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1029,7 +1029,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1048,7 +1048,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1068,7 +1068,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1212,7 +1212,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1293,7 +1293,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
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 3f21fc22042..bbc15db88e5 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,7 +6,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -18,7 +18,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -110,7 +110,7 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -190,7 +190,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -210,7 +210,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
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 920c80d585e..1fa1b2ce54f 100644
--- a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
@@ -6,7 +6,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -18,7 +18,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -30,7 +30,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -42,7 +42,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -125,7 +125,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -419,7 +419,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -603,7 +603,7 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -725,7 +725,7 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -956,7 +956,7 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1036,7 +1036,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1055,7 +1055,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1074,7 +1074,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1094,7 +1094,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1228,7 +1228,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1299,7 +1299,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
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 50e4d436cdb..fc5932afe44 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,7 +6,7 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -61,7 +61,7 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
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 6be784d840f..fab0e40c507 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,7 +6,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -18,7 +18,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -182,7 +182,7 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -262,7 +262,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -282,7 +282,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
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 680b9552cc8..fc33a38afdc 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,7 +6,7 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -21,7 +21,7 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -77,7 +77,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-nginx-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -99,7 +99,7 @@ metadata:
   name: agent-nginx-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
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 f484e6af5dc..1c956194757 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,7 +6,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -63,7 +63,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -357,7 +357,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -539,7 +539,7 @@ kind: ClusterRole
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -663,7 +663,7 @@ kind: ClusterRole
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -896,7 +896,7 @@ kind: ClusterRole
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -978,7 +978,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-clusterWide-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -997,7 +997,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-ksmSharded-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1016,7 +1016,7 @@ kind: ClusterRoleBinding
 metadata:
   name: agent-perNode-example-default
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1036,7 +1036,7 @@ metadata:
   name: agent-pernode-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1155,7 +1155,7 @@ metadata:
   name: agent-clusterwide-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
@@ -1236,7 +1236,7 @@ metadata:
   name: agent-ksmsharded-example
   namespace: "default"
   labels:
-    helm.sh/chart: elastic-agent-0.0.1
+    helm.sh/chart: elastic-agent-8.18.0-beta
     app.kubernetes.io/name: elastic-agent
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: 8.18.0
diff --git a/magefile.go b/magefile.go
index 32253e50134..17d2aa4c8d8 100644
--- a/magefile.go
+++ b/magefile.go
@@ -113,25 +113,6 @@ var (
 	goIntegTestTimeout = 2 * time.Hour
 	// goProvisionAndTestTimeout is the timeout used for both provisioning and running tests.
 	goProvisionAndTestTimeout = goIntegTestTimeout + 30*time.Minute
-
-	helmChartsValues = []struct {
-		path        string
-		versionKeys []string
-		tagKeys     []string
-	}{
-		// elastic-agent Helm Chart
-		{
-			helmChartPath,
-			[]string{"agent", "version"},
-			[]string{"agent", "image", "tag"},
-		},
-		// edot-collector values file for kube-stack Helm Chart
-		{
-			helmOtelChartPath,
-			[]string{"defaultCRConfig", "image", "tag"},
-			nil,
-		},
-	}
 )
 
 func init() {
@@ -3406,6 +3387,9 @@ type otelDependencies struct {
 
 type Helm mg.Namespace
 
+// RenderExamples runs the equivalent of `helm template` and `helm lint`
+// for the examples of the Elastic Helm chart which are located at
+// `deploy/helm/elastic-agent/examples` directory.
 func (Helm) RenderExamples() error {
 	settings := cli.New() // Helm CLI settings
 	actionConfig := &action.Configuration{}
@@ -3486,71 +3470,43 @@ func (Helm) RenderExamples() error {
 	return nil
 }
 
+// UpdateAgentVersion updates the agent version in the Elastic-Agent and EDOT-Collector Helm charts.
 func (Helm) UpdateAgentVersion() error {
-	for _, chart := range helmChartsValues {
-		valuesFile := filepath.Join(chart.path, "values.yaml")
-
-		data, err := os.ReadFile(valuesFile)
-		if err != nil {
-			return fmt.Errorf("failed to read file: %w", err)
-		}
-
-		isTagged, err := devtools.TagContainsCommit()
-		if err != nil {
-			return fmt.Errorf("failed to check if tag contains commit: %w", err)
-		}
-
-		if !isTagged {
-			isTagged = os.Getenv(snapshotEnv) != ""
-		}
-
-		agentVersion := getVersion()
-
-		// Parse YAML into a Node structure because
-		// it maintains comments
-		var rootNode yaml.Node
-		err = yaml.Unmarshal(data, &rootNode)
-		if err != nil {
-			return fmt.Errorf("failed to unmarshal YAML: %w", err)
-		}
-
-		if rootNode.Kind != yaml.DocumentNode {
-			return fmt.Errorf("root node is not a document node")
-		} else if len(rootNode.Content) == 0 {
-			return fmt.Errorf("root node has no content")
-		}
-
-		if err := updateYamlNodes(rootNode.Content[0], agentVersion, chart.versionKeys...); err != nil {
+	agentVersion := bversion.GetParsedAgentPackageVersion().CoreVersion()
+	agentSnapshotVersion := agentVersion + "-SNAPSHOT"
+	// until the Helm chart reaches GA this remains with -beta suffix
+	agentChartVersion := agentVersion + "-beta"
+
+	for yamlFile, keyVals := range map[string][]struct {
+		key   string
+		value string
+	}{
+		// values file for elastic-agent Helm Chart
+		filepath.Join(helmChartPath, "values.yaml"): {
+			{"agent.version", agentVersion},
+			// always use the SNAPSHOT version for image tag
+			// for the chart that resides in the git repo
+			{"agent.image.tag", agentSnapshotVersion},
+		},
+		// Chart.yaml for elastic-agent Helm Chart
+		filepath.Join(helmChartPath, "Chart.yaml"): {
+			{"appVersion", agentVersion},
+			{"version", agentChartVersion},
+		},
+		// edot-collector values file for kube-stack Helm Chart
+		filepath.Join(helmOtelChartPath, "values.yaml"): {
+			{"defaultCRConfig.image.tag", agentVersion},
+		},
+	} {
+		if err := updateYamlFile(yamlFile, keyVals...); err != nil {
 			return fmt.Errorf("failed to update agent version: %w", err)
 		}
-
-		if !isTagged && len(chart.tagKeys) > 0 {
-			if err := updateYamlNodes(rootNode.Content[0], fmt.Sprintf("%s-SNAPSHOT", agentVersion), chart.tagKeys...); err != nil {
-				return fmt.Errorf("failed to update agent image tag: %w", err)
-			}
-		}
-
-		// Truncate values file
-		file, err := os.Create(valuesFile)
-		if err != nil {
-			return fmt.Errorf("failed to open file for writing: %w", err)
-		}
-		defer file.Close()
-
-		// Create a YAML encoder with 2-space indentation
-		encoder := yaml.NewEncoder(file)
-		encoder.SetIndent(2)
-
-		// Encode the updated YAML node back to the file
-		err = encoder.Encode(&rootNode)
-		if err != nil {
-			return fmt.Errorf("failed to encode updated YAML: %w", err)
-		}
 	}
 
 	return nil
 }
 
+// Lint lints the Elastic-Agent Helm chart.
 func (Helm) Lint() error {
 	settings := cli.New() // Helm CLI settings
 	actionConfig := &action.Configuration{}
@@ -3569,6 +3525,54 @@ func (Helm) Lint() error {
 	return nil
 }
 
+func updateYamlFile(path string, keyVal ...struct {
+	key   string
+	value string
+}) error {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return fmt.Errorf("failed to read file: %w", err)
+	}
+
+	// Parse YAML into a Node structure because
+	// it maintains comments
+	var rootNode yaml.Node
+	err = yaml.Unmarshal(data, &rootNode)
+	if err != nil {
+		return fmt.Errorf("failed to unmarshal YAML: %w", err)
+	}
+
+	if rootNode.Kind != yaml.DocumentNode {
+		return fmt.Errorf("root node is not a document node")
+	} else if len(rootNode.Content) == 0 {
+		return fmt.Errorf("root node has no content")
+	}
+
+	for _, kv := range keyVal {
+		if err := updateYamlNodes(rootNode.Content[0], kv.value, strings.Split(kv.key, ".")...); err != nil {
+			return fmt.Errorf("failed to update agent version: %w", err)
+		}
+	}
+
+	// Truncate values file
+	file, err := os.Create(path)
+	if err != nil {
+		return fmt.Errorf("failed to open file for writing: %w", err)
+	}
+	defer file.Close()
+
+	// Create a YAML encoder with 2-space indentation
+	encoder := yaml.NewEncoder(file)
+	encoder.SetIndent(2)
+
+	// Encode the updated YAML node back to the file
+	err = encoder.Encode(&rootNode)
+	if err != nil {
+		return fmt.Errorf("failed to encode updated YAML: %w", err)
+	}
+	return nil
+}
+
 func updateYamlNodes(rootNode *yaml.Node, value string, keys ...string) error {
 	if len(keys) == 0 {
 		return fmt.Errorf("no keys provided")