diff --git a/Makefile b/Makefile
index 625107e05..efee1fec2 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
 LINT_TIMEOUT ?= 15m
-DOCKER_BUILDER ?= build # 'buildx build'
+DOCKER_BUILDER ?= buildx build
 
 .PHONY: all
 all: build
diff --git a/docker/koordlet.dockerfile b/docker/koordlet.dockerfile
index f1362530b..21ab637ca 100644
--- a/docker/koordlet.dockerfile
+++ b/docker/koordlet.dockerfile
@@ -7,6 +7,15 @@ ENV VERSION $VERSION
 ENV GOOS linux
 ENV GOARCH $TARGETARCH
 
+RUN apt update && apt install -y bash build-essential cmake wget
+RUN wget https://sourceforge.net/projects/perfmon2/files/libpfm4/libpfm-4.13.0.tar.gz && \
+  echo "bcb52090f02bc7bcb5ac066494cd55bbd5084e65  libpfm-4.13.0.tar.gz" | sha1sum -c && \
+  tar -xzf libpfm-4.13.0.tar.gz && \
+  rm libpfm-4.13.0.tar.gz
+RUN export DBG="-g -Wall" && \
+  make -e -C libpfm-4.13.0 && \
+  make install -C libpfm-4.13.0
+
 COPY go.mod go.mod
 COPY go.sum go.sum
 
@@ -16,14 +25,6 @@ COPY apis/ apis/
 COPY cmd/ cmd/
 COPY pkg/ pkg/
 
-RUN apt update && apt install -y bash build-essential cmake wget
-RUN wget https://sourceforge.net/projects/perfmon2/files/libpfm4/libpfm-4.13.0.tar.gz && \
-  echo "bcb52090f02bc7bcb5ac066494cd55bbd5084e65  libpfm-4.13.0.tar.gz" | sha1sum -c && \
-  tar -xzf libpfm-4.13.0.tar.gz && \
-  rm libpfm-4.13.0.tar.gz
-RUN export DBG="-g -Wall" && \
-  make -e -C libpfm-4.13.0 && \
-  make install -C libpfm-4.13.0
 RUN go build -a -o koordlet cmd/koordlet/main.go
 
 # The CUDA container images provide an easy-to-use distribution for CUDA supported platforms and architectures.