diff --git a/deploy/eck-stack/Chart.yaml b/deploy/eck-stack/Chart.yaml
index 6573f83f19..a143cad377 100644
--- a/deploy/eck-stack/Chart.yaml
+++ b/deploy/eck-stack/Chart.yaml
@@ -3,21 +3,21 @@ name: eck-stack
 description: Elastic Stack managed by the ECK Operator
 kubeVersion: ">= 1.21.0-0"
 type: application
-version: 0.6.0-SNAPSHOT
+version: 0.7.0-SNAPSHOT
 
 dependencies:
   - name: eck-elasticsearch
     condition: eck-elasticsearch.enabled
-    version: "0.5.0-SNAPSHOT"
+    version: "0.7.0-SNAPSHOT"
   - name: eck-kibana
     condition: eck-kibana.enabled
-    version: "0.5.0-SNAPSHOT"
+    version: "0.7.0-SNAPSHOT"
   - name: eck-agent
     condition: eck-agent.enabled
-    version: "0.5.0-SNAPSHOT"
+    version: "0.7.0-SNAPSHOT"
   - name: eck-fleet-server
     condition: eck-fleet-server.enabled
-    version: "0.5.0-SNAPSHOT"
+    version: "0.7.0-SNAPSHOT"
   - name: eck-beats
     condition: eck-beats.enabled
-    version: "0.4.0-SNAPSHOT"
+    version: "0.7.0-SNAPSHOT"
diff --git a/deploy/eck-stack/charts/eck-agent/Chart.yaml b/deploy/eck-stack/charts/eck-agent/Chart.yaml
index 1d47ab825d..7ee4bc6393 100644
--- a/deploy/eck-stack/charts/eck-agent/Chart.yaml
+++ b/deploy/eck-stack/charts/eck-agent/Chart.yaml
@@ -3,7 +3,7 @@ name: eck-agent
 description: Elastic Agent managed by the ECK operator
 kubeVersion: ">= 1.21.0-0"
 type: application
-version: 0.5.0-SNAPSHOT
+version: 0.7.0-SNAPSHOT
 sources:
   - https://github.com/elastic/cloud-on-k8s
   - https://github.com/elastic/elastic-agent
diff --git a/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-cluster-role-binding_test.yaml b/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-cluster-role-binding_test.yaml
index 17d903d39f..dff77a0326 100644
--- a/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-cluster-role-binding_test.yaml
+++ b/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-cluster-role-binding_test.yaml
@@ -79,7 +79,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-agent
             clusterRoleBinding: label
-            helm.sh/chart: eck-agent-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-agent-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-cluster-role_test.yaml b/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-cluster-role_test.yaml
index 80feafd5db..de7b5198e8 100644
--- a/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-cluster-role_test.yaml
+++ b/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-cluster-role_test.yaml
@@ -136,7 +136,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-agent
             clusterRole: label
-            helm.sh/chart: eck-agent-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-agent-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-service-account_test.yaml b/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-service-account_test.yaml
index 64e3096917..c3bed806b2 100644
--- a/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-service-account_test.yaml
+++ b/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent-service-account_test.yaml
@@ -49,7 +49,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-agent
             serviceAccount: label
-            helm.sh/chart: eck-agent-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-agent-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent_test.yaml b/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent_test.yaml
index c3041fcd6a..93a3722ce7 100644
--- a/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent_test.yaml
+++ b/deploy/eck-stack/charts/eck-agent/templates/tests/elastic-agent_test.yaml
@@ -51,7 +51,7 @@ tests:
             app.kubernetes.io/instance: quickstart
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-agent
-            helm.sh/chart: eck-agent-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-agent-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-beats/Chart.yaml b/deploy/eck-stack/charts/eck-beats/Chart.yaml
index e2d8257cf7..a2541cf920 100644
--- a/deploy/eck-stack/charts/eck-beats/Chart.yaml
+++ b/deploy/eck-stack/charts/eck-beats/Chart.yaml
@@ -4,7 +4,7 @@ description: Elastic Beats managed by the ECK operator
 # Requirement comes from minimum version supported for eck-operator (https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s_supported_versions.html)
 kubeVersion: ">= 1.20.0-0"
 type: application
-version: 0.4.0-SNAPSHOT
+version: 0.7.0-SNAPSHOT
 sources:
   - https://github.com/elastic/cloud-on-k8s
   - https://github.com/elastic/beats
diff --git a/deploy/eck-stack/charts/eck-beats/templates/tests/beats-metricbeat-example_test.yaml b/deploy/eck-stack/charts/eck-beats/templates/tests/beats-metricbeat-example_test.yaml
index 969b3ef66a..3f3695dca9 100644
--- a/deploy/eck-stack/charts/eck-beats/templates/tests/beats-metricbeat-example_test.yaml
+++ b/deploy/eck-stack/charts/eck-beats/templates/tests/beats-metricbeat-example_test.yaml
@@ -233,7 +233,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-beats
             serviceAccount: label
