diff --git a/.buildkite/ftr_oblt_serverless_configs.yml b/.buildkite/ftr_oblt_serverless_configs.yml
index 0b2f3242c3a4c..6e57fdd4e1c47 100644
--- a/.buildkite/ftr_oblt_serverless_configs.yml
+++ b/.buildkite/ftr_oblt_serverless_configs.yml
@@ -9,7 +9,7 @@ disabled:
   # Empty configs
   - x-pack/solutions/observability/test/serverless/api_integration/configs/config.feature_flags.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts
   - x-pack/solutions/observability/test/serverless/api_integration/configs/config.logs_essentials.ts
diff --git a/.buildkite/ftr_oblt_stateful_configs.yml b/.buildkite/ftr_oblt_stateful_configs.yml
index 8854ffa3023e9..a9e5efec5d8ce 100644
--- a/.buildkite/ftr_oblt_stateful_configs.yml
+++ b/.buildkite/ftr_oblt_stateful_configs.yml
@@ -25,7 +25,7 @@ disabled:
   # Observability AI Assistant local-only tests
   - x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.ai_assistant_local.stateful.config.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/observability/test/alerting_api_integration/observability/config.ts
   - x-pack/solutions/observability/test/api_integration/apis/logs_ui/config.ts
diff --git a/.buildkite/ftr_platform_stateful_configs.yml b/.buildkite/ftr_platform_stateful_configs.yml
index 23297f9f834ea..d57c120c372a4 100644
--- a/.buildkite/ftr_platform_stateful_configs.yml
+++ b/.buildkite/ftr_platform_stateful_configs.yml
@@ -51,7 +51,7 @@ disabled:
   - x-pack/platform/test/functional_gen_ai/inference/config.ts
   - x-pack/platform/test/agent_builder/smoke_tests/config.stateful.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - src/platform/test/accessibility/config.ts
   - src/platform/test/analytics/config.ts
diff --git a/.buildkite/ftr_search_serverless_configs.yml b/.buildkite/ftr_search_serverless_configs.yml
index 2f4f02e951c21..a448612894e44 100644
--- a/.buildkite/ftr_search_serverless_configs.yml
+++ b/.buildkite/ftr_search_serverless_configs.yml
@@ -2,7 +2,7 @@ disabled:
   # Base config files, only necessary to inform config finding script
   - x-pack/platform/test/serverless/functional/config.search.base.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/search/test/serverless/api_integration/configs/config.ts
   - x-pack/solutions/search/test/serverless/api_integration/configs/config.feature_flags.ts
diff --git a/.buildkite/ftr_search_stateful_configs.yml b/.buildkite/ftr_search_stateful_configs.yml
index 83c325243d92f..e72e9a9977791 100644
--- a/.buildkite/ftr_search_stateful_configs.yml
+++ b/.buildkite/ftr_search_stateful_configs.yml
@@ -2,7 +2,7 @@ disabled:
   # Base config files, only necessary to inform config finding script
   - x-pack/solutions/search/test/api_integration/config.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/search/test/functional_search/config.ts
   - x-pack/solutions/search/test/functional_search/config/config.basic.ts
diff --git a/.buildkite/ftr_security_serverless_configs.yml b/.buildkite/ftr_security_serverless_configs.yml
index 7b962dfef30b9..e4a1e133b067c 100644
--- a/.buildkite/ftr_security_serverless_configs.yml
+++ b/.buildkite/ftr_security_serverless_configs.yml
@@ -28,7 +28,7 @@ disabled:
   - x-pack/solutions/security/test/serverless/api_integration/configs/config.feature_flags.ts
   - x-pack/solutions/security/test/serverless/functional/configs/config.feature_flags.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/security/test/serverless/api_integration/configs/config.ts
   - x-pack/platform/test/serverless/api_integration/configs/security/config.group1.ts
diff --git a/.buildkite/ftr_security_stateful_configs.yml b/.buildkite/ftr_security_stateful_configs.yml
index 88bc9a1147c3d..163e8998e8153 100644
--- a/.buildkite/ftr_security_stateful_configs.yml
+++ b/.buildkite/ftr_security_stateful_configs.yml
@@ -36,7 +36,7 @@ disabled:
   # Detection Rules Management OOM Testing
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/oom_testing/configs/ess_basic_license.config.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/ess.config.ts
diff --git a/.buildkite/ftr_workplace_ai_serverless_configs.yml b/.buildkite/ftr_workplace_ai_serverless_configs.yml
index ff84aec6a545c..25bc745d5d2da 100644
--- a/.buildkite/ftr_workplace_ai_serverless_configs.yml
+++ b/.buildkite/ftr_workplace_ai_serverless_configs.yml
@@ -6,7 +6,7 @@ disabled:
   - x-pack/solutions/workplaceai/test/serverless/functional/configs/config.feature_flags.ts
   - x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.feature_flags.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.ts
   - x-pack/platform/test/serverless/api_integration/configs/workplaceai/config.group1.ts
diff --git a/.buildkite/pipeline-utils/agent_images.ts b/.buildkite/pipeline-utils/agent_images.ts
index 4b13a03a7c742..abc49f19ead59 100644
--- a/.buildkite/pipeline-utils/agent_images.ts
+++ b/.buildkite/pipeline-utils/agent_images.ts
@@ -79,7 +79,7 @@ function getAgentImageConfig({ returnYaml = false } = {}): string | BuildkiteAge
   return config;
 }
 
