diff --git a/.buildkite/e2e/nightly-main-matrix.yaml b/.buildkite/e2e/nightly-main-matrix.yaml
index bf20c11dfa..384d343051 100644
--- a/.buildkite/e2e/nightly-main-matrix.yaml
+++ b/.buildkite/e2e/nightly-main-matrix.yaml
@@ -3,9 +3,10 @@
   fixed:
     E2E_PROVIDER: gke
   mixed:
-    - E2E_STACK_VERSION: "7.17.25"
-    # current stack version 8.16.x is tested in all other tests no need to test it again
+    - E2E_STACK_VERSION: "7.17.26"
+    # current stack version 8.17.x is tested in all other tests no need to test it again
     - E2E_STACK_VERSION: "8.18.0-SNAPSHOT"
+    - E2E_STACK_VERSION: "9.0.0-SNAPSHOT"
 
 - label: kind
   fixed:
diff --git a/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml b/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml
index 243420439d..a5403d88b6 100644
--- a/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml
+++ b/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml
@@ -83,6 +83,7 @@ steps:
       image: "family/core-ubuntu-2004"
       {{- if eq $test.Provider "kind" }}
       machineType: "{{ $.KindAgentsMachineType }}"
+      diskSizeGb: "150G"
       {{- end }}
       {{- else }}
       image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a426ea5f
diff --git a/Makefile b/Makefile
index 9cd1a6596a..7010bd4a64 100644
--- a/Makefile
+++ b/Makefile
@@ -418,7 +418,7 @@ drivah-build-e2e:
 
 # -- run
 
-E2E_STACK_VERSION          ?= 8.16.0
+E2E_STACK_VERSION          ?= 8.17.0
 # regexp to filter tests to run
 export TESTS_MATCH         ?= "^Test"
 export E2E_JSON            ?= false
diff --git a/config/e2e/helm-monitoring-operator.yaml b/config/e2e/helm-monitoring-operator.yaml
index ff24475893..4a7da3f98a 100644
--- a/config/e2e/helm-monitoring-operator.yaml
+++ b/config/e2e/helm-monitoring-operator.yaml
@@ -6,7 +6,7 @@ managedNamespaces: [{{ .E2ENamespace }}]
 
 image:
   repository: docker.elastic.co/eck/eck-operator
-  tag: 2.15.0
+  tag: 2.16.0
 
 podAnnotations:
   co.elastic.metrics/metricsets: collector
diff --git a/config/e2e/monitoring.yaml b/config/e2e/monitoring.yaml
index 0f4c06a9c2..d6fd6d7428 100644
--- a/config/e2e/monitoring.yaml
+++ b/config/e2e/monitoring.yaml
@@ -5,7 +5,7 @@ metadata:
   name: e2e-agent
   namespace: {{ .E2ENamespace }}
 spec:
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
     - secretName: eck-{{ .TestRun }}
   daemonSet:
@@ -221,7 +221,7 @@ spec:
       meta:
         package:
           name: system
-          version: 8.16.0
+          version: 8.17.0
       data_stream:
         namespace: default
       processors:
diff --git a/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml b/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml
index 5fa5b1e423..7994bd443f 100644
--- a/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml
+++ b/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml
@@ -4,7 +4,7 @@ metadata:
   name: apm-server-quickstart
   namespace: default
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   config:
     name: elastic-apm
diff --git a/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml b/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml
index 6661e74acb..0e045fc787 100644
--- a/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml
+++ b/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml
@@ -84,7 +84,7 @@ metadata:
   name: elasticsearch-sample
   namespace: elasticsearch-ns
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 1
@@ -97,7 +97,7 @@ metadata:
   name: kibana-sample
   namespace: kibana-ns
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   config:
     xpack.fleet.packages:
@@ -115,7 +115,7 @@ metadata:
   name: apm-apm-sample
   namespace: apmserver-ns
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: "elasticsearch-sample"
diff --git a/config/recipes/autopilot/elasticsearch.yaml b/config/recipes/autopilot/elasticsearch.yaml
index e02333c217..f5e3c44e31 100644
--- a/config/recipes/autopilot/elasticsearch.yaml
+++ b/config/recipes/autopilot/elasticsearch.yaml
@@ -41,7 +41,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 1
diff --git a/config/recipes/autopilot/fleet-kubernetes-integration.yaml b/config/recipes/autopilot/fleet-kubernetes-integration.yaml
index d1d95c1671..967f43505b 100644
--- a/config/recipes/autopilot/fleet-kubernetes-integration.yaml
+++ b/config/recipes/autopilot/fleet-kubernetes-integration.yaml
@@ -41,7 +41,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 1
@@ -74,7 +74,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -138,7 +138,7 @@ kind: Agent
 metadata:
   name: fleet-server
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   elasticsearchRefs:
@@ -179,7 +179,7 @@ kind: Agent
 metadata: 
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   fleetServerRef: 
diff --git a/config/recipes/autopilot/kubernetes-integration.yaml b/config/recipes/autopilot/kubernetes-integration.yaml
index a1f24baec5..d61bc90ff6 100644
--- a/config/recipes/autopilot/kubernetes-integration.yaml
+++ b/config/recipes/autopilot/kubernetes-integration.yaml
@@ -4,7 +4,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -27,7 +27,7 @@ kind: Agent
 metadata:
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
   - name: elasticsearch
   daemonSet:
diff --git a/config/recipes/autopilot/metricbeat_hosts.yaml b/config/recipes/autopilot/metricbeat_hosts.yaml
index ed63fad613..db0ed1acc7 100644
--- a/config/recipes/autopilot/metricbeat_hosts.yaml
+++ b/config/recipes/autopilot/metricbeat_hosts.yaml
@@ -4,7 +4,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -28,7 +28,7 @@ metadata:
   name: metricbeat
 spec:
   type: metricbeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   kibanaRef:
diff --git a/config/recipes/autoscaling/elasticsearch.yaml b/config/recipes/autoscaling/elasticsearch.yaml
index 3eccfc7d48..3a8dc49d1f 100644
--- a/config/recipes/autoscaling/elasticsearch.yaml
+++ b/config/recipes/autoscaling/elasticsearch.yaml
@@ -51,7 +51,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: master
       count: 3
diff --git a/config/recipes/beats/auditbeat_hosts.yaml b/config/recipes/beats/auditbeat_hosts.yaml
index f31edcd790..7543184c87 100644
--- a/config/recipes/beats/auditbeat_hosts.yaml
+++ b/config/recipes/beats/auditbeat_hosts.yaml
@@ -4,7 +4,7 @@ metadata:
   name: auditbeat
 spec:
   type: auditbeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   kibanaRef:
@@ -76,7 +76,7 @@ spec:
         #    path: /run
         #initContainers:
         #- name: cos-init
-        #  image: docker.elastic.co/beats/auditbeat:8.16.0
+        #  image: docker.elastic.co/beats/auditbeat:8.17.0
         #  volumeMounts:
         #  - name: run
         #    mountPath: /run
@@ -118,7 +118,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -130,7 +130,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/beats/filebeat_autodiscover.yaml b/config/recipes/beats/filebeat_autodiscover.yaml
index a0485ad094..617aacd950 100644
--- a/config/recipes/beats/filebeat_autodiscover.yaml
+++ b/config/recipes/beats/filebeat_autodiscover.yaml
@@ -4,7 +4,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   kibanaRef:
@@ -114,7 +114,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -126,7 +126,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml b/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml
index f633549f78..f831a36da9 100644
--- a/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml
+++ b/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml
@@ -4,7 +4,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   kibanaRef:
@@ -102,7 +102,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -114,7 +114,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/beats/filebeat_no_autodiscover.yaml b/config/recipes/beats/filebeat_no_autodiscover.yaml
index 77263be84f..e49cdd1383 100644
--- a/config/recipes/beats/filebeat_no_autodiscover.yaml
+++ b/config/recipes/beats/filebeat_no_autodiscover.yaml
@@ -4,7 +4,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   kibanaRef:
@@ -53,7 +53,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -65,7 +65,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/beats/heartbeat_es_kb_health.yaml b/config/recipes/beats/heartbeat_es_kb_health.yaml
index ee0076149e..4047a18933 100644
--- a/config/recipes/beats/heartbeat_es_kb_health.yaml
+++ b/config/recipes/beats/heartbeat_es_kb_health.yaml
@@ -4,7 +4,7 @@ metadata:
   name: heartbeat
 spec:
   type: heartbeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   config:
