diff --git a/Dockerfile.dev b/Dockerfile.dev
index 5b9583b..cb94943 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:rolling
 
 ARG UID
 
diff --git a/Dockerfile.prod b/Dockerfile.prod
index e8dd95d..0a58e92 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:rolling
 
 # This is just here so we can reuse the Docker cache between dev and
 # prod, it's not actually read by anything.
diff --git a/scripts/docker-install-phase0.bash b/scripts/docker-install-phase0.bash
index 7382789..5ea67b0 100755
--- a/scripts/docker-install-phase0.bash
+++ b/scripts/docker-install-phase0.bash
@@ -6,6 +6,7 @@ set -x
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
+apt-get dist-upgrade -y
 (yes || true) | unminimize
 rm -rf /var/lib/apt/lists/*