diff --git a/images/base/docker.list b/images/base/docker.list
index f634795..c79c3a3 100644
--- a/images/base/docker.list
+++ b/images/base/docker.list
@@ -1 +1 @@
-deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu noble stable
+deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu jammy stable
diff --git a/images/base/ubuntu.Dockerfile b/images/base/ubuntu.Dockerfile
index 07ed181..fa7893b 100644
--- a/images/base/ubuntu.Dockerfile
+++ b/images/base/ubuntu.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:noble
+FROM ubuntu:22.04
 
 SHELL ["/bin/bash", "-c"]
 ENV DEBIAN_FRONTEND=noninteractive
@@ -51,9 +51,8 @@ RUN ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/bin/docker-compose
 # Make typing unicode characters in the terminal work.
 ENV LANG=en_US.UTF-8
 
-# Remove the `ubuntu` user and add a user `coder` so that you're not developing as the `root` user
-RUN userdel -r ubuntu && \
-    useradd coder \
+# Add a user `coder` so that you're not developing as the `root` user
+RUN useradd coder \
     --create-home \
     --shell=/bin/bash \
     --groups=docker \
diff --git a/images/minimal/ubuntu.Dockerfile b/images/minimal/ubuntu.Dockerfile
index b260d35..7baf4e9 100644
--- a/images/minimal/ubuntu.Dockerfile
+++ b/images/minimal/ubuntu.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:noble
+FROM ubuntu:22.04
 
 USER root
 ENV DEBIAN_FRONTEND=noninteractive
@@ -12,15 +12,12 @@ RUN apt-get update && \
     sudo \
     && rm -rf /var/lib/apt/lists/*
 
-# Make typing unicode characters in the terminal work.
-ENV LANG=en_US.UTF-8
-# Remove the `ubuntu` user and add a user `coder` so that you're not developing as the `root` user
-RUN userdel -r ubuntu && \
-    useradd coder \
+RUN useradd coder \
     --create-home \
     --shell=/bin/bash \
     --uid=1000 \
     --user-group && \
     echo "coder ALL=(ALL) NOPASSWD:ALL" >>/etc/sudoers.d/nopasswd
 
+ENV LANG=en_US.UTF-8
 USER coder