diff --git a/Makefile b/Makefile
index 1dc1bbe8..8e4384f6 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ IMAGE_INITCONTAINER_LATEST := $(IMAGE_NAME_INIT):latest
 
 IMAGE_BUILD_FLAGS ?= "--no-cache"
 
-BPFTRACEVERSION ?= "0.9.2-1"
+BPFTRACEVERSION ?= "v0.9.4"
 
 LDFLAGS := -ldflags '-X github.com/iovisor/kubectl-trace/pkg/version.buildTime=$(shell date +%s) -X github.com/iovisor/kubectl-trace/pkg/version.gitCommit=${GIT_COMMIT} -X github.com/iovisor/kubectl-trace/pkg/cmd.ImageNameTag=${IMAGE_TRACERUNNER_COMMIT} -X github.com/iovisor/kubectl-trace/pkg/cmd.InitImageNameTag=${IMAGE_INITCONTAINER_COMMIT}'
 TESTPACKAGES := $(shell go list ./... | grep -v github.com/iovisor/kubectl-trace/integration)
diff --git a/build/Dockerfile.tracerunner b/build/Dockerfile.tracerunner
index cb4b4179..a55dfbcb 100644
--- a/build/Dockerfile.tracerunner
+++ b/build/Dockerfile.tracerunner
@@ -1,3 +1,6 @@
+ARG bpftraceversion=v0.9.4
+FROM quay.io/iovisor/bpftrace:$bpftraceversion as bpftrace
+
 FROM golang:1.11.4-stretch as gobuilder
 
 RUN apt-get update
@@ -9,11 +12,8 @@ WORKDIR /go/src/github.com/iovisor/kubectl-trace
 RUN make _output/bin/trace-runner
 
 FROM ubuntu:19.10
-ARG bpftraceversion=0.9.2-1
-RUN apt-get update && apt-get install -y bpftrace=${bpftraceversion} && \
-    rm -rf /var/lib/apt/lists/* && apt-get clean && \
-    rmdir /usr/src && ln -sf /usr-host/src /usr/src
 
 COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner
+COPY --from=bpftrace /usr/bin/bpftrace /usr/bin/bpftrace
 
 ENTRYPOINT ["/bin/trace-runner"]