diff --git a/.circleci/config.yml b/.circleci/config.yml
index 31c7de97932b..553bbffeb755 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,6 +67,10 @@ machine-linux-medium: &machine-linux-medium
   <<: *docker-image
   resource_class: medium
 
+machine-linux-xlarge: &machine-linux-xlarge
+  <<: *docker-image
+  resource_class: xlarge
+
 machine-linux-2xlarge: &machine-linux-2xlarge
   <<: *docker-image
   resource_class: 2xlarge+
@@ -1621,9 +1625,9 @@ jobs:
 
   # Layer 2: Builds.
   linux-x64-testing:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-xlarge
     environment:
-      <<: *env-linux-2xlarge
+      <<: *env-global
       <<: *env-testing-build
       <<: *env-ninja-status
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1701,9 +1705,9 @@ jobs:
           checkout: false
 
   linux-ia32-testing:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-xlarge
     environment:
-      <<: *env-linux-2xlarge
+      <<: *env-global
       <<: *env-ia32
       <<: *env-testing-build
       <<: *env-ninja-status
@@ -1767,9 +1771,9 @@ jobs:
           checkout: false
 
   linux-arm-testing:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-xlarge
     environment:
-      <<: *env-linux-2xlarge
+      <<: *env-global
       <<: *env-arm
       <<: *env-testing-build
       <<: *env-ninja-status
@@ -1834,9 +1838,9 @@ jobs:
           checkout: false
 
   linux-arm64-testing:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-xlarge
     environment:
-      <<: *env-linux-2xlarge
+      <<: *env-global
       <<: *env-arm64
       <<: *env-testing-build
       <<: *env-ninja-status
diff --git a/appveyor.yml b/appveyor.yml
index cab43a1977bb..6e3d79ae06b5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,7 +28,7 @@
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 version: 1.0.{build}
-build_cloud: libcc-20
+build_cloud: electron-16-core
 image: vs2019bt-16.4.0
 environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js
index 9a875ebb00e5..3b838a797167 100644
--- a/script/release/ci-release-build.js
+++ b/script/release/ci-release-build.js
@@ -206,7 +206,8 @@ function buildAppVeyor (targetBranch, options) {
 async function callAppVeyor (targetBranch, job, options) {
   console.log(`Triggering AppVeyor to run build job: ${job} on branch: ${targetBranch} with release flag.`);
   const environmentVariables = {
-    ELECTRON_RELEASE: 1
+    ELECTRON_RELEASE: 1,
+    APPVEYOR_BUILD_WORKER_CLOUD: 'libcc-20'
   };
 
   if (!options.ghRelease) {