diff --git a/sdk/bpf/.gitignore b/sdk/bpf/.gitignore
index 5961b495c1..faa91ca332 100644
--- a/sdk/bpf/.gitignore
+++ b/sdk/bpf/.gitignore
@@ -1,2 +1,2 @@
-/criterion
-/llvm-native
+/criterion*
+/llvm-native*
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 10c2e6ab5e..d380bc7bac 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -4,23 +4,24 @@ cd "$(dirname "$0")"/..
 
 # Install Criterion
 version=v2.3.2
-if [[ ! -r criterion-version.md ]]; then
+if [[ "$(uname)" = Darwin ]]; then
+  machine=osx
+else
+  machine=linux
+fi
+if [[ ! -r criterion-$machine-$version.md ]]; then
   (
-    if [[ "$(uname)" = Darwin ]]; then
-      machine=osx
-    else
-      machine=linux
-    fi
+    filename=criterion-$version-$machine-x86_64.tar.bz2
 
     set -ex
-    rm -rf criterion
+    rm -rf criterion*
     mkdir criterion
     cd criterion
-    wget --progress=dot:mega https://github.com/Snaipe/Criterion/releases/download/$version/criterion-$version-$machine-x86_64.tar.bz2
-    tar --strip-components 1 -jxf criterion-$version-$machine-x86_64.tar.bz2
-    rm -rf criterion-$version-$machine-x86_64.tar.bz2
+    wget --progress=dot:mega https://github.com/Snaipe/Criterion/releases/download/$version/$filename
+    tar --strip-components 1 -jxf $filename
+    rm -rf $filename
 
-    echo "https://github.com/Snaipe/Criterion/releases/tag/$version" > ../criterion-version.md
+    echo "https://github.com/Snaipe/Criterion/releases/tag/$version" > ../criterion-$machine-$version.md
   )
   # shellcheck disable=SC2181
   if [[ $? -ne 0 ]]; then
@@ -30,26 +31,26 @@ if [[ ! -r criterion-version.md ]]; then
 fi
 
 # Install LLVM
-version=v0.0.1
-if [[ ! -f llvm-native-version.md ]]; then
+version=v0.0.3
+if [[ "$(uname)" = Darwin ]]; then
+  machine=macos
+else
+  machine=linux
+fi
+if [[ ! -f llvm-native-$machine-$version.md ]]; then
   (
-    if [[ "$(uname)" = Darwin ]]; then
-      machine=macos
-    else
-      machine=linux
-    fi
+    filename=solana-llvm-$machine.tar.bz2
 
     set -ex
-    rm -rf llvm-native
+    rm -rf llvm-native*
     mkdir -p llvm-native
     cd llvm-native
-    wget --progress=dot:giga https://github.com/solana-labs/llvm-builder/releases/download/$version/solana-llvm-$machine.tgz
-    tar xzf solana-llvm-$machine.tgz
-    rm -rf solana-llvm-$machine.tgz
+    wget --progress=dot:giga https://github.com/solana-labs/llvm-builder/releases/download/$version/$filename
+    tar -jxf $filename
+    rm -rf $filename
 
-    echo "https://github.com/solana-labs/llvm-builder/releases/tag/$version" > ../llvm-native-version.md
+    echo "https://github.com/solana-labs/llvm-builder/releases/tag/$version" > ../llvm-native-$machine-$version.md
   )
-
   # shellcheck disable=SC2181
   if [[ $? -ne 0 ]]; then
     rm -rf llvm-native