diff --git a/config/templates/Dockerfile b/config/templates/Dockerfile
index 65f8aab651..73a67cbddf 100644
--- a/config/templates/Dockerfile
+++ b/config/templates/Dockerfile
@@ -101,7 +101,6 @@ RUN apt-get update \
        rsync \
        swig \
        sudo \
-       systemd-container \
        tzdata \
        u-boot-tools \
        udev \
diff --git a/config/templates/config-docker.conf b/config/templates/config-docker.conf
index fa4874a835..a6637a1f50 100644
--- a/config/templates/config-docker.conf
+++ b/config/templates/config-docker.conf
@@ -6,7 +6,7 @@
 
 # Default values for Docker image
 CUSTOM_PACKAGES="g++-11-arm-linux-gnueabihf libssl3"
-BASE_IMAGE="ubuntu:22.04"
+BASE_IMAGE="ubuntu:jammy"
 
 
 [[ ! -c /dev/loop-control ]] && display_alert "/dev/loop-control does not exist, image building may not work" "" "wrn"