@@ -27,7 +27,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -39,7 +39,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/beats/metricbeat_hosts.yaml b/config/recipes/beats/metricbeat_hosts.yaml
index a766be1561..003ebd3a2a 100644
--- a/config/recipes/beats/metricbeat_hosts.yaml
+++ b/config/recipes/beats/metricbeat_hosts.yaml
@@ -4,7 +4,7 @@ metadata:
   name: metricbeat
 spec:
   type: metricbeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   kibanaRef:
@@ -174,7 +174,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -186,7 +186,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/beats/openshift_monitoring.yaml b/config/recipes/beats/openshift_monitoring.yaml
index 44d8f924e7..c787b99eab 100644
--- a/config/recipes/beats/openshift_monitoring.yaml
+++ b/config/recipes/beats/openshift_monitoring.yaml
@@ -4,7 +4,7 @@ metadata:
   name: metricbeat
 spec:
   type: metricbeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   kibanaRef:
@@ -221,7 +221,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   kibanaRef:
@@ -316,7 +316,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -328,7 +328,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/beats/packetbeat_dns_http.yaml b/config/recipes/beats/packetbeat_dns_http.yaml
index 3762fc996a..51f19c07ea 100644
--- a/config/recipes/beats/packetbeat_dns_http.yaml
+++ b/config/recipes/beats/packetbeat_dns_http.yaml
@@ -4,7 +4,7 @@ metadata:
   name: packetbeat
 spec:
   type: packetbeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch
   kibanaRef:
@@ -44,7 +44,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -56,7 +56,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/beats/stack_monitoring.yaml b/config/recipes/beats/stack_monitoring.yaml
index 0ac668736b..cc1b9de78d 100644
--- a/config/recipes/beats/stack_monitoring.yaml
+++ b/config/recipes/beats/stack_monitoring.yaml
@@ -6,7 +6,7 @@ metadata:
   name: metricbeat
 spec:
   type: metricbeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch-monitoring
   config:
@@ -140,7 +140,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: elasticsearch-monitoring
   kibanaRef:
@@ -252,7 +252,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -268,7 +268,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -285,7 +285,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch-monitoring
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -297,7 +297,7 @@ kind: Kibana
 metadata:
   name: kibana-monitoring
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch-monitoring
diff --git a/config/recipes/elastic-agent/fleet-apm-integration.yaml b/config/recipes/elastic-agent/fleet-apm-integration.yaml
index b6ef01d75f..496d4cee1b 100644
--- a/config/recipes/elastic-agent/fleet-apm-integration.yaml
+++ b/config/recipes/elastic-agent/fleet-apm-integration.yaml
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -61,7 +61,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -73,7 +73,7 @@ kind: Agent
 metadata:
   name: fleet-server
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   elasticsearchRefs:
@@ -95,7 +95,7 @@ kind: Agent
 metadata: 
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   fleetServerRef: 
diff --git a/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml b/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml
index 8a49c8c6b5..a3f3ea2921 100644
--- a/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml
+++ b/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -70,7 +70,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -82,7 +82,7 @@ kind: Agent
 metadata:
   name: fleet-server
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   elasticsearchRefs:
@@ -104,7 +104,7 @@ kind: Agent
 metadata: 
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   fleetServerRef: 
diff --git a/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml b/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml
index 98cfd2502d..72505f4da3 100644
--- a/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml
+++ b/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml
@@ -71,7 +71,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -129,7 +129,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -141,7 +141,7 @@ kind: Agent
 metadata:
   name: fleet-server
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   elasticsearchRefs:
@@ -161,7 +161,7 @@ kind: Agent
 metadata: 
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   fleetServerRef: 
diff --git a/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml b/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml
index 485f370cac..c5c54f1b22 100644
--- a/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml
+++ b/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -54,7 +54,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -66,7 +66,7 @@ kind: Agent
 metadata:
   name: fleet-server
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   elasticsearchRefs:
@@ -88,7 +88,7 @@ kind: Agent
 metadata: 
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   kibanaRef:
     name: kibana
   fleetServerRef: 
