diff --git a/Makefile b/Makefile
index 13cf8c7eb..2fa6d3960 100644
--- a/Makefile
+++ b/Makefile
@@ -195,9 +195,9 @@ clean:
 	rm -rf frontend/node_modules
 docker-development:
 	scripts/install-qemu.sh
-	docker pull --platform=amd64 ubuntu:21.04
-	docker pull --platform=arm64 ubuntu:21.04
-	docker pull --platform=arm ubuntu:21.04
+	docker pull --platform=amd64 ubuntu:21.10
+	docker pull --platform=arm64 ubuntu:21.10
+	docker pull --platform=arm ubuntu:21.10
 	scripts/docker-buildx.sh development linux/amd64,linux/arm64,linux/arm $(DOCKER_TAG)
 docker-preview:
 	scripts/docker-buildx.sh photoprism linux/amd64,linux/arm64,linux/arm
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 92544ee9f..26099b831 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:21.10
 
 LABEL maintainer="Michael Mayer <hello@photoprism.org>"
 
diff --git a/docker/photoprism/Dockerfile b/docker/photoprism/Dockerfile
index c969b9d16..aa2e34373 100644
--- a/docker/photoprism/Dockerfile
+++ b/docker/photoprism/Dockerfile
@@ -12,7 +12,7 @@ COPY . .
 RUN make dep build-js install
 
 # Should be the same as used for photoprism/development!
-FROM ubuntu:21.04
+FROM ubuntu:21.10
 
 LABEL maintainer="Michael Mayer <hello@photoprism.org>"