diff --git a/utils/buildbot/Dockerfile b/utils/buildbot/Dockerfile
index c5edd1a..3140c5a 100644
--- a/utils/buildbot/Dockerfile
+++ b/utils/buildbot/Dockerfile
@@ -6,7 +6,7 @@
 RUN apt-get install -y build-essential clang subversion git vim \
   zip libstdc++6:i386 file binutils-dev binutils-gold cmake python-pip \
   ninja-build
-RUN python -m pip install buildbot-slave==0.8.12
+RUN python -m pip install buildbot-worker==2.8.4
 
 # Temporary dependencies for AOR tests.
 RUN apt-get install -y libmpfr-dev libmpc-dev
diff --git a/utils/buildbot/run.sh b/utils/buildbot/run.sh
index 3829923..45f8df4 100755
--- a/utils/buildbot/run.sh
+++ b/utils/buildbot/run.sh
@@ -3,8 +3,8 @@
 # This serves as the entrypoint for docker to allow us to
 # run and start the buildbot while supplying the password
 # as an argument.
-buildslave create-slave --keepalive=200 "${WORKER_NAME}" \
+buildbot-worker create-worker --keepalive=200 "${WORKER_NAME}" \
   lab.llvm.org:9990 "${WORKER_NAME}" "$1"
 
-buildslave start "${WORKER_NAME}"
+buildbot-worker start "${WORKER_NAME}"
 tail -f ${WORKER_NAME}/twistd.log