Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -251,7 +251,6 @@
                       checkout_lld=False,
                       useTwoStage=True,
                       testStage1=False,
-                      env={'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
                       extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
@@ -296,7 +295,7 @@
 
         ## AArch64 Clang+LLVM check-all + test-suite
         {'name': "clang-cmake-aarch64-quick",
-         'slavenames':["linaro-apm-01", "linaro-d05-01-quick"],
+         'slavenames':["linaro-apm-01", "linaro-armv8-01-aarch64-quick"],
          'builddir':"clang-cmake-aarch64-quick",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
@@ -307,7 +306,6 @@
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
                                        '--threads=8', '--build-threads=8'],
-                      env={'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
                       extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
                                         "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
@@ -320,7 +318,7 @@
         ## TODO: Add Compiler-RT after fixing all the failures
         ## TODO: Fix the three remaining test-suite failures
         {'name': "clang-cmake-aarch64-lld",
-         'slavenames':["linaro-apm-04", "linaro-d05-01-lld"],
+         'slavenames':["linaro-apm-04", "linaro-armv8-01-aarch64-lld"],
          'builddir':"clang-cmake-aarch64-lld",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
@@ -345,7 +343,7 @@
 
         ## AArch64 Clang+LLVM run test-suite with GlobalISel enabled
         {'name': "clang-cmake-aarch64-global-isel",
-         'slavenames':["linaro-apm-06", "linaro-d05-01-global-isel"],
+         'slavenames':["linaro-apm-06", "linaro-armv8-01-aarch64-global-isel"],
          'builddir':"clang-cmake-aarch64-global-isel",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
@@ -1058,7 +1056,7 @@
 
         # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
         {'name': "clang-cmake-aarch64-full",
-         'slavenames':["linaro-apm-02", "linaro-apm-05", "linaro-d05-01-full"],
+         'slavenames':["linaro-apm-02", "linaro-apm-05", "linaro-armv8-01-aarch64-full"],
          'builddir':"clang-cmake-aarch64-full",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
@@ -1358,7 +1356,7 @@
 
         # AArch64 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
-         'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx'],
+         'slavenames': ['linaro-apm-03', 'linaro-armv8-01-aarch64-libcxx'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
@@ -1372,7 +1370,7 @@
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
-         'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx-noexceptions'],
+         'slavenames': ['linaro-apm-03', 'linaro-armv8-01-aarch64-libcxx-noeh'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -40,12 +40,12 @@
         create_slave("linaro-apm-04", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-05", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-06", properties={'jobs' : 8}, max_builds=1),
-        create_slave("linaro-d05-01-quick", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-full", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-global-isel", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-lld", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-libcxx", properties={'jobs' : 64}, max_builds=1),
-        create_slave("linaro-d05-01-libcxx-noexceptions", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-quick", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-full", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-global-isel", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-lld", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-libcxx", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-aarch64-libcxx-noeh", properties={'jobs' : 64}, max_builds=1),
 
         # AMD Athlon(tm) 64 X2 Dual Core 3800+, Ubuntu x86_64
         create_slave("grosser1", properties={'jobs': 2}, max_builds=1),