diff --git a/.teamcity/src/Agents.kt b/.teamcity/src/Agents.kt
index 1f0545a2e8a9e7..557cce80d0f551 100644
--- a/.teamcity/src/Agents.kt
+++ b/.teamcity/src/Agents.kt
@@ -16,7 +16,7 @@ val BuildAgent = GoogleCloudAgent {
     sourceImageFamily = "elastic-kibana-ci-ubuntu-1804-lts"
     agentPrefix = "kibana-c2-16-"
     machineType = "c2-standard-16"
-    diskSizeGb = 75
+    diskSizeGb = 250
     diskType = GoogleCloudAgentDiskType.SSD
 }
 
diff --git a/.teamcity/src/builds/default/DefaultCiGroup.kt b/.teamcity/src/builds/default/DefaultCiGroup.kt
index 2c3b0d348591e3..cbfec9e40de24b 100755
--- a/.teamcity/src/builds/default/DefaultCiGroup.kt
+++ b/.teamcity/src/builds/default/DefaultCiGroup.kt
@@ -13,7 +13,5 @@ class DefaultCiGroup(val ciGroup: Int = 0, init: BuildType.() -> Unit = {}) : De
     runbld("Default CI Group $ciGroup", "./.ci/teamcity/default/ci_group.sh $ciGroup")
   }
 
-  requireAgent(StandardAgents["4"]!!)
-
   init()
 })