diff --git a/.ci/beats-tester.groovy b/.ci/beats-tester.groovy
index 3650246e966..8d96fb1efea 100644
--- a/.ci/beats-tester.groovy
+++ b/.ci/beats-tester.groovy
@@ -24,7 +24,7 @@ pipeline {
   }
   stages {
     stage('Filter build') {
-      agent { label 'ubuntu && immutable' }
+      agent { label 'ubuntu-20' }
       when {
         beforeAgent true
         anyOf {
diff --git a/.ci/build-docker-images.groovy b/.ci/build-docker-images.groovy
index 417e2fefae4..a59aeb8da8f 100644
--- a/.ci/build-docker-images.groovy
+++ b/.ci/build-docker-images.groovy
@@ -3,7 +3,7 @@
 @Library('apm@current') _
 
 pipeline {
-  agent { label 'ubuntu-16 && immutable' }
+  agent { label 'ubuntu-20' }
   environment {
     REPO = 'beats'
     BASE_DIR = "src/github.com/elastic/${env.REPO}"