diff --git a/.gitignore b/.gitignore
index 76e1f4e..1e26c89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ venv/
 __pycache__
 cli-end-to-end.html
 README.html
+
+# Make timestamp files
+mk.*
diff --git a/Makefile b/Makefile
index 45b0907..1266cac 100644
--- a/Makefile
+++ b/Makefile
@@ -11,33 +11,35 @@ html: README.html
 	pandoc --toc=true --standalone $< --out $@
 
 # Build the qldbtools container image
-dbt: client-qldbtools-container
-client-qldbtools-container:
+dbt: mk.client-qldbtools-container
+mk.client-qldbtools-container:
 	cd client/containers/qldbtools && \
 		docker build -t $@:0.1.24 .
 	touch $@
 
 # Run a shell in the container with the qldbtools
-dbt-run: dbt
+dbt-run: mk.client-qldbtools-container
 	docker run --rm -it client-qldbtools-container:0.1.24 /bin/bash
 
 # Run one of the scripts in the container as check
-dbt-check: dbt
+dbt-check: mk.client-qldbtools-container
 	docker run --rm -it client-qldbtools-container:0.1.24 mc-db-initial-info
 
-dbt-push: dbt
+dbt-push: mk.dbt-push
+mk.dbt-push: mk.client-qldbtools-container
 	docker tag client-qldbtools-container:0.1.24 ghcr.io/hohn/client-qldbtools-container:0.1.24 
 	docker push ghcr.io/hohn/client-qldbtools-container:0.1.24
 	touch $@
 
-
-ghm: client-ghmrva-container
-client-ghmrva-container:
+ghm: mk.client-ghmrva-container
+mk.client-ghmrva-container:
 	cd client/containers/ghmrva && \
 		docker build -t $@:0.1.24 .
 	touch $@
 
-ghm-push: ghm
+
+ghm-push: mk.ghm-push
+mk.ghm-push: mk.client-ghmrva-container
 	docker tag client-ghmrva-container:0.1.24 ghcr.io/hohn/client-ghmrva-container:0.1.24 
 	docker push ghcr.io/hohn/client-ghmrva-container:0.1.24 
 	touch $@
@@ -45,7 +47,6 @@ ghm-push: ghm
 ghm-run:
 	docker run --rm client-ghmrva-container --help
 
-
 server:
 	cd cmd/server && GOOS=linux GOARCH=arm64 go build
 
diff --git a/client/containers/qldbtools/Makefile b/client/containers/qldbtools/Makefile
index df45b3b..9c94361 100644
--- a/client/containers/qldbtools/Makefile
+++ b/client/containers/qldbtools/Makefile
@@ -1,8 +1,8 @@
 DBT_TARGET := client-qldbtools-container:0.1.24
 
 # Build the qldbtools container image
-dbt: client-qldbtools-container
-client-qldbtools-container:
+dbt: mk.client-qldbtools-container
+mk.client-qldbtools-container:
 	docker build -t ${DBT_TARGET} .
 	touch $@
 
@@ -14,7 +14,8 @@ dbt-run: dbt
 dbt-check: dbt
 	docker run --rm -it ${DBT_TARGET} mc-db-initial-info
 
-dbt-push: dbt
+dbt-push: mk.dbt-push
+mk.dbt-push: dbt
 	docker tag ${DBT_TARGET} ghcr.io/hohn/${DBT_TARGET} 
 	docker push ghcr.io/hohn/${DBT_TARGET}
 	touch $@
diff --git a/client/containers/vscode/Makefile b/client/containers/vscode/Makefile
index 33c89e0..db32e1f 100644
--- a/client/containers/vscode/Makefile
+++ b/client/containers/vscode/Makefile
@@ -1,8 +1,8 @@
 all: code-server-initialized
 
 CSI_TARGET := code-server-initialized:0.1.24
-csi: code-server-initialized
-code-server-initialized:
+csi: mk.code-server-initialized
+mk.code-server-initialized:
 	docker build -t ${CSI_TARGET} .
 	touch $@
 
@@ -11,12 +11,13 @@ csi-serve: csi
 
 clean:
 	-docker rmi -f ${CSI_TARGET}
-	-rm code-server-initialized
+	-rm mk.code-server-initialized
 
 # Targets below are used after some manual setup of the container.  See README.org
 # for details
 
-csi-push: csi
+csi-push: mk.csi-push
+mk.csi-push: csi
 	docker tag ${CSI_TARGET} ghcr.io/hohn/${CSI_TARGET}
 	docker push ghcr.io/hohn/${CSI_TARGET}
 	touch $@
diff --git a/cmd/agent/Makefile b/cmd/agent/Makefile
index a7ba376..218e4c9 100644
--- a/cmd/agent/Makefile
+++ b/cmd/agent/Makefile
@@ -1,8 +1,9 @@
 all: mrva-agent
 
 MAI_TARGET := mrva-agent:0.1.24
-mai: mrva-agent
-mrva-agent:
+mai: mk.mrva-agent
+mrva-agent: mk.mrva-agent
+mk.mrva-agent:
 	cd ../../ && docker build -t mrva-agent:0.1.24 -f cmd/agent/Dockerfile .
 	touch $@
 
@@ -13,7 +14,8 @@ clean:
 	-docker rmi -f ${MAI_TARGET}
 	-rm mrva-agent
 
-mai-push: mai
+mai-push: mk.mai-push
+mk.mai-push: mai
 	docker tag ${MAI_TARGET} ghcr.io/hohn/${MAI_TARGET}
 	docker push ghcr.io/hohn/${MAI_TARGET}
 	touch $@
diff --git a/cmd/server/Makefile b/cmd/server/Makefile
index d4441e1..dc2f2fa 100644
--- a/cmd/server/Makefile
+++ b/cmd/server/Makefile
@@ -1,8 +1,9 @@
 all: mrva-server
 
 MSI_TARGET := mrva-server:0.1.24
-msi: mrva-server
-mrva-server:
+msi: mk.mrva-server
+mrva-server: mk.mrva-server
+mk.mrva-server:
 	cd ../../ && docker build -t mrva-server:0.1.24 -f cmd/server/Dockerfile .
 	touch $@
 
@@ -13,7 +14,8 @@ clean:
 	-docker rmi -f ${MSI_TARGET}
 	-rm mrva-server
 
-msi-push: msi
+msi-push: mk.msi-push
+mk.msi-push: mk.mrva-server
 	docker tag ${MSI_TARGET} ghcr.io/hohn/${MSI_TARGET}
 	docker push ghcr.io/hohn/${MSI_TARGET}
 	touch $@
diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml
index cde5b7e..4f90cfd 100644
--- a/docker-compose-demo.yml
+++ b/docker-compose-demo.yml
@@ -88,6 +88,7 @@ services:
         depends_on:
             - mrvadata
         volumes:
+            # XX: use multiple storage containers
             # data at /data/mrvacommander/dbstore-data
             - mrvadata:/data/mrvacommander
         networks:
@@ -104,10 +105,9 @@ services:
               required: true
         command: server /data --console-address ":9001"
         volumes:
-            # data at /data/mrvacommander/qpstore-data
-            - mrvadata:/data/mrvacommander
-            # XX: use multiple storage containers?
-            # - ./qpstore-data:/data
+            # The artifactstore is only populated at runtime so there is no need
+            # for Docker storage; a directory is fine.
+            - ./qpstore-data:/data
         networks:
             - backend