diff --git a/tools/Makefile b/tools/Makefile
index 2b38801f..8b878b14 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -146,7 +146,7 @@ PERF_LINUX_VERSION := 6.1.52
 perf:
 	wget https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$(PERF_LINUX_VERSION).tar.xz
 	tar -xf linux-$(PERF_LINUX_VERSION).tar.xz && mv linux-$(PERF_LINUX_VERSION)/ linux_perf/
-	cd linux_perf/tools/perf && make LDFLAGS="-static --static"
+	cd linux_perf/tools/perf && make LDFLAGS="-static --static" BUILD_BPF_SKEL=1 NO_JVMTI=1
 
 spectre-meltdown-checker:
 ifeq ("$(wildcard spectre-meltdown-checker)","")
diff --git a/tools/build.Dockerfile b/tools/build.Dockerfile
index 8bb928e7..34e5e003 100644
--- a/tools/build.Dockerfile
+++ b/tools/build.Dockerfile
@@ -6,7 +6,7 @@
 # build output oss_source* will be in workdir
 # build image (from project root directory):
 #   $ docker build -f tools/build.Dockerfile --tag perfspect-tools:$TAG ./tools
-FROM ubuntu:18.04 AS builder
+FROM ubuntu:22.04 AS builder
 ENV http_proxy=${http_proxy}
 ENV https_proxy=${https_proxy}
 ENV LANG=en_US.UTF-8
@@ -16,7 +16,10 @@ RUN locale-gen en_US.UTF-8 &&  echo "LANG=en_US.UTF-8" > /etc/default/locale
 RUN add-apt-repository ppa:git-core/ppa -y
 RUN apt-get update && apt-get install -y git build-essential autotools-dev automake \
     gawk zlib1g-dev libtool libaio-dev libaio1 pandoc pkgconf libcap-dev docbook-utils \
-    libreadline-dev default-jre default-jdk cmake flex bison libssl-dev
+    libreadline-dev default-jre default-jdk cmake flex bison libssl-dev clang libbpf-dev \
+    libdw-dev systemtap-sdt-dev libunwind-dev libslang2-dev python2-dev binutils-dev \
+    liblzma-dev libzstd-dev libnuma-dev libbabeltrace-dev llvm-13
+RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64