diff --git a/config/recipes/elastic-agent/ksm-sharding.yaml b/config/recipes/elastic-agent/ksm-sharding.yaml
index 9b88c6999f..34d514c3af 100644
--- a/config/recipes/elastic-agent/ksm-sharding.yaml
+++ b/config/recipes/elastic-agent/ksm-sharding.yaml
@@ -3,7 +3,7 @@ kind: Agent
 metadata:
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
   - name: elasticsearch
   statefulSet:
@@ -450,7 +450,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -462,7 +462,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/elastic-agent/kubernetes-integration.yaml b/config/recipes/elastic-agent/kubernetes-integration.yaml
index a6021c8761..dd0cd01c9d 100644
--- a/config/recipes/elastic-agent/kubernetes-integration.yaml
+++ b/config/recipes/elastic-agent/kubernetes-integration.yaml
@@ -3,7 +3,7 @@ kind: Agent
 metadata:
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
   - name: elasticsearch
   daemonSet:
@@ -213,7 +213,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -225,7 +225,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/elastic-agent/multi-output.yaml b/config/recipes/elastic-agent/multi-output.yaml
index 698ba0cdb1..dbf75604d9 100644
--- a/config/recipes/elastic-agent/multi-output.yaml
+++ b/config/recipes/elastic-agent/multi-output.yaml
@@ -3,7 +3,7 @@ kind: Agent
 metadata:
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
   - outputName: default
     name: elasticsearch
@@ -196,7 +196,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -208,7 +208,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -218,7 +218,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch-mon
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -230,7 +230,7 @@ kind: Kibana
 metadata:
   name: kibana-mon
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch-mon
diff --git a/config/recipes/elastic-agent/system-integration.yaml b/config/recipes/elastic-agent/system-integration.yaml
index 6fc8ff7595..16b6269156 100644
--- a/config/recipes/elastic-agent/system-integration.yaml
+++ b/config/recipes/elastic-agent/system-integration.yaml
@@ -3,7 +3,7 @@ kind: Agent
 metadata:
   name: elastic-agent
 spec:
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
   - name: elasticsearch
   daemonSet:
@@ -31,7 +31,7 @@ spec:
       meta:
         package:
           name: system
-          version: 8.16.0
+          version: 8.17.0
       data_stream:
         namespace: default
       streams:
@@ -136,7 +136,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -148,7 +148,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
diff --git a/config/recipes/gclb/01-elastic-stack.yaml b/config/recipes/gclb/01-elastic-stack.yaml
index 47d9b6fd4c..fe9ce9f631 100644
--- a/config/recipes/gclb/01-elastic-stack.yaml
+++ b/config/recipes/gclb/01-elastic-stack.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: hulk
 spec:
-  version: 8.16.0
+  version: 8.17.0
   http:
     service:
       metadata:
@@ -45,7 +45,7 @@ metadata:
   labels:
     app: hulk
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   http:
     service:
diff --git a/config/recipes/gclb/99-kibana-path.yaml b/config/recipes/gclb/99-kibana-path.yaml
index c22b028df5..c5b3c231a6 100644
--- a/config/recipes/gclb/99-kibana-path.yaml
+++ b/config/recipes/gclb/99-kibana-path.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: thor
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   config:
     # Make Kibana aware of the fact that it is behind a proxy
diff --git a/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml b/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml
index 25f00f6a7b..13afad06df 100644
--- a/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml
+++ b/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: ekmnt
 spec:
-  version: 8.16.0
+  version: 8.17.0
   http:
     tls:
       selfSignedCertificate:
@@ -82,7 +82,7 @@ metadata:
   labels:
     app: ekmnt
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   http:
     tls:
diff --git a/config/recipes/logstash/logstash-eck.yaml b/config/recipes/logstash/logstash-eck.yaml
index 043c43f9b5..fe5263443a 100644
--- a/config/recipes/logstash/logstash-eck.yaml
+++ b/config/recipes/logstash/logstash-eck.yaml
@@ -4,7 +4,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -17,7 +17,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -28,7 +28,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   config:
     filebeat.inputs:
       - type: log
@@ -67,7 +67,7 @@ metadata:
   name: logstash
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
     - clusterName: eck
       name: elasticsearch
diff --git a/config/recipes/logstash/logstash-es-role.yaml b/config/recipes/logstash/logstash-es-role.yaml
index 1a332850bc..4cc992f6d6 100644
--- a/config/recipes/logstash/logstash-es-role.yaml
+++ b/config/recipes/logstash/logstash-es-role.yaml
@@ -15,7 +15,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   auth:
     roles:
       - secretName: my-roles-secret
@@ -31,7 +31,7 @@ metadata:
   name: logstash
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
     - name: elasticsearch
       clusterName: eck
diff --git a/config/recipes/logstash/logstash-monitored.yaml b/config/recipes/logstash/logstash-monitored.yaml
index f27555aa9d..e0660c5a6b 100644
--- a/config/recipes/logstash/logstash-monitored.yaml
+++ b/config/recipes/logstash/logstash-monitored.yaml
@@ -4,7 +4,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -17,7 +17,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -28,7 +28,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   config:
     filebeat.inputs:
       - type: log
@@ -67,7 +67,7 @@ metadata:
   name: logstash
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
     - clusterName: eck
       name: elasticsearch
@@ -116,7 +116,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch-monitoring
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -128,7 +128,7 @@ kind: Kibana
 metadata:
   name: kibana-monitoring
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch-monitoring
diff --git a/config/recipes/logstash/logstash-multi.yaml b/config/recipes/logstash/logstash-multi.yaml
index 58c6040e3a..8947e9437e 100644
--- a/config/recipes/logstash/logstash-multi.yaml
+++ b/config/recipes/logstash/logstash-multi.yaml
@@ -12,7 +12,7 @@ metadata:
   name: qa
   namespace: qa
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -25,7 +25,7 @@ kind: Elasticsearch
 metadata:
   name: production
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -39,7 +39,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   config:
     filebeat.inputs:
       - type: log
@@ -78,7 +78,7 @@ metadata:
   name: logstash
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
   - clusterName: prod-es
     name: production
diff --git a/config/recipes/logstash/logstash-pipeline-as-secret.yaml b/config/recipes/logstash/logstash-pipeline-as-secret.yaml
index a6d97a66cb..6d5a83ffa4 100644
--- a/config/recipes/logstash/logstash-pipeline-as-secret.yaml
+++ b/config/recipes/logstash/logstash-pipeline-as-secret.yaml
@@ -4,7 +4,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -17,7 +17,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -28,7 +28,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   config:
     filebeat.inputs:
       - type: log
@@ -67,7 +67,7 @@ metadata:
   name: logstash
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
     - clusterName: eck
       name: elasticsearch
diff --git a/config/recipes/logstash/logstash-pipeline-as-volume.yaml b/config/recipes/logstash/logstash-pipeline-as-volume.yaml
index 8aa22aaf7f..f356675db7 100644
--- a/config/recipes/logstash/logstash-pipeline-as-volume.yaml
+++ b/config/recipes/logstash/logstash-pipeline-as-volume.yaml
@@ -4,7 +4,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -17,7 +17,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch
@@ -28,7 +28,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   config:
     filebeat.inputs:
       - type: log
@@ -67,7 +67,7 @@ metadata:
   name: logstash
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
     - clusterName: eck
       name: elasticsearch