-            helm.sh/chart: eck-beats-0.4.0-SNAPSHOT
+            helm.sh/chart: eck-beats-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-elasticsearch/Chart.yaml b/deploy/eck-stack/charts/eck-elasticsearch/Chart.yaml
index de3d204a3c..d26cf4f0a7 100644
--- a/deploy/eck-stack/charts/eck-elasticsearch/Chart.yaml
+++ b/deploy/eck-stack/charts/eck-elasticsearch/Chart.yaml
@@ -3,7 +3,7 @@ name: eck-elasticsearch
 description: Elasticsearch managed by the ECK operator
 kubeVersion: ">= 1.21.0-0"
 type: application
-version: 0.5.0-SNAPSHOT
+version: 0.7.0-SNAPSHOT
 sources:
   - https://github.com/elastic/cloud-on-k8s
   - https://github.com/elastic/elasticsearch/
diff --git a/deploy/eck-stack/charts/eck-elasticsearch/templates/tests/elasticsearch_test.yaml b/deploy/eck-stack/charts/eck-elasticsearch/templates/tests/elasticsearch_test.yaml
index 55bc314bbd..ead878608f 100644
--- a/deploy/eck-stack/charts/eck-elasticsearch/templates/tests/elasticsearch_test.yaml
+++ b/deploy/eck-stack/charts/eck-elasticsearch/templates/tests/elasticsearch_test.yaml
@@ -108,7 +108,7 @@ tests:
             app.kubernetes.io/instance: quickstart
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-elasticsearch
-            helm.sh/chart: eck-elasticsearch-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-elasticsearch-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-fleet-server/Chart.yaml b/deploy/eck-stack/charts/eck-fleet-server/Chart.yaml
index 45bde4e1b5..a97025773a 100644
--- a/deploy/eck-stack/charts/eck-fleet-server/Chart.yaml
+++ b/deploy/eck-stack/charts/eck-fleet-server/Chart.yaml
@@ -3,7 +3,7 @@ name: eck-fleet-server
 description: Elastic Fleet Server as an Agent managed by the ECK operator
 kubeVersion: ">= 1.21.0-0"
 type: application
-version: 0.5.0-SNAPSHOT
+version: 0.7.0-SNAPSHOT
 sources:
   - https://github.com/elastic/cloud-on-k8s
   - https://github.com/elastic/elastic-agent
diff --git a/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-cluster-role-binding_test.yaml b/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-cluster-role-binding_test.yaml
index fa0817094c..82e2d1c1b4 100644
--- a/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-cluster-role-binding_test.yaml
+++ b/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-cluster-role-binding_test.yaml
@@ -49,7 +49,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-fleet-server
             clusterRoleBinding: label
-            helm.sh/chart: eck-fleet-server-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-fleet-server-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-cluster-role_test.yaml b/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-cluster-role_test.yaml
index 714fee4218..e6c8a22372 100644
--- a/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-cluster-role_test.yaml
+++ b/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-cluster-role_test.yaml
@@ -62,7 +62,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-fleet-server
             clusterRole: label
-            helm.sh/chart: eck-fleet-server-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-fleet-server-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-service-account_test.yaml b/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-service-account_test.yaml
index 6b65163fd3..2d22578ad5 100644
--- a/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-service-account_test.yaml
+++ b/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server-service-account_test.yaml
@@ -34,7 +34,7 @@ tests:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-fleet-server
             serviceAccount: label
-            helm.sh/chart: eck-fleet-server-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-fleet-server-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server_test.yaml b/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server_test.yaml
index 0a38db9a40..6cde15e5b0 100644
--- a/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server_test.yaml
+++ b/deploy/eck-stack/charts/eck-fleet-server/templates/tests/fleet-server_test.yaml
@@ -46,7 +46,7 @@ tests:
             app.kubernetes.io/instance: quickstart
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-fleet-server
-            helm.sh/chart: eck-fleet-server-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-fleet-server-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations
diff --git a/deploy/eck-stack/charts/eck-kibana/Chart.yaml b/deploy/eck-stack/charts/eck-kibana/Chart.yaml
index 5e68e6f4e1..ee00dddbb9 100644
--- a/deploy/eck-stack/charts/eck-kibana/Chart.yaml
+++ b/deploy/eck-stack/charts/eck-kibana/Chart.yaml
@@ -3,7 +3,7 @@ name: eck-kibana
 description: Kibana managed by the ECK operator
 kubeVersion: ">= 1.21.0-0"
 type: application
-version: 0.5.0-SNAPSHOT
+version: 0.7.0-SNAPSHOT
 sources:
   - https://github.com/elastic/cloud-on-k8s
   - https://github.com/elastic/kibana
diff --git a/deploy/eck-stack/charts/eck-kibana/templates/tests/kibana_test.yaml b/deploy/eck-stack/charts/eck-kibana/templates/tests/kibana_test.yaml
index 21aa275c14..31ccea489d 100644
--- a/deploy/eck-stack/charts/eck-kibana/templates/tests/kibana_test.yaml
+++ b/deploy/eck-stack/charts/eck-kibana/templates/tests/kibana_test.yaml
@@ -53,7 +53,7 @@ tests:
             app.kubernetes.io/instance: quickstart
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: eck-kibana
-            helm.sh/chart: eck-kibana-0.5.0-SNAPSHOT
+            helm.sh/chart: eck-kibana-0.7.0-SNAPSHOT
             test: label
       - equal:
           path: metadata.annotations