diff --git a/build/Dockerfile b/build/Dockerfile
index d18cfa0..89a241b 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -30,6 +30,10 @@ EXPOSE 8223
 EXPOSE 7233
 
 # Volume to persist sqlite databases
+#  as well as the keyvalue database.
+ENV SQLITE_DATABASE_PATH=/data/zdravko.db
+ENV TEMPORAL_DATABASE_PATH=/data/temporal.db
+ENV KEYVALUE_DATABASE_PATH=/data/keyvalue.db
 VOLUME /data
 
 ENV DATABASE_PATH=/data/zdravko.db
diff --git a/deploy/.dockerignore b/deploy/.dockerignore
new file mode 100644
index 0000000..ad5e6cf
--- /dev/null
+++ b/deploy/.dockerignore
@@ -0,0 +1 @@
+deploy/
diff --git a/deploy.just b/deploy/Justfile
similarity index 100%
rename from deploy.just
rename to deploy/Justfile
diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml
index e3ccfb6..9d90c68 100644
--- a/deploy/docker-compose.yaml
+++ b/deploy/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 volumes:
   server_data:
   temporal_data:
diff --git a/justfile b/justfile
index 9ee9f19..7bab42e 100644
--- a/justfile
+++ b/justfile
@@ -3,7 +3,7 @@ set shell := ["devbox", "run"]
 # Load dotenv
 set dotenv-load
 
-import 'deploy.just'
+import 'deploy/Justfile'
 
 # Load public and private keys
 export JWT_PRIVATE_KEY := `cat jwt.private.pem || echo ""`