diff --git a/config/recipes/logstash/logstash-volumes.yaml b/config/recipes/logstash/logstash-volumes.yaml
index b87396b81c..03dbbed76b 100644
--- a/config/recipes/logstash/logstash-volumes.yaml
+++ b/config/recipes/logstash/logstash-volumes.yaml
@@ -4,7 +4,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -18,7 +18,7 @@ metadata:
   name: filebeat
 spec:
   type: filebeat
-  version: 8.16.0
+  version: 8.17.0
   config:
     filebeat.inputs:
       - type: log
@@ -57,7 +57,7 @@ metadata:
   name: logstash
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
     - clusterName: eck
       name: elasticsearch
diff --git a/config/recipes/maps/01-ems.yaml b/config/recipes/maps/01-ems.yaml
index ba0b931d05..74498833dc 100644
--- a/config/recipes/maps/01-ems.yaml
+++ b/config/recipes/maps/01-ems.yaml
@@ -3,5 +3,5 @@ kind: ElasticMapsServer
 metadata:
   name: ems-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
diff --git a/config/recipes/maps/02-es-kb.yaml b/config/recipes/maps/02-es-kb.yaml
index acf611ee83..fd8b446d08 100644
--- a/config/recipes/maps/02-es-kb.yaml
+++ b/config/recipes/maps/02-es-kb.yaml
@@ -4,7 +4,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -27,7 +27,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   config:
     # Configure this to a domain you control
diff --git a/config/recipes/remoteclusters/elasticsearch.yaml b/config/recipes/remoteclusters/elasticsearch.yaml
index 99a81e2ae1..6b5606aecb 100644
--- a/config/recipes/remoteclusters/elasticsearch.yaml
+++ b/config/recipes/remoteclusters/elasticsearch.yaml
@@ -9,7 +9,7 @@ metadata:
   name: cluster1
   namespace: ns1
 spec:
-  version: 8.16.0
+  version: 8.17.0
   remoteClusters:
     - name: to-ns2-cluster2
       elasticsearchRef:
@@ -38,7 +38,7 @@ spec:
 #      spec:
 #        # expose this cluster Service with a LoadBalancer
 #        type: LoadBalancer
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: "cluster1"
@@ -54,7 +54,7 @@ metadata:
   name: cluster2
   namespace: ns2
 spec:
-  version: 8.16.0
+  version: 8.17.0
   ## Required for this cluster to be accessed using remote cluster API keys.
   remoteClusterServer:
     enabled: true
@@ -75,7 +75,7 @@ spec:
 #      spec:
 #        # expose this cluster Service with a LoadBalancer
 #        type: LoadBalancer
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: "cluster2"
\ No newline at end of file
diff --git a/config/recipes/traefik/02-elastic-stack.yaml b/config/recipes/traefik/02-elastic-stack.yaml
index 0e66b67504..7126af16cc 100644
--- a/config/recipes/traefik/02-elastic-stack.yaml
+++ b/config/recipes/traefik/02-elastic-stack.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: hulk
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: master
     count: 1
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: hulk
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   config:
     xpack.fleet.packages:
@@ -57,7 +57,7 @@ metadata:
   labels:
     app: hulk
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: hulk
diff --git a/config/samples/apm/apm_es_kibana.yaml b/config/samples/apm/apm_es_kibana.yaml
index 065ccc2dab..378e13ab34 100644
--- a/config/samples/apm/apm_es_kibana.yaml
+++ b/config/samples/apm/apm_es_kibana.yaml
@@ -5,7 +5,7 @@ kind: Elasticsearch
 metadata:
   name: es-apm-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 3
@@ -19,7 +19,7 @@ kind: Kibana
 metadata:
   name: kb-apm-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: "es-apm-sample"
@@ -33,7 +33,7 @@ kind: ApmServer
 metadata:
   name: apm-apm-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: "es-apm-sample"
diff --git a/config/samples/elasticsearch/elasticsearch.yaml b/config/samples/elasticsearch/elasticsearch.yaml
index 45da21c331..c515b00312 100644
--- a/config/samples/elasticsearch/elasticsearch.yaml
+++ b/config/samples/elasticsearch/elasticsearch.yaml
@@ -7,7 +7,7 @@ metadata:
   #  eck.k8s.elastic.co/downward-node-labels: "topology.kubernetes.io/zone"
   name: elasticsearch-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     config:
diff --git a/config/samples/enterprisesearch/ent_es.yaml b/config/samples/enterprisesearch/ent_es.yaml
index 304f2457a5..d298bea743 100644
--- a/config/samples/enterprisesearch/ent_es.yaml
+++ b/config/samples/enterprisesearch/ent_es.yaml
@@ -4,7 +4,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 1
@@ -23,7 +23,7 @@ kind: Kibana
 metadata:
   name: kibana-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch-sample
@@ -35,7 +35,7 @@ kind: EnterpriseSearch
 metadata:
   name: ent-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: elasticsearch-sample
diff --git a/config/samples/kibana/kibana_es.yaml b/config/samples/kibana/kibana_es.yaml
index 790b1c4d9f..9e60d16b98 100644
--- a/config/samples/kibana/kibana_es.yaml
+++ b/config/samples/kibana/kibana_es.yaml
@@ -4,7 +4,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
   - name: default
     count: 1
@@ -18,7 +18,7 @@ kind: Kibana
 metadata:
   name: kibana-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 1
   elasticsearchRef:
     name: "elasticsearch-sample"
diff --git a/config/samples/logstash/logstash.yaml b/config/samples/logstash/logstash.yaml
index f716a0a5f7..1a8b17009e 100644
--- a/config/samples/logstash/logstash.yaml
+++ b/config/samples/logstash/logstash.yaml
@@ -3,7 +3,7 @@ kind: Logstash
 metadata:
   name: logstash-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   count: 3
   config:
     log.level: info
diff --git a/config/samples/logstash/logstash_es.yaml b/config/samples/logstash/logstash_es.yaml
index 00c6386dc1..a6da5a64c4 100644
--- a/config/samples/logstash/logstash_es.yaml
+++ b/config/samples/logstash/logstash_es.yaml
@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 2
@@ -16,7 +16,7 @@ metadata:
   name: logstash-sample
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRefs:
     - clusterName: production
       name: elasticsearch-sample
diff --git a/config/samples/logstash/logstash_pv.yaml b/config/samples/logstash/logstash_pv.yaml
index a548c0809d..3d8155ed90 100644
--- a/config/samples/logstash/logstash_pv.yaml
+++ b/config/samples/logstash/logstash_pv.yaml
@@ -4,7 +4,7 @@ metadata:
   name: d
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   config:
     queue.type: persisted
   pipelines:
diff --git a/config/samples/logstash/logstash_stackmonitor.yaml b/config/samples/logstash/logstash_stackmonitor.yaml
index d0e30525d3..e63e94ba79 100644
--- a/config/samples/logstash/logstash_stackmonitor.yaml
+++ b/config/samples/logstash/logstash_stackmonitor.yaml
@@ -4,7 +4,7 @@ kind: Elasticsearch
 metadata:
   name: monitoring
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -17,7 +17,7 @@ metadata:
   name: logstash-sample
 spec:
   count: 1
-  version: 8.16.0
+  version: 8.17.0
   config:
     log.level: info
     api.http.host: "0.0.0.0"
@@ -55,7 +55,7 @@ kind: Kibana
 metadata:
   name: kibana-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   elasticsearchRef:
     name: monitoring
   count: 1
diff --git a/config/samples/logstash/logstash_svc.yaml b/config/samples/logstash/logstash_svc.yaml
index 1cf9151c94..1cf52ce672 100644
--- a/config/samples/logstash/logstash_svc.yaml
+++ b/config/samples/logstash/logstash_svc.yaml
@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch-sample
 spec:
-  version: 8.16.0
+  version: 8.17.0
   nodeSets:
     - name: default
       count: 3
@@ -16,7 +16,7 @@ metadata:
   name: logstash-sample
 spec:
   count: 2
-  version: 8.16.0
+  version: 8.17.0
   config:
     log.level: info
     api.http.host: "0.0.0.0"