diff --git a/Dockerfile b/Dockerfile
index 18a1ebc36..c4d28f42d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Debian 12, Codename 'Bookworm'
-FROM photoprism/develop:220421-bookworm
+FROM photoprism/develop:220516-bookworm
 
 ## alternative base images
 # FROM photoprism/develop:bullseye # Debian 11, Codename 'Bullseye'
diff --git a/Makefile b/Makefile
index 0c677c650..cdf5ea0da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 export GO111MODULE=on
 
+-include .env
+export
+
 GOIMPORTS=goimports
 BINARY_NAME=photoprism
 
@@ -282,7 +285,7 @@ docker-develop-bullseye-slim:
 	docker pull --platform=arm64 debian:bullseye-slim
 	scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 bullseye-slim /bullseye-slim
 docker-develop-armv7:
-	docker pull --platform=arm debian:bullseye-slim
+	docker pull --platform=arm debian:bookworm-slim
 	scripts/docker/buildx.sh develop linux/arm armv7 /armv7
 docker-develop-buster:
 	docker pull --platform=amd64 golang:buster