diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index bf8c32e40..405355d9d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -150,6 +150,7 @@ steps:
 
       - label: ":gcloud: Cloud e2e Test"
         key: "cloud-e2e-test"
+        skip: true
         command: ".buildkite/scripts/cloud_e2e_test.sh"
         agents:
           provider: "gcp"
diff --git a/dev-tools/cloud/terraform/main.tf b/dev-tools/cloud/terraform/main.tf
index 9dc7d75bb..9aa7749ab 100644
--- a/dev-tools/cloud/terraform/main.tf
+++ b/dev-tools/cloud/terraform/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     ec = {
       source  = "elastic/ec"
-      version = "0.9.0"
+      version = "0.11.0"
     }
   }
 }
@@ -47,7 +47,7 @@ resource "ec_deployment" "deployment" {
   name                   = format("fleet server PR %s", random_uuid.name.result)
   region                 = "gcp-us-west2"
   version                = local.stack_version
-  deployment_template_id = "gcp-io-optimized-v2"
+  deployment_template_id = "gcp-general-purpose"
 
   tags = {
     "created_with_terraform" = "true"
diff --git a/dev-tools/e2e/docker-compose.yml b/dev-tools/e2e/docker-compose.yml
index 11c43eb5d..c260d2eee 100644
--- a/dev-tools/e2e/docker-compose.yml
+++ b/dev-tools/e2e/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   kibana:
-    image: "docker.elastic.co/kibana/kibana:${ELASTICSEARCH_VERSION}-amd64"
+    image: "docker.elastic.co/kibana/kibana:${ELASTICSEARCH_VERSION}"
     container_name: kibana
     healthcheck:
       test: ["CMD", "curl", "-f", "${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}@localhost:5601/api/status"]
@@ -17,7 +17,7 @@ services:
     networks:
       - integration
   apm-server:
-    image:  "docker.elastic.co/apm/apm-server:${ELASTICSEARCH_VERSION}-amd64"
+    image:  "docker.elastic.co/apm/apm-server:${ELASTICSEARCH_VERSION}"
     container_name: apm-server
     # curl is not in the apm-server image
     #healthcheck:
diff --git a/dev-tools/integration/.env b/dev-tools/integration/.env
index d0f9501f8..7d7f800fe 100644
--- a/dev-tools/integration/.env
+++ b/dev-tools/integration/.env
@@ -1,6 +1,6 @@
 # If you use change this version without a pinned one, please update
 # .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml
-ELASTICSEARCH_VERSION=8.16.0-3a37a73c-SNAPSHOT
+ELASTICSEARCH_VERSION=9.0.0-e70a10ac-SNAPSHOT
 ELASTICSEARCH_USERNAME=elastic
 ELASTICSEARCH_PASSWORD=changeme
 TEST_ELASTICSEARCH_HOSTS=localhost:9200
diff --git a/dev-tools/integration/docker-compose.yml b/dev-tools/integration/docker-compose.yml
index c5eead706..132526923 100644
--- a/dev-tools/integration/docker-compose.yml
+++ b/dev-tools/integration/docker-compose.yml
@@ -3,7 +3,7 @@ volumes:
     driver: local
 services:
   setup:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}-amd64
+    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}
     volumes:
       - certs:/usr/share/elasticsearch/config/certs
     user: "0"
@@ -45,7 +45,7 @@ services:
         find . -type f -exec chmod 640 \{\} \;;
       ';
   elasticsearch:
-    image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}-amd64"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}"
     container_name: elasticsearch
     environment:
       - node.name=es01
@@ -89,7 +89,7 @@ services:
     depends_on:
       setup:
         condition: service_healthy
-    image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}-amd64"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}"
     container_name: elasticsearch-remote
     environment:
       - node.name=es02
diff --git a/internal/pkg/bulk/bulk_integration_test.go b/internal/pkg/bulk/bulk_integration_test.go
index 923cf4166..efc329ad1 100644
--- a/internal/pkg/bulk/bulk_integration_test.go
+++ b/internal/pkg/bulk/bulk_integration_test.go
@@ -69,8 +69,8 @@ func TestBulkCreate(t *testing.T) {
 			Name:  "Invalid utf-8",
 			Index: string([]byte{0xfe, 0xfe, 0xff, 0xff}),
 			Err: es.ErrElastic{
-				Status: 500,
-				Type:   "json_parse_exception",
+				Status: 400,
+				Type:   "parse_exception",
 			},
 		},
 		{
@@ -100,7 +100,7 @@ func TestBulkCreate(t *testing.T) {
 			// Create
 			id, err := bulker.Create(ctx, test.Index, test.ID, sampleData)
 			if !EqualElastic(test.Err, err) {
-				t.Fatal(err)
+				t.Fatalf("expected error: %+v, got: %+v", test.Err, err)
 			}
 			if err != nil {
 				return
diff --git a/testing/e2e/agent_container_test.go b/testing/e2e/agent_container_test.go
index 158645a8c..4a1952295 100644
--- a/testing/e2e/agent_container_test.go
+++ b/testing/e2e/agent_container_test.go
@@ -37,6 +37,7 @@ type AgentContainerSuite struct {
 }
 
 func TestAgentContainerSuite(t *testing.T) {
+	t.Skip("Flakey test suite skipped. See https://github.com/elastic/fleet-server/issues/3909")
 	suite.Run(t, new(AgentContainerSuite))
 }