diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
index 158fe2fbee424..fdd4851b5c837 100644
--- a/.buildkite/pipelines/on_merge.yml
+++ b/.buildkite/pipelines/on_merge.yml
@@ -10,7 +10,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
-      diskSizeGb: 80
+      diskSizeGb: 85
     retry:
       automatic:
         - exit_status: '*'
@@ -40,7 +40,7 @@ steps:
       provider: gcp
       machineType: n2-highcpu-8
       preemptible: true
-      diskSizeGb: 80
+      diskSizeGb: 85
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -70,7 +70,7 @@ steps:
       provider: gcp
       machineType: n2-standard-16
       preemptible: true
-      diskSizeGb: 80
+      diskSizeGb: 85
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -85,7 +85,7 @@ steps:
       provider: gcp
       machineType: n2-standard-32
       preemptible: true
-      diskSizeGb: 80
+      diskSizeGb: 85
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -102,7 +102,7 @@ steps:
       diskType: 'hyperdisk-balanced'
       preemptible: true
       spotZones: us-central1-a,us-central1-b,us-central1-c
-      diskSizeGb: 80
+      diskSizeGb: 85
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -134,7 +134,7 @@ steps:
       provider: gcp
       machineType: n2-highmem-4
       preemptible: true
-      diskSizeGb: 80
+      diskSizeGb: 85
     timeout_in_minutes: 80
     retry:
       automatic:
@@ -150,7 +150,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
-      diskSizeGb: 80
+      diskSizeGb: 85
     timeout_in_minutes: 10
     depends_on:
       - build
@@ -167,7 +167,7 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: n2-standard-2
-      diskSizeGb: 80
+      diskSizeGb: 85
     timeout_in_minutes: 10
     env:
       JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/test/jest.sh'
@@ -569,8 +569,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    artifact_paths:
-      "target/plugin_so_types_snapshot.json"
+    artifact_paths: 'target/plugin_so_types_snapshot.json'
     timeout_in_minutes: 30
     retry:
       automatic:
diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
index 40cb6cd5254d2..2c1a85441ae1f 100644
--- a/.buildkite/pipelines/pull_request/base.yml
+++ b/.buildkite/pipelines/pull_request/base.yml
@@ -4,7 +4,7 @@ steps:
     timeout_in_minutes: 10
     agents:
       machineType: n2-standard-2
-      diskSizeGb: 80
+      diskSizeGb: 85
 
   - wait
 
@@ -27,7 +27,7 @@ steps:
     agents:
       machineType: n2-highcpu-8
       preemptible: true
-      diskSizeGb: 80
+      diskSizeGb: 85
     key: quick_checks
     timeout_in_minutes: 60
     retry:
@@ -53,7 +53,7 @@ steps:
     agents:
       machineType: n2-standard-16
       preemptible: true
-      diskSizeGb: 80
+      diskSizeGb: 85
     key: linting
     timeout_in_minutes: 60
     retry:
@@ -66,7 +66,7 @@ steps:
     agents:
       machineType: n2-standard-32
       preemptible: true
-      diskSizeGb: 80
+      diskSizeGb: 85
     key: linting_with_types
     timeout_in_minutes: 60
     retry:
@@ -93,7 +93,7 @@ steps:
       diskType: 'hyperdisk-balanced'
       preemptible: true
       spotZones: us-central1-a,us-central1-b,us-central1-c
-      diskSizeGb: 80
+      diskSizeGb: 85
     key: check_types
     timeout_in_minutes: 60
     retry:
@@ -107,7 +107,7 @@ steps:
     label: Mark CI Stats as ready
     agents:
       machineType: n2-standard-2
-      diskSizeGb: 80
+      diskSizeGb: 85
     timeout_in_minutes: 10
     depends_on:
       - build
@@ -121,7 +121,7 @@ steps:
     label: 'Pick Test Group Run Order'
     agents:
       machineType: n2-standard-2
-      diskSizeGb: 80
+      diskSizeGb: 85
     timeout_in_minutes: 10
     env:
       JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/test/jest.sh'
@@ -137,7 +137,7 @@ steps:
     agents:
       machineType: n2-highmem-4
       preemptible: true
-      diskSizeGb: 80
+      diskSizeGb: 85
     key: build_api_docs
     timeout_in_minutes: 90
     retry: