diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5aae143e48..8752da506d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,8 +117,6 @@ jobs:
             fi
 
             export CARGO_INCREMENTAL=0
-            export CACHEPOT_BUCKET=zenith-rust-cachepot
-            export RUSTC_WRAPPER=cachepot
             export AWS_ACCESS_KEY_ID="${CACHEPOT_AWS_ACCESS_KEY_ID}"
             export AWS_SECRET_ACCESS_KEY="${CACHEPOT_AWS_SECRET_ACCESS_KEY}"
             "${cov_prefix[@]}" mold -run cargo build $CARGO_FLAGS --bins --tests
diff --git a/Dockerfile b/Dockerfile
index 3467359ac4..ebc8731168 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN set -e \
 FROM zimg/rust:1.58 AS build
 ARG GIT_VERSION=local
 
-ARG CACHEPOT_BUCKET=zenith-rust-cachepot-docker
+ARG CACHEPOT_BUCKET=zenith-rust-cachepot
 ARG AWS_ACCESS_KEY_ID
 ARG AWS_SECRET_ACCESS_KEY
 
diff --git a/Dockerfile.compute-tools b/Dockerfile.compute-tools
index c2e33b9d98..3fc8702f3f 100644
--- a/Dockerfile.compute-tools
+++ b/Dockerfile.compute-tools
@@ -2,7 +2,7 @@
 # NB: keep in sync with rust image version in .circle/config.yml
 FROM zimg/rust:1.58 AS rust-build
 
-ARG CACHEPOT_BUCKET=zenith-rust-cachepot-docker
+ARG CACHEPOT_BUCKET=zenith-rust-cachepot
 ARG AWS_ACCESS_KEY_ID
 ARG AWS_SECRET_ACCESS_KEY