diff --git a/.buildbot.config.toml b/.buildbot.config.toml
index 3fc46b5e84df2..fda39d934f4a1 100644
--- a/.buildbot.config.toml
+++ b/.buildbot.config.toml
@@ -9,6 +9,7 @@ tools = ["cargo", "rustdoc"]
 
 [llvm]
 assertions = true           # Turn on assertions in LLVM.
+download-ci-llvm = false
 
 [install]
 prefix = "build/rustgc-stage2-latest"
diff --git a/.buildbot_dockerfile_debian b/.buildbot_dockerfile_debian
index f30c16731c799..3b93e3f80f216 100644
--- a/.buildbot_dockerfile_debian
+++ b/.buildbot_dockerfile_debian
@@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM debian:latest
 ARG CI_UID
 RUN useradd -m -u ${CI_UID} ci
 RUN apt-get update && \