diff --git a/template/Dockerfile.jinja b/template/Dockerfile.jinja
index 342d04c1..07e1ece7 100644
--- a/template/Dockerfile.jinja
+++ b/template/Dockerfile.jinja
@@ -1,6 +1,6 @@
 # The devcontainer should use the developer target and run as root with podman
 # or docker with user namespaces.
-FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:noble AS developer
+FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:resolute AS developer
 
 # Add any system dependencies for the developer/build environment here
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
@@ -47,7 +47,7 @@ CMD [ "while true; do sleep 30; done;" ]
 
 {% endif %}
 # The runtime stage copies the built venv into a runtime container
-FROM ubuntu:noble AS runtime
+FROM ubuntu:resolute AS runtime
 
 # Add apt-get system dependecies for runtime here if needed
 # RUN apt-get update -y && apt-get install -y --no-install-recommends \