diff --git a/Dockerfile b/Dockerfile
index 9e9b9b76d38..659e895176b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,10 @@ ARG TARGETARCH
 ARG TARGETVARIANT
 
 RUN --mount=target=/build,source=build \
-    TARGET=${TARGETARCH}${TARGETVARIANT} /build/run.sh install-packages
+    /build/run.sh setup-user
 
 RUN --mount=target=/build,source=build \
-    /build/run.sh setup-user
+    TARGET=${TARGETARCH}${TARGETVARIANT} /build/run.sh install-packages
 
 COPY --chmod=644 files/sudoers* /etc/sudoers.d
 
diff --git a/build/alpine/install-packages.sh b/build/alpine/install-packages.sh
index 28a1a5b1724..86324fd8d31 100755
--- a/build/alpine/install-packages.sh
+++ b/build/alpine/install-packages.sh
@@ -34,3 +34,4 @@ curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/down
 tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
 ln -s /usr/local/sbin/knockd /usr/sbin/knockd
 setcap cap_net_raw=ep /usr/local/sbin/knockd
+chown minecraft /usr/local/sbin/knockd
diff --git a/build/ol/install-packages.sh b/build/ol/install-packages.sh
index 82f87abe8fd..4c9163f6c4e 100755
--- a/build/ol/install-packages.sh
+++ b/build/ol/install-packages.sh
@@ -47,3 +47,4 @@ curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/down
 tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
 ln -s /usr/local/sbin/knockd /usr/sbin/knockd
 setcap cap_net_raw=ep /usr/local/sbin/knockd
+chown minecraft /usr/local/sbin/knockd
diff --git a/build/ubuntu/install-packages.sh b/build/ubuntu/install-packages.sh
index 5c4657d9879..02f9bc592b8 100755
--- a/build/ubuntu/install-packages.sh
+++ b/build/ubuntu/install-packages.sh
@@ -36,4 +36,5 @@ curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/down
 tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
 ln -s /usr/local/sbin/knockd /usr/sbin/knockd
 setcap cap_net_raw=ep /usr/local/sbin/knockd
+chown minecraft /usr/local/sbin/knockd
 find /usr/lib -name 'libpcap.so.0.8' -execdir cp '{}' libpcap.so.1 \;