diff --git a/Dockerfile.m4 b/Dockerfile.m4
index ccdcd8f..57579d5 100644
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@@ -4,7 +4,7 @@ m4_changequote([[, ]])
 ## "build" stage
 ##################################################
 
-FROM docker.io/ubuntu:20.04 AS build
+FROM docker.io/ubuntu:22.04 AS build
 
 # Install system packages
 RUN export DEBIAN_FRONTEND=noninteractive \
@@ -92,7 +92,7 @@ RUN mkisofs -no-emul-boot -iso-level 4 -eltorito-boot loader/isoboot.bin -o /tmp
 ## "base" stage
 ##################################################
 
-m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:20.04]], [[FROM docker.io/ubuntu:20.04]]) AS base
+m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:22.04]], [[FROM docker.io/ubuntu:22.04]]) AS base
 m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectorm/qemu-user-static:latest CROSS_QEMU CROSS_QEMU]])
 
 # Install system packages
@@ -103,7 +103,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 		netcat-openbsd \
 		procps \
 		python3 \
-		qemu-kvm \
 		qemu-system-x86 \
 		qemu-utils \
 		rlwrap \
diff --git a/scripts/service/smbd/run b/scripts/service/smbd/run
index 7040808..7c70671 100755
--- a/scripts/service/smbd/run
+++ b/scripts/service/smbd/run
@@ -4,4 +4,4 @@ set -eu
 
 cd /run/samba/
 exec 2>&1
-exec /usr/sbin/smbd --foreground --log-stdout --debuglevel=3
+exec /usr/sbin/smbd --foreground --debug-stdout --debuglevel=3