diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ba92c800..e55ff7fcd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,7 +44,7 @@ executors:
   rust_windows: &rust_windows_executor
     machine:
       image: 'windows-server-2019-vs2019:stable'
-    resource_class: windows.medium
+    resource_class: windows.xlarge
     shell: powershell.exe -ExecutionPolicy Bypass
 
 # Important! When adding a new job to `jobs`, make sure to define when it
@@ -186,13 +186,17 @@ jobs:
           steps:
             - run:
                 name: Install rustup
+                environment:
+                  # Override auto-detection of RAM for Rustc install.
+                  # https://github.com/rust-lang/rustup/issues/2229#issuecomment-585855925
+                  RUSTUP_UNPACK_RAM: "21474836480"
                 command: |
                   $installer_dir = "$Env:TEMP"
                   echo "Downloading rustup"
-                  (New-Object System.Net.WebClient).DownloadFile("https://win.rustup.rs", "$installer_dir\rustup-init.exe")
+                  (New-Object System.Net.WebClient).DownloadFile("https://win.rustup.rs/x86_64", "$installer_dir\rustup-init.exe")
                   echo "Installing rustup"
                   & $installer_dir\rustup-init.exe --profile minimal --component rustfmt,clippy -y
-                  echo "Done"
+                  exit $LASTEXITCODE
             - run:
                 name: Special case for Windows because of ssh-agent
                 command: |
@@ -233,7 +237,10 @@ jobs:
                 name: Assert npm version
                 command: |
                   if ((npm --version) -Ne "${Env:NPM_VERSION}") { exit 1 }
-            - run: npm clean-install
+            - run:
+                name: npm clean-install
+                command: |
+                  npm clean-install
             - rust/test:
                 # This is prefixed in the orb with 'cargo-'
                 cache_version: v2-windows