diff --git a/Makefile b/Makefile
index 36e85e454..28951a775 100644
--- a/Makefile
+++ b/Makefile
@@ -492,6 +492,10 @@ docker-demo-ubuntu:
 	docker pull photoprism/photoprism:preview-ubuntu
 	scripts/docker/build.sh demo ubuntu /ubuntu
 	scripts/docker/push.sh demo ubuntu
+docker-demo-unstable:
+	docker pull photoprism/photoprism:unstable
+	scripts/docker/build.sh demo unstable /unstable
+	scripts/docker/push.sh demo unstable
 docker-demo-local:
 	scripts/docker/build.sh photoprism
 	scripts/docker/build.sh demo $(BUILD_DATE) /debian
diff --git a/docker/demo/unstable/Dockerfile b/docker/demo/unstable/Dockerfile
new file mode 100644
index 000000000..6e5b75514
--- /dev/null
+++ b/docker/demo/unstable/Dockerfile
@@ -0,0 +1,37 @@
+FROM photoprism/photoprism:unstable as build
+
+# Set environment variables
+ENV TF_CPP_MIN_LOG_LEVEL=2 \
+    PHOTOPRISM_STORAGE_PATH="/photoprism/storage" \
+    PHOTOPRISM_DEBUG="false" \
+    PHOTOPRISM_READONLY="false" \
+    PHOTOPRISM_PUBLIC="true" \
+    PHOTOPRISM_DEMO="true" \
+    PHOTOPRISM_EXPERIMENTAL="true" \
+    PHOTOPRISM_UPLOAD_NSFW="false" \
+    PHOTOPRISM_DETECT_NSFW="false" \
+    PHOTOPRISM_THUMB_FILTER="lanczos" \
+    PHOTOPRISM_THUMB_UNCACHED="true" \
+    PHOTOPRISM_THUMB_SIZE=4096 \
+    PHOTOPRISM_THUMB_SIZE_UNCACHED=4096 \
+    PHOTOPRISM_JPEG_SIZE=4096 \
+    PHOTOPRISM_JPEG_QUALITY=85 \
+    PHOTOPRISM_APP_NAME="Demo" \
+    PHOTOPRISM_APP_ICON="favicon" \
+    PHOTOPRISM_SITE_TITLE="PhotoPrism" \
+    PHOTOPRISM_SITE_CAPTION="Demo" \
+    PHOTOPRISM_SITE_DESCRIPTION="AI-Powered Photos App for the Decentralized Web"
+
+# Copy assets
+COPY /docker/demo/index.tmpl /opt/photoprism/assets/templates
+
+# Download example photos
+RUN wget -qO- https://dl.photoprism.app/qa/demo.tar.gz | tar xvz -C /photoprism/originals
+
+# Import example photos
+RUN photoprism restore -a
+RUN photoprism index -a
+RUN photoprism moments
+
+# Start PhotoPrism server
+CMD ["photoprism", "--public", "start"]