diff --git a/config/templates/Dockerfile b/config/templates/Dockerfile
index 73a67cbddf..514a32d58c 100644
--- a/config/templates/Dockerfile
+++ b/config/templates/Dockerfile
@@ -95,7 +95,6 @@ RUN apt-get update \
        python3-distutils \
        python3-pkg-resources \
        python3-setuptools \
-       qemu \
        qemu-utils \
        qemu-user-static \
        rsync \
diff --git a/config/templates/config-docker.conf b/config/templates/config-docker.conf
index a6637a1f50..60b9a22ac2 100644
--- a/config/templates/config-docker.conf
+++ b/config/templates/config-docker.conf
@@ -5,7 +5,7 @@
 
 
 # Default values for Docker image
-CUSTOM_PACKAGES="g++-11-arm-linux-gnueabihf libssl3"
+CUSTOM_PACKAGES="g++-11-arm-linux-gnueabihf libssl3 qemu"
 BASE_IMAGE="ubuntu:jammy"