diff --git a/sdk/bpf/llvm-docker/bin/clang b/sdk/bpf/llvm-docker/bin/clang
index 7adf326628..03f69ca1aa 100755
--- a/sdk/bpf/llvm-docker/bin/clang
+++ b/sdk/bpf/llvm-docker/bin/clang
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 set -e
-WORKDIR=$( pwd )
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
-docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"
+PROGRAM=$(basename "$0")
+SDKROOT="$(cd "$(dirname "$0")"/../..; pwd -P)"
+[[ -z $V ]] || set -x
+exec docker run \
+  --workdir "$PWD" \
+  --volume "$PWD:$PWD" \
+  --volume "$SDKROOT:$SDKROOT" \
+  --rm solanalabs/llvm \
+  "$PROGRAM" "$@"
diff --git a/sdk/bpf/llvm-docker/bin/clang++ b/sdk/bpf/llvm-docker/bin/clang++
index 7adf326628..03f69ca1aa 100755
--- a/sdk/bpf/llvm-docker/bin/clang++
+++ b/sdk/bpf/llvm-docker/bin/clang++
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 set -e
-WORKDIR=$( pwd )
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
-docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"
+PROGRAM=$(basename "$0")
+SDKROOT="$(cd "$(dirname "$0")"/../..; pwd -P)"
+[[ -z $V ]] || set -x
+exec docker run \
+  --workdir "$PWD" \
+  --volume "$PWD:$PWD" \
+  --volume "$SDKROOT:$SDKROOT" \
+  --rm solanalabs/llvm \
+  "$PROGRAM" "$@"
diff --git a/sdk/bpf/llvm-docker/bin/llc b/sdk/bpf/llvm-docker/bin/llc
index 7adf326628..03f69ca1aa 100755
--- a/sdk/bpf/llvm-docker/bin/llc
+++ b/sdk/bpf/llvm-docker/bin/llc
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 set -e
-WORKDIR=$( pwd )
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
-docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"
+PROGRAM=$(basename "$0")
+SDKROOT="$(cd "$(dirname "$0")"/../..; pwd -P)"
+[[ -z $V ]] || set -x
+exec docker run \
+  --workdir "$PWD" \
+  --volume "$PWD:$PWD" \
+  --volume "$SDKROOT:$SDKROOT" \
+  --rm solanalabs/llvm \
+  "$PROGRAM" "$@"
diff --git a/sdk/bpf/llvm-docker/bin/llvm-objdump b/sdk/bpf/llvm-docker/bin/llvm-objdump
index 7adf326628..03f69ca1aa 100755
--- a/sdk/bpf/llvm-docker/bin/llvm-objdump
+++ b/sdk/bpf/llvm-docker/bin/llvm-objdump
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 set -e
-WORKDIR=$( pwd )
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../inc
-docker run --workdir /workdir --volume $WORKDIR:/workdir --volume $SDKPATH:/usr/local/include --rm solanalabs/llvm `basename "$0"` "$@"
+PROGRAM=$(basename "$0")
+SDKROOT="$(cd "$(dirname "$0")"/../..; pwd -P)"
+[[ -z $V ]] || set -x
+exec docker run \
+  --workdir "$PWD" \
+  --volume "$PWD:$PWD" \
+  --volume "$SDKROOT:$SDKROOT" \
+  --rm solanalabs/llvm \
+  "$PROGRAM" "$@"