diff --git a/buildbot/osuosl/master/config/release_builders.py b/buildbot/osuosl/master/config/release_builders.py
--- a/buildbot/osuosl/master/config/release_builders.py
+++ b/buildbot/osuosl/master/config/release_builders.py
@@ -98,7 +98,7 @@
 
     {'name' : "llvm-clang-win-x-armv7l-release",
     'tags'  : ["clang", "llvm", "compiler-rt", "cross", "armv7", "release"],
-    'workernames' : ["as-builder-1"],
+    'workernames' : ["as-builder-5"],
     'builddir': "x-armv7l-rel",
     'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
                     vs="autodetect",
@@ -137,7 +137,7 @@
 
     {'name' : "llvm-clang-win-x-aarch64-release",
     'tags'  : ["clang", "llvm", "compiler-rt", "cross", "aarch64", "release"],
-    'workernames' : ["as-builder-2"],
+    'workernames' : ["as-builder-6"],
     'builddir': "x-aarch64-rel",
     'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
                     vs="autodetect",
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -193,6 +193,18 @@
         # Ubuntu 18.04.2 LTS x86_64 Intel(R) Xeon(R) Gold CPU @ 2.1GHz, 128GB RAM
         create_worker("as-builder-4", properties={'jobs': 64}, max_builds=1),
 
+        # Windows Server on Xeon Gold 6230 (2x2.1GHz), 256Gb of RAM
+        create_worker("as-builder-5", properties={  # arm
+                        'remote_test_host': 'jetson4.lab.llvm.org',
+                        'remote_test_user': 'ubuntu'
+                     },
+                     max_builds=1),
+        create_worker("as-builder-6", properties={  # aarch64
+                        'remote_test_host': 'jetson8.lab.llvm.org',
+                        'remote_test_user': 'ubuntu'
+                     },
+                     max_builds=1),
+
         # Solaris 11
         create_worker("solaris11-amd64", properties={'jobs' : 8}, max_builds=1),
         create_worker("solaris11-sparcv9", properties={'jobs' : 8}, max_builds=1),