diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 0c4ddd939d..2642ec8198 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -61,24 +61,30 @@ if [[ ! -f rust-bpf-$machine-$version.md ]]; then
     filename=solana-rust-bpf-$machine.tar.bz2
 
     set -ex
-    rm -rf rust-bpf*
+    rm -rf rust-bpf
+    rm -rf rust-bpf-$machine-*
     mkdir -p rust-bpf
-    cd rust-bpf
+    pushd rust-bpf
     wget --progress=dot:giga https://github.com/solana-labs/rust-bpf-builder/releases/download/$version/$filename
     tar -jxf $filename
     rm -rf $filename
+    popd
 
-    echo "https://github.com/solana-labs/rust-bpf-builder/releases/tag/$version" > ../rust-bpf-$machine-$version.md
+    set -ex
+    ./rust-bpf/bin/rustc --print sysroot
+
+    set +e
+    rustup toolchain uninstall bpf
+    set -e
+    rustup toolchain link bpf rust-bpf
+
+    echo "https://github.com/solana-labs/rust-bpf-builder/releases/tag/$version" > rust-bpf-$machine-$version.md
   )
   exitcode=$?
   if [[ $exitcode -ne 0 ]]; then
     rm -rf rust-bpf
     exit 1
   fi
-  set +e
-  rustup toolchain uninstall bpf
-  set -e
-  rustup toolchain link bpf rust-bpf
 fi
 
 # Install Rust-BPF Sysroot