diff --git a/sdk/bpf/bpf.mk b/sdk/bpf/bpf.mk
index fe5f1cdd0c..1d0322668e 100644
--- a/sdk/bpf/bpf.mk
+++ b/sdk/bpf/bpf.mk
@@ -15,9 +15,9 @@ OUT_DIR ?= ./out
 OS := $(uname)
 
 ifeq ($(DOCKER),1)
-LLVM_DIR = $(LOCAL_PATH)llvm-docker
+LLVM_DIR = $(LOCAL_PATH)llvm-docker/
 else
-LLVM_DIR = $(LOCAL_PATH)llvm-native
+LLVM_DIR = $(LOCAL_PATH)llvm-native/
 endif
 
 ifdef LLVM_DIR
diff --git a/sdk/bpf/llvm-docker/bin/clang b/sdk/bpf/llvm-docker/bin/clang
index 2aef38dba8..7adf326628 100755
--- a/sdk/bpf/llvm-docker/bin/clang
+++ b/sdk/bpf/llvm-docker/bin/clang
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-set -ex
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../..
-docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@"
+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"` "$@"
diff --git a/sdk/bpf/llvm-docker/bin/clang++ b/sdk/bpf/llvm-docker/bin/clang++
index 2aef38dba8..7adf326628 100755
--- a/sdk/bpf/llvm-docker/bin/clang++
+++ b/sdk/bpf/llvm-docker/bin/clang++
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-set -ex
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../..
-docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@"
+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"` "$@"
diff --git a/sdk/bpf/llvm-docker/bin/llc b/sdk/bpf/llvm-docker/bin/llc
index 2aef38dba8..7adf326628 100755
--- a/sdk/bpf/llvm-docker/bin/llc
+++ b/sdk/bpf/llvm-docker/bin/llc
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-set -ex
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../..
-docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@"
+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"` "$@"
diff --git a/sdk/bpf/llvm-docker/bin/llvm-objdump b/sdk/bpf/llvm-docker/bin/llvm-objdump
index 2aef38dba8..7adf326628 100755
--- a/sdk/bpf/llvm-docker/bin/llvm-objdump
+++ b/sdk/bpf/llvm-docker/bin/llvm-objdump
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-set -ex
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../..
-docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@"
+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"` "$@"
diff --git a/sdk/bpf/llvm-docker/generate.sh b/sdk/bpf/llvm-docker/generate.sh
index 55be032875..0afc5c0c5c 100755
--- a/sdk/bpf/llvm-docker/generate.sh
+++ b/sdk/bpf/llvm-docker/generate.sh
@@ -2,9 +2,10 @@
 
 read -r -d '' SCRIPT << 'EOM'
 #!/usr/bin/env bash
-set -ex
-SDKPATH="$( cd "$(dirname "$0")" ; pwd -P )"/../../../..
-docker run --workdir /solana_sdk --volume $SDKPATH:/solana_sdk --rm solanalabs/llvm `basename "$0"` "$@"
+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"` "$@"
 EOM
 
 echo "$SCRIPT" > bin/clang