Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -967,6 +967,11 @@
              script="sanitizer-windows.py",
              depends_on_projects=["llvm", "clang", "lld", "compiler-rt"])},
 
+          {'name': "sanitizer-aarch64-linux-mte",
+           'slavenames' :["sanitizer-buildbot5""],
+           'builddir': "sanitizer-aarch64-linux-mte",
+           'factory': SanitizerBuilder.getSanitizerBuildFactory()},
+
           ## ARMv7 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
           {'name': "clang-cmake-armv7-full",
            'slavenames':["linaro-tk1-08"],
Index: zorg/trunk/buildbot/osuosl/master/config/slaves.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
@@ -117,8 +117,8 @@
         create_slave("sanitizer-buildbot3", properties={'jobs': 64}, max_builds=2),
         # Debian 7.7 x86_64 GCE instance
         create_slave("sanitizer-buildbot4", properties={'jobs': 64}, max_builds=2),
-        # Debian 7.7 x86_64 GCE instance
-        create_slave("sanitizer-buildbot5", properties={'jobs': 64}, max_builds=2),
+        # AArch64 server
+        create_slave("sanitizer-buildbot5", properties={'jobs': 96}, max_builds=1),
         # Ubuntu 14.04 x86_64 6-core z440 workstation
         create_slave("sanitizer-buildbot6", properties={'jobs': 6}, max_builds=1),
         # Debian 7.7 x86_64 GCE instance