diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index beb5bfb12570f..f89a49a53377f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain
-        run: ./ci/install-rust.sh
+        run: ./ci/install-rust.sh && rustup component add rustfmt
       - name: Check style
         run: ./ci/style.sh
 
diff --git a/ci/install-rust.sh b/ci/install-rust.sh
index 16fd0b4e8a577..6e7b1930c59a2 100755
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -24,7 +24,7 @@ if [ "$os" = "windows" ] && [ -n "${TARGET:-}" ]; then
 fi
 
 rustup set profile minimal
-rustup update --force "$toolchain"
+rustup update --force "$toolchain" --no-self-update
 rustup default "$toolchain"
 
 if [ -n "${TARGET:-}" ]; then
diff --git a/ci/style.sh b/ci/style.sh
index da16bf4fe9baf..5b200796a8c53 100755
--- a/ci/style.sh
+++ b/ci/style.sh
@@ -2,12 +2,7 @@
 
 set -eux
 
-if [ -n "${CI:-}" ]; then
-    rustup toolchain install nightly -c rustfmt --allow-downgrade
-    rustup override set nightly
-
-    check="--check"
-fi
+[ -n "${CI:-}" ] && check="--check"
 
 cargo test --manifest-path libc-test/Cargo.toml --test style -- --nocapture