-const expandAgentQueue = (queueName: string = 'n2-4-spot', diskSizeGb?: number) => {
+const expandAgentQueue = (queueName: string = 'n2d-4-spot', diskSizeGb?: number) => {
   const [kind, cores, addition] = queueName.split('-');
   const zonesToUse = 'southamerica-east1-c,asia-south2-a,us-central1-f';
   const additionalProps =
diff --git a/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts b/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts
index 309159b3ae2ca..5883aa18f8a85 100644
--- a/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts
+++ b/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts
@@ -340,7 +340,7 @@ export async function pickTestGroupRunOrder() {
             parallelism: unit.count,
             timeout_in_minutes: 120,
             key: 'jest',
-            agents: expandAgentQueue('n2-4-spot', 110),
+            agents: expandAgentQueue('n2d-4-spot', 110),
             env: {
               SCOUT_TARGET_TYPE: 'local',
             },
@@ -362,7 +362,7 @@ export async function pickTestGroupRunOrder() {
             parallelism: integration.count,
             timeout_in_minutes: 120,
             key: 'jest-integration',
-            agents: expandAgentQueue('n2-4-spot', 105),
+            agents: expandAgentQueue('n2d-4-spot', 105),
             env: {
               SCOUT_TARGET_TYPE: 'local',
             },
diff --git a/.buildkite/pipeline-utils/scout/pick_scout_test_group_run_order.ts b/.buildkite/pipeline-utils/scout/pick_scout_test_group_run_order.ts
index 184ea80f9881a..8d722c49a6c9c 100644
--- a/.buildkite/pipeline-utils/scout/pick_scout_test_group_run_order.ts
+++ b/.buildkite/pipeline-utils/scout/pick_scout_test_group_run_order.ts
@@ -56,7 +56,7 @@ export async function pickScoutTestGroupRunOrder(scoutConfigsPath: string) {
     return {
       label: `Scout: [ ${module.group} / ${module.name} ] ${module.type}`,
       key: module.name,
-      agents: expandAgentQueue(usesParallelWorkers ? 'n2-8-spot' : 'n2-4-spot'),
+      agents: expandAgentQueue(usesParallelWorkers ? 'n2d-8-spot' : 'n2d-4-spot'),
       group: module.group,
     };
   });
diff --git a/.buildkite/pipelines/flaky_tests/pipeline.ts b/.buildkite/pipelines/flaky_tests/pipeline.ts
index ee0d6e4f6e0b8..0c46d2fa2944e 100644
--- a/.buildkite/pipelines/flaky_tests/pipeline.ts
+++ b/.buildkite/pipelines/flaky_tests/pipeline.ts
@@ -212,7 +212,7 @@ for (const testSuite of testSuites) {
       concurrency,
       concurrency_group: process.env.UUID,
       concurrency_method: 'eager',
-      agents: expandAgentQueue('n2-4-spot'),
+      agents: expandAgentQueue('n2d-4-spot'),
       depends_on: 'build',
       timeout_in_minutes: 150,
       cancel_on_build_failing: true,
@@ -240,7 +240,7 @@ for (const testSuite of testSuites) {
       concurrency,
       concurrency_group: process.env.UUID,
       concurrency_method: 'eager',
-      agents: expandAgentQueue(usesParallelWorkers ? 'n2-8-spot' : 'n2-4-spot'),
+      agents: expandAgentQueue(usesParallelWorkers ? 'n2d-8-spot' : 'n2d-4-spot'),
       depends_on: 'build',
       timeout_in_minutes: 60,
       cancel_on_build_failing: true,
@@ -260,7 +260,7 @@ for (const testSuite of testSuites) {
           `Group configuration was not found in groups.json for the following cypress suite: {${suiteName}}.`
         );
       }
-      const agentQueue = suiteName.includes('defend_workflows') ? 'n2-4-virt' : 'n2-4-spot';
+      const agentQueue = suiteName.includes('defend_workflows') ? 'n2-4-virt' : 'n2d-4-spot';
       steps.push({
         command: `.buildkite/scripts/steps/functional/${suiteName}.sh`,
         label: group.name,
@@ -297,7 +297,7 @@ for (const testSuite of testSuites) {
       steps.push({
         command: `.buildkite/scripts/steps/functional/${suiteName}.sh`,
         label: synthGroup.name,
-        agents: expandAgentQueue('n2-4-spot'),
+        agents: expandAgentQueue('n2d-4-spot'),
         key: `${TestSuiteType.SYNTHETICS}-${suiteIndex++}`,
         depends_on: 'build',
         timeout_in_minutes: 30,
@@ -325,7 +325,7 @@ pipeline.steps.push({
 pipeline.steps.push({
   command: 'ts-node .buildkite/pipelines/flaky_tests/post_stats_on_pr.ts',
   label: 'Post results on Github pull request',
-  agents: expandAgentQueue('n2-4-spot'),
+  agents: expandAgentQueue('n2d-4-spot'),
   timeout_in_minutes: 15,
   retry: {
     automatic: [{ exit_status: '-1', limit: 3 }],
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
index 2e710c23712a1..97e56201b9174 100644
--- a/.buildkite/pipelines/on_merge.yml
+++ b/.buildkite/pipelines/on_merge.yml
@@ -9,7 +9,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
     retry:
       automatic:
         - exit_status: '*'
@@ -27,7 +27,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       diskSizeGb: 95
 
   - command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
@@ -36,9 +36,11 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-8
+      machineType: n4d-standard-16
+      diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-c,us-central1-a
+      diskSizeGb: 200
     key: build
     timeout_in_minutes: 60
     retry:
@@ -52,10 +54,11 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-highcpu-8
+      machineType: n4d-standard-8
+      diskType: hyperdisk-balanced
       preemptible: true
+      spotZones: us-central1-c,us-central1-a
       diskSizeGb: 105
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -68,9 +71,10 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n4d-standard-4
+      diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-c,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 60
     retry:
@@ -84,9 +88,10 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-16
+      machineType: n4d-standard-32
+      diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-c,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 60
     retry:
@@ -100,9 +105,10 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-32
+      machineType: n4d-standard-32
+      diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-c,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 60
     retry:
@@ -116,10 +122,10 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: c4-standard-4
+      machineType: c4d-standard-4
       diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-c,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 60
     retry:
@@ -133,7 +139,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -151,7 +157,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-highmem-4
+      machineType: n2d-highmem-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
       diskSizeGb: 105
@@ -169,7 +175,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       diskSizeGb: 105
     timeout_in_minutes: 10
     depends_on:
@@ -186,7 +192,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       diskSizeGb: 105
     timeout_in_minutes: 10
     env:
@@ -204,7 +210,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       diskSizeGb: 105
     key: build_scout_tests
     timeout_in_minutes: 15
@@ -223,7 +229,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -239,7 +245,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -255,7 +261,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -271,7 +277,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -287,7 +293,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -303,7 +309,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -319,7 +325,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -335,7 +341,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -351,7 +357,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -367,7 +373,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -383,7 +389,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -399,7 +405,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -415,7 +421,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -431,7 +437,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -447,7 +453,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -463,7 +469,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -479,7 +485,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -495,7 +501,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -511,7 +517,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -527,7 +533,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -543,7 +549,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -559,7 +565,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -575,7 +581,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -591,7 +597,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -643,7 +649,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 120
@@ -660,7 +666,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
 
   - command: .buildkite/scripts/steps/storybooks/build_and_upload.sh
     label: 'Build Storybooks'
@@ -668,7 +674,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-8
+      machineType: n2d-standard-8
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     key: storybooks
@@ -684,7 +690,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 60
@@ -700,7 +706,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     artifact_paths: 'target/plugin_so_types_snapshot.json'
@@ -720,7 +726,7 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
 
   - wait
 
@@ -731,4 +737,4 @@ steps:
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
diff --git a/.buildkite/pipelines/pull_request/agent_builder_smoke_tests.yml b/.buildkite/pipelines/pull_request/agent_builder_smoke_tests.yml
index cf9d172b5877c..a1c916bc8cd42 100644
--- a/.buildkite/pipelines/pull_request/agent_builder_smoke_tests.yml
+++ b/.buildkite/pipelines/pull_request/agent_builder_smoke_tests.yml
@@ -20,7 +20,7 @@ steps:
         timeout_in_minutes: 50
         parallelism: 1
         agents:
-          machineType: n2-standard-4
+          machineType: n2d-standard-4
           preemptible: true
           spotZones: us-central1-f,us-central1-c,us-central1-a
         retry:
diff --git a/.buildkite/pipelines/pull_request/ai_infra_gen_ai.yml b/.buildkite/pipelines/pull_request/ai_infra_gen_ai.yml
index 4b5f7e17fd991..571469321bb6c 100644
--- a/.buildkite/pipelines/pull_request/ai_infra_gen_ai.yml
+++ b/.buildkite/pipelines/pull_request/ai_infra_gen_ai.yml
@@ -20,7 +20,7 @@ steps:
         timeout_in_minutes: 50
         parallelism: 1
         agents:
-          machineType: n2-standard-4
+          machineType: n2d-standard-4
           preemptible: true
           spotZones: us-central1-f,us-central1-c,us-central1-a
         retry:
diff --git a/.buildkite/pipelines/pull_request/apm_cypress.yml b/.buildkite/pipelines/pull_request/apm_cypress.yml
index 54926ffad9f8d..1f367f44a7de9 100644
--- a/.buildkite/pipelines/pull_request/apm_cypress.yml
+++ b/.buildkite/pipelines/pull_request/apm_cypress.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/apm_cypress.sh
     label: 'APM Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
index 223c40df77261..f0ae49a0415d2 100644
--- a/.buildkite/pipelines/pull_request/base.yml
+++ b/.buildkite/pipelines/pull_request/base.yml
@@ -4,7 +4,7 @@ steps:
     timeout_in_minutes: 10
     id: pre_build
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
 
   - wait
 
@@ -16,15 +16,16 @@ steps:
     depends_on:
       - terrazzo-initial-pipeline-upload
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       diskSizeGb: 95
 
   - command: .buildkite/scripts/steps/build_kibana.sh
     label: Build Kibana Distribution
     agents:
-      machineType: n2-standard-8
+      machineType: n4d-standard-16
+      diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-c,us-central1-a
       diskSizeGb: 200
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
@@ -37,9 +38,10 @@ steps:
   - command: .buildkite/scripts/steps/quick_checks.sh
     label: 'Quick Checks'
     agents:
-      machineType: n2-highcpu-8
+      machineType: n4d-standard-8
+      diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-c,us-central1-a
       diskSizeGb: 105
     key: quick_checks
     timeout_in_minutes: 60
@@ -52,9 +54,9 @@ steps:
     label: 'Checks'
     key: checks
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-4
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-f,us-central1-c,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 60
     retry:
@@ -65,9 +67,9 @@ steps:
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'
     agents:
-      machineType: n2-standard-16
+      machineType: n2d-standard-32
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-f,us-central1-c,us-central1-a
       diskSizeGb: 105
     key: linting
     timeout_in_minutes: 60
@@ -79,9 +81,9 @@ steps:
   - command: .buildkite/scripts/steps/lint_with_types.sh
     label: 'Linting (with types)'
     agents:
-      machineType: n2-standard-32
+      machineType: n2d-standard-32
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-f,us-central1-c,us-central1-a
       diskSizeGb: 105
     key: linting_with_types
     timeout_in_minutes: 60
@@ -93,7 +95,7 @@ steps:
   - command: .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
     label: 'Check OAS Snapshot'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     key: check_oas_snapshot
@@ -106,10 +108,10 @@ steps:
   - command: .buildkite/scripts/steps/typecheck/check_types.sh
     label: 'Check Types'
     agents:
-      machineType: c4-standard-4
+      machineType: n4d-standard-4
       diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      spotZones: us-central1-c,us-central1-a
       diskSizeGb: 105
     key: check_types
     timeout_in_minutes: 60
@@ -123,7 +125,7 @@ steps:
   - command: .buildkite/scripts/steps/ci_stats_ready.sh
     label: Mark CI Stats as ready
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
     timeout_in_minutes: 10
     depends_on:
       - build
@@ -136,7 +138,7 @@ steps:
   - command: .buildkite/scripts/steps/api_docs/build_api_docs.sh
     label: 'Build API Docs'
     agents:
-      machineType: n2-highmem-4
+      machineType: n2d-highmem-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
       diskSizeGb: 105
diff --git a/.buildkite/pipelines/pull_request/base_merged_phases.yml b/.buildkite/pipelines/pull_request/base_merged_phases.yml
index 6b5f02dd9f17c..de4fb245b851a 100644
--- a/.buildkite/pipelines/pull_request/base_merged_phases.yml
+++ b/.buildkite/pipelines/pull_request/base_merged_phases.yml
@@ -2,8 +2,10 @@ steps:
   - command: .buildkite/scripts/steps/build_kibana.sh
     label: Build Kibana Distribution
     agents:
-      machineType: c3d-standard-16-lssd
-      zones: northamerica-northeast2-b,us-central1-c,us-central1-a
+      machineType: n4d-standard-16
+      diskType: hyperdisk-balanced
+      zones: us-central1-c,us-central1-a
+      diskSizeGb: 200
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
     timeout_in_minutes: 90
@@ -17,9 +19,11 @@ steps:
   - command: .buildkite/scripts/steps/quick_checks.sh
     label: 'Quick Checks'
     agents:
-      machineType: n2-highcpu-8
+      machineType: n4d-standard-8
+      diskType: hyperdisk-balanced
       preemptible: true
-      diskSizeGb: 115
+      spotZones: us-central1-c,us-central1-a
+      diskSizeGb: 105
     key: quick_checks
     timeout_in_minutes: 60
     env:
@@ -33,9 +37,11 @@ steps:
     label: 'Checks'
     key: checks
     agents:
-      machineType: n2-standard-2
+      machineType: n4d-standard-4
+      diskType: hyperdisk-balanced
       preemptible: true
-      diskSizeGb: 115
+      spotZones: us-central1-c,us-central1-a
+      diskSizeGb: 105
     timeout_in_minutes: 60
     env:
       KIBANA_CI_PIPELINE_TYPE: 'faster_pr_build'
@@ -47,9 +53,11 @@ steps:
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'
     agents:
-      machineType: n2-standard-16
+      machineType: n4d-standard-32
+      diskType: hyperdisk-balanced
       preemptible: true
-      diskSizeGb: 115
+      spotZones: us-central1-c,us-central1-a
+      diskSizeGb: 105
     key: linting
     timeout_in_minutes: 60
     env:
@@ -62,9 +70,11 @@ steps:
   - command: .buildkite/scripts/steps/lint_with_types.sh
     label: 'Linting (with types)'
     agents:
-      machineType: n2-standard-32
+      machineType: n4d-standard-32
+      diskType: hyperdisk-balanced
       preemptible: true
-      diskSizeGb: 115
+      spotZones: us-central1-c,us-central1-a
+      diskSizeGb: 105
     key: linting_with_types
     timeout_in_minutes: 60
     env:
@@ -77,8 +87,9 @@ steps:
   - command: .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
     label: 'Check OAS Snapshot'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-a
     key: check_oas_snapshot
     timeout_in_minutes: 60
     env:
@@ -91,11 +102,11 @@ steps:
   - command: .buildkite/scripts/steps/typecheck/check_types.sh
     label: 'Check Types'
     agents:
-      machineType: c4-standard-4
+      machineType: c4d-standard-4
       diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
-      diskSizeGb: 115
+      spotZones: us-central1-c,us-central1-a
+      diskSizeGb: 105
     key: check_types
     timeout_in_minutes: 60
     env:
@@ -108,7 +119,7 @@ steps:
   - command: .buildkite/scripts/steps/test/pick_test_group_run_order.sh
     label: 'Pick Test Group Run Order'
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       diskSizeGb: 115
     timeout_in_minutes: 10
     env:
@@ -126,7 +137,7 @@ steps:
   - command: .buildkite/scripts/steps/ci_stats_ready.sh
     label: Mark CI Stats as ready
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       diskSizeGb: 115
     timeout_in_minutes: 10
     env:
@@ -142,9 +153,10 @@ steps:
   - command: .buildkite/scripts/steps/api_docs/build_api_docs.sh
     label: 'Build API Docs'
     agents:
-      machineType: n2-highmem-4
+      machineType: n2d-highmem-4
       preemptible: true
-      diskSizeGb: 115
+      spotZones: us-central1-f,us-central1-c,us-central1-a
+      diskSizeGb: 105
     key: build_api_docs
     depends_on:
       - build
diff --git a/.buildkite/pipelines/pull_request/build_cloud_fips_image.yml b/.buildkite/pipelines/pull_request/build_cloud_fips_image.yml
index 21b65dcbc6e73..47fe95ad2433a 100644
--- a/.buildkite/pipelines/pull_request/build_cloud_fips_image.yml
+++ b/.buildkite/pipelines/pull_request/build_cloud_fips_image.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/fips/build_cloud_fips_image.sh
     label: 'Build Cloud FIPS Image'
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       preemptible: true
     depends_on:
       - build
diff --git a/.buildkite/pipelines/pull_request/build_cloud_image.yml b/.buildkite/pipelines/pull_request/build_cloud_image.yml
index fb6c1b6e05a5b..c41b0b652aecf 100644
--- a/.buildkite/pipelines/pull_request/build_cloud_image.yml
+++ b/.buildkite/pipelines/pull_request/build_cloud_image.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/cloud/build_cloud_image.sh
     label: 'Build Cloud Image'
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       preemptible: true
     depends_on:
       - build
diff --git a/.buildkite/pipelines/pull_request/build_project.yml b/.buildkite/pipelines/pull_request/build_project.yml
index 2c201552fbb8e..83e8abd04cd4e 100644
--- a/.buildkite/pipelines/pull_request/build_project.yml
+++ b/.buildkite/pipelines/pull_request/build_project.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/artifacts/docker_image.sh
     label: 'Build Project Image'
     agents:
-      machineType: n2-standard-16
+      machineType: n2d-standard-16
       preemptible: true
       diskSizeGb: 150
     timeout_in_minutes: 90
diff --git a/.buildkite/pipelines/pull_request/check_next_docs.yml b/.buildkite/pipelines/pull_request/check_next_docs.yml
index d513de2f8fea3..9bf6737be4463 100644
--- a/.buildkite/pipelines/pull_request/check_next_docs.yml
+++ b/.buildkite/pipelines/pull_request/check_next_docs.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/next_docs/build_and_validate_docs.sh
     label: 'Build and Validate Next Docs'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
     timeout_in_minutes: 30
     retry:
diff --git a/.buildkite/pipelines/pull_request/check_saved_objects.yml b/.buildkite/pipelines/pull_request/check_saved_objects.yml
index e84633d09a3aa..2b6c20eb5e67e 100644
--- a/.buildkite/pipelines/pull_request/check_saved_objects.yml
+++ b/.buildkite/pipelines/pull_request/check_saved_objects.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/check_saved_objects.sh
     label: 'Check changes in Saved Objects'
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/deploy_cloud.yml b/.buildkite/pipelines/pull_request/deploy_cloud.yml
index 565c5af3bb0c1..ad62b4c490010 100644
--- a/.buildkite/pipelines/pull_request/deploy_cloud.yml
+++ b/.buildkite/pipelines/pull_request/deploy_cloud.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/cloud/build_and_deploy.sh
     label: 'Build and Deploy to Cloud'
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       preemptible: true
     depends_on:
       - build
diff --git a/.buildkite/pipelines/pull_request/deploy_project.yml b/.buildkite/pipelines/pull_request/deploy_project.yml
index f43146c732b77..ab58a9ab74b4c 100644
--- a/.buildkite/pipelines/pull_request/deploy_project.yml
+++ b/.buildkite/pipelines/pull_request/deploy_project.yml
@@ -3,7 +3,7 @@ steps:
     label: 'Build Project Image'
     key: build_project_image
     agents:
-      machineType: n2-standard-16
+      machineType: n2d-standard-16
       preemptible: true
       diskSizeGb: 150
     timeout_in_minutes: 90
@@ -14,7 +14,7 @@ steps:
   - command: .buildkite/scripts/steps/serverless/deploy.sh
     label: 'Deploy Project'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
     timeout_in_minutes: 10
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/exploratory_view_plugin.yml b/.buildkite/pipelines/pull_request/exploratory_view_plugin.yml
index df9a9e8def29c..157724538d94d 100644
--- a/.buildkite/pipelines/pull_request/exploratory_view_plugin.yml
+++ b/.buildkite/pipelines/pull_request/exploratory_view_plugin.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/exploratory_view_plugin.sh
     label: 'Exploratory View @elastic/synthetics Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/fips.yml b/.buildkite/pipelines/pull_request/fips.yml
index b38fb2754aca5..b261941f971ea 100644
--- a/.buildkite/pipelines/pull_request/fips.yml
+++ b/.buildkite/pipelines/pull_request/fips.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/fips/build.sh
     label: 'Build FIPS Image'
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/fleet_cypress.yml b/.buildkite/pipelines/pull_request/fleet_cypress.yml
index 0ca77a8ed8084..152efb2673613 100644
--- a/.buildkite/pipelines/pull_request/fleet_cypress.yml
+++ b/.buildkite/pipelines/pull_request/fleet_cypress.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/fleet_cypress.sh
     label: 'Fleet Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/jest_bench.yml b/.buildkite/pipelines/pull_request/jest_bench.yml
index 378beea5b6552..645ffeb332d82 100644
--- a/.buildkite/pipelines/pull_request/jest_bench.yml
+++ b/.buildkite/pipelines/pull_request/jest_bench.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/jest_bench.sh
     label: 'Jest Bench'
     agents:
-      machineType: n2-highmem-16
+      machineType: n2d-highmem-16
       diskSizeGb: 100
     key: jest_bench
     timeout_in_minutes: 60
diff --git a/.buildkite/pipelines/pull_request/kbn_handlebars.yml b/.buildkite/pipelines/pull_request/kbn_handlebars.yml
index 645894af33da9..19130780a914e 100644
--- a/.buildkite/pipelines/pull_request/kbn_handlebars.yml
+++ b/.buildkite/pipelines/pull_request/kbn_handlebars.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/test/kbn_handlebars.sh
     label: 'Check @kbn/handlebars for upstream differences'
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/pick_test_groups.yml b/.buildkite/pipelines/pull_request/pick_test_groups.yml
index fef4d115945b5..fae064b76e3e5 100644
--- a/.buildkite/pipelines/pull_request/pick_test_groups.yml
+++ b/.buildkite/pipelines/pull_request/pick_test_groups.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/test/pick_test_group_run_order.sh
     label: 'Pick Test Group Run Order'
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       diskSizeGb: 115
     timeout_in_minutes: 10
     env:
diff --git a/.buildkite/pipelines/pull_request/post_build.yml b/.buildkite/pipelines/pull_request/post_build.yml
index f5c1a0bae19ea..61395d2a3a24b 100644
--- a/.buildkite/pipelines/pull_request/post_build.yml
+++ b/.buildkite/pipelines/pull_request/post_build.yml
@@ -5,4 +5,4 @@ steps:
   - command: .buildkite/scripts/lifecycle/post_build.sh
     label: Post-Build
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
diff --git a/.buildkite/pipelines/pull_request/prompt_changes.yml b/.buildkite/pipelines/pull_request/prompt_changes.yml
index e4cf160707824..bbe699797e95d 100644
--- a/.buildkite/pipelines/pull_request/prompt_changes.yml
+++ b/.buildkite/pipelines/pull_request/prompt_changes.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/checks/prompt_changes_detector.sh
     label: 'Check Prompt Changes'
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
       diskSizeGb: 115
diff --git a/.buildkite/pipelines/pull_request/renovate.yml b/.buildkite/pipelines/pull_request/renovate.yml
index a870c3d640190..18bd953515e1b 100644
--- a/.buildkite/pipelines/pull_request/renovate.yml
+++ b/.buildkite/pipelines/pull_request/renovate.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/renovate.sh
     label: 'Renovate validation'
     agents:
-      machineType: n2-highcpu-8
+      machineType: n2d-highcpu-8
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     key: renovate_validation
diff --git a/.buildkite/pipelines/pull_request/response_ops.yml b/.buildkite/pipelines/pull_request/response_ops.yml
index e7750719aa12f..1a207450c786a 100644
--- a/.buildkite/pipelines/pull_request/response_ops.yml
+++ b/.buildkite/pipelines/pull_request/response_ops.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/response_ops.sh
     label: 'Rules, Alerts and Exceptions ResponseOps Cypress Tests on Security Solution'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/response_ops_cases.yml b/.buildkite/pipelines/pull_request/response_ops_cases.yml
index 67326e771d33f..c47d9435e804e 100644
--- a/.buildkite/pipelines/pull_request/response_ops_cases.yml
+++ b/.buildkite/pipelines/pull_request/response_ops_cases.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/response_ops_cases.sh
     label: 'Cases Cypress Tests on Security Solution'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/scout_tests.yml b/.buildkite/pipelines/pull_request/scout_tests.yml
index 967aca653af88..41d4ccc7249ec 100644
--- a/.buildkite/pipelines/pull_request/scout_tests.yml
+++ b/.buildkite/pipelines/pull_request/scout_tests.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/test/scout_test_run_builder.sh
     label: 'Scout Test Run Builder'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
     key: build_scout_tests
     timeout_in_minutes: 15
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/scout_uiam_tests.yml b/.buildkite/pipelines/pull_request/scout_uiam_tests.yml
index a5bb6281e313f..c0523e0987f85 100644
--- a/.buildkite/pipelines/pull_request/scout_uiam_tests.yml
+++ b/.buildkite/pipelines/pull_request/scout_uiam_tests.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/test/scout_uiam_tests.sh
     label: 'Scout UIAM Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     timeout_in_minutes: 15
diff --git a/.buildkite/pipelines/pull_request/security_solution/ai4dsoc.yml b/.buildkite/pipelines/pull_request/security_solution/ai4dsoc.yml
index adcd5f21c33f4..8b80077a144cc 100644
--- a/.buildkite/pipelines/pull_request/security_solution/ai4dsoc.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/ai4dsoc.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_ai4dsoc.sh
     label: 'Serverless AI4DSOC - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/ai_assistant.yml b/.buildkite/pipelines/pull_request/security_solution/ai_assistant.yml
index 0c1e3835dd7ef..041106a377001 100644
--- a/.buildkite/pipelines/pull_request/security_solution/ai_assistant.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/ai_assistant.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_ai_assistant.sh
     label: 'Serverless AI Assistant - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -23,7 +23,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_ai_assistant.sh
     label: 'AI Assistant - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/asset_inventory.yml b/.buildkite/pipelines/pull_request/security_solution/asset_inventory.yml
index c73db96697d54..009b13ed7635d 100644
--- a/.buildkite/pipelines/pull_request/security_solution/asset_inventory.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/asset_inventory.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/asset_inventory.sh
     label: 'Asset Inventory Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -23,7 +23,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/asset_inventory.sh
     label: 'Asset Inventory Cypress Tests on Serverless'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/automatic_import.yml b/.buildkite/pipelines/pull_request/security_solution/automatic_import.yml
index 793d3ccf6d946..7169c6e4ee80b 100644
--- a/.buildkite/pipelines/pull_request/security_solution/automatic_import.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/automatic_import.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_automatic_import.sh
     label: 'Serverless Automatic Import - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/cloud_security_posture.yml b/.buildkite/pipelines/pull_request/security_solution/cloud_security_posture.yml
index 400bca053ac02..78a8628f96b90 100644
--- a/.buildkite/pipelines/pull_request/security_solution/cloud_security_posture.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/cloud_security_posture.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/cloud_security_posture.sh
     label: 'Cloud Security Posture Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -23,7 +23,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/cloud_security_posture_serverless.sh
     label: 'Cloud Security Posture Cypress Tests on Serverless'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/cspm_agentless_scout.yml b/.buildkite/pipelines/pull_request/security_solution/cspm_agentless_scout.yml
index c1ebf8cb8871e..cacc3899a9a5b 100644
--- a/.buildkite/pipelines/pull_request/security_solution/cspm_agentless_scout.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/cspm_agentless_scout.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/test/cspm_agentless_scout.sh
     label: 'CSPM Agentless Scout E2E Tests'
     agents:
-      machineType: n2-standard-8
+      machineType: n2d-standard-8
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/cypress_burn.yml b/.buildkite/pipelines/pull_request/security_solution/cypress_burn.yml
index 33b8098d5f63a..9ac9ff3a6462c 100644
--- a/.buildkite/pipelines/pull_request/security_solution/cypress_burn.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/cypress_burn.yml
@@ -3,7 +3,7 @@ steps:
     label: '[Soft fail] Defend Workflows Cypress Tests, burning changed specs'
     agents:
       enableNestedVirtualization: true
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -24,7 +24,7 @@ steps:
     label: '[Soft fail] Defend Workflows Cypress Tests on Serverless, burning changed specs'
     agents:
       enableNestedVirtualization: true
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -44,7 +44,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_burn.sh
     label: '[Soft fail] Security Solution Cypress tests, burning changed specs'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -64,7 +64,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/osquery_cypress_burn.sh
     label: '[Soft fail] Osquery Cypress Tests, burning changed specs'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/detection_engine.yml b/.buildkite/pipelines/pull_request/security_solution/detection_engine.yml
index 53ae10d6819ad..50841368f5f59 100644
--- a/.buildkite/pipelines/pull_request/security_solution/detection_engine.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/detection_engine.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_detection_engine.sh
     label: 'Serverless Detection Engine - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -23,7 +23,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_detection_engine_exceptions.sh
     label: 'Serverless Detection Engine - Exceptions - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -44,7 +44,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_detection_engine.sh
     label: 'Detection Engine - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -65,7 +65,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_detection_engine_exceptions.sh
     label: 'Detection Engine - Exceptions - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/entity_analytics.yml b/.buildkite/pipelines/pull_request/security_solution/entity_analytics.yml
index 3d233e43a0cd9..1c1cbbf160558 100644
--- a/.buildkite/pipelines/pull_request/security_solution/entity_analytics.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/entity_analytics.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_entity_analytics.sh
     label: 'Serverless Entity Analytics - Security Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -23,7 +23,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_entity_analytics.sh
     label: 'Entity Analytics - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/explore.yml b/.buildkite/pipelines/pull_request/security_solution/explore.yml
index 0774170136c16..d32d517d87fb2 100644
--- a/.buildkite/pipelines/pull_request/security_solution/explore.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/explore.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_explore.sh
     label: 'Explore - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -23,7 +23,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
     label: 'Serverless Explore - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/gen_ai_evals.yml b/.buildkite/pipelines/pull_request/security_solution/gen_ai_evals.yml
index 6a96509606d22..f04dcef48039c 100644
--- a/.buildkite/pipelines/pull_request/security_solution/gen_ai_evals.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/gen_ai_evals.yml
@@ -20,7 +20,7 @@ steps:
         timeout_in_minutes: 50
         parallelism: 1
         agents:
-          machineType: n2-standard-4
+          machineType: n2d-standard-4
           preemptible: true
           spotZones: us-central1-f,us-central1-c,us-central1-a
         retry:
diff --git a/.buildkite/pipelines/pull_request/security_solution/investigations.yml b/.buildkite/pipelines/pull_request/security_solution/investigations.yml
index 35c74142d05ca..a95a5e75558c3 100644
--- a/.buildkite/pipelines/pull_request/security_solution/investigations.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/investigations.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_investigations.sh
     label: 'Investigations - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -23,7 +23,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
     label: 'Serverless Investigations - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/osquery_cypress.yml b/.buildkite/pipelines/pull_request/security_solution/osquery_cypress.yml
index a37a702216c48..4160c1d2a79d8 100644
--- a/.buildkite/pipelines/pull_request/security_solution/osquery_cypress.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/osquery_cypress.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/osquery_cypress.sh
     label: 'Osquery Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -23,7 +23,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
     label: 'Osquery Cypress Tests on Serverless'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/security_solution/rule_management.yml b/.buildkite/pipelines/pull_request/security_solution/rule_management.yml
index 5060e99bed7d8..f007c2cc85e07 100644
--- a/.buildkite/pipelines/pull_request/security_solution/rule_management.yml
+++ b/.buildkite/pipelines/pull_request/security_solution/rule_management.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_rule_management.sh
     label: 'Serverless Rule Management - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -23,7 +23,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_customization.sh
     label: 'Serverless Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -44,7 +44,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_installation.sh
     label: 'Serverless Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -65,7 +65,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_management.sh
     label: 'Serverless Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -86,7 +86,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_upgrade.sh
     label: 'Serverless Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -107,7 +107,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_rule_management.sh
     label: 'Rule Management - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -128,7 +128,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_customization.sh
     label: 'Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -149,7 +149,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_installation.sh
     label: 'Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -170,7 +170,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_management.sh
     label: 'Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
@@ -191,7 +191,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_upgrade.sh
     label: 'Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/store_moon_cache.yml b/.buildkite/pipelines/pull_request/store_moon_cache.yml
index 02422f7f202a7..76be77db0fadd 100644
--- a/.buildkite/pipelines/pull_request/store_moon_cache.yml
+++ b/.buildkite/pipelines/pull_request/store_moon_cache.yml
@@ -5,7 +5,7 @@ steps:
     id: store_cache
     soft_fail: true
     agents:
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
       diskSizeGb: 95
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
diff --git a/.buildkite/pipelines/pull_request/storybooks.yml b/.buildkite/pipelines/pull_request/storybooks.yml
index 289159520e3fb..54b0791e0d7fc 100644
--- a/.buildkite/pipelines/pull_request/storybooks.yml
+++ b/.buildkite/pipelines/pull_request/storybooks.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/storybooks/build_and_upload.sh
     label: 'Build Storybooks'
     agents:
-      machineType: n2-standard-8
+      machineType: n2d-standard-8
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     key: storybooks
diff --git a/.buildkite/pipelines/pull_request/synthetics_plugin.yml b/.buildkite/pipelines/pull_request/synthetics_plugin.yml
index 05ff0057585bf..829accbe03422 100644
--- a/.buildkite/pipelines/pull_request/synthetics_plugin.yml
+++ b/.buildkite/pipelines/pull_request/synthetics_plugin.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/synthetics_plugin.sh
     label: 'Synthetics @elastic/synthetics Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/trigger_entity_store_performance.yml b/.buildkite/pipelines/pull_request/trigger_entity_store_performance.yml
index 262bfcf0f84a1..256cd0a91d25b 100644
--- a/.buildkite/pipelines/pull_request/trigger_entity_store_performance.yml
+++ b/.buildkite/pipelines/pull_request/trigger_entity_store_performance.yml
@@ -5,7 +5,7 @@ steps:
       provider: gcp
       image: family/kibana-ubuntu-2404
       imageProject: elastic-images-prod
-      machineType: n2-standard-2
+      machineType: n2d-standard-2
     timeout_in_minutes: 10
     soft_fail: true
     retry:
diff --git a/.buildkite/pipelines/pull_request/uptime_plugin.yml b/.buildkite/pipelines/pull_request/uptime_plugin.yml
index 5844ef1fd31fd..50ab1bec2bb5c 100644
--- a/.buildkite/pipelines/pull_request/uptime_plugin.yml
+++ b/.buildkite/pipelines/pull_request/uptime_plugin.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/uptime_plugin.sh
     label: 'Uptime @elastic/synthetics Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/ux_plugin_e2e.yml b/.buildkite/pipelines/pull_request/ux_plugin_e2e.yml
index c6c02a5db8b78..885ccef62cd97 100644
--- a/.buildkite/pipelines/pull_request/ux_plugin_e2e.yml
+++ b/.buildkite/pipelines/pull_request/ux_plugin_e2e.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/functional/ux_synthetics_e2e.sh
     label: 'UX Plugin @elastic/synthetics Tests'
     agents:
-      machineType: n2-standard-4
+      machineType: n2d-standard-4
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     depends_on:
diff --git a/.buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml b/.buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml
index 87026757e2cc2..de2efa3e492a9 100644
--- a/.buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml
+++ b/.buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml
@@ -2,7 +2,7 @@ steps:
   - command: .buildkite/scripts/steps/webpack_bundle_analyzer/build_and_upload.sh
     label: 'Build Webpack Bundle Analyzer reports'
     agents:
-      machineType: n2-standard-8
+      machineType: n2d-standard-8
       preemptible: true
       spotZones: us-central1-f,us-central1-c,us-central1-a
     key: webpack_bundle_analyzer