diff --git a/ci/buildkite.yml b/ci/buildkite.yml
index 105a7c43610c8d..0551ec4007d388 100644
--- a/ci/buildkite.yml
+++ b/ci/buildkite.yml
@@ -7,7 +7,7 @@ steps:
   - command: "ci/shellcheck.sh"
     name: "shellcheck [public]"
     timeout_in_minutes: 20
-  - command: "ci/docker-run.sh rustlang/rust:nightly ci/test-nightly.sh"
+  - command: "ci/docker-run.sh solanalabs/rust-nightly ci/test-nightly.sh"
     name: "nightly [public]"
     env:
       CARGO_TARGET_CACHE_NAME: "nightly"
diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile
new file mode 100644
index 00000000000000..24047c6d8e62c7
--- /dev/null
+++ b/ci/docker-rust-nightly/Dockerfile
@@ -0,0 +1,3 @@
+FROM rustlang/rust:nightly
+
+RUN cargo install --force clippy cargo-cov
diff --git a/ci/docker-rust-nightly/README.md b/ci/docker-rust-nightly/README.md
new file mode 100644
index 00000000000000..45ae8b2a2b8f7b
--- /dev/null
+++ b/ci/docker-rust-nightly/README.md
@@ -0,0 +1,3 @@
+Docker image containing rust nightly and some preinstalled crates used in CI.
+This image must be manually updated periodically by running `./build.sh` with
+after logging into https://hub.docker.com/u/solanalabs/
diff --git a/ci/docker-rust-nightly/build.sh b/ci/docker-rust-nightly/build.sh
new file mode 100755
index 00000000000000..d65b4a92f13f4e
--- /dev/null
+++ b/ci/docker-rust-nightly/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -ex
+
+cd "$(dirname "$0")"
+
+docker build -t solanalabs/rust-nightly .
+docker push solanalabs/rust-nightly
diff --git a/ci/test-nightly.sh b/ci/test-nightly.sh
index 119468de19cd29..aed09ac080db0d 100755
--- a/ci/test-nightly.sh
+++ b/ci/test-nightly.sh
@@ -18,7 +18,6 @@ _ cargo test --verbose --features unstable
 exit 0
 
 # Coverage disabled (see issue #433)
-_ cargo install --force cargo-cov
 _ cargo cov test
 _ cargo cov report