diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build
index 9b90212..c44b043 100644
--- a/docker/alpine/Dockerfile.build
+++ b/docker/alpine/Dockerfile.build
@@ -1,7 +1,7 @@
 FROM node:12-alpine AS builder
 RUN apk add python build-base sqlite-dev sqlite-libs vips-dev
-COPY pigallery2-release /build
-WORKDIR /build
+COPY pigallery2-release /app
+WORKDIR /app
 RUN npm install --unsafe-perm
 RUN mkdir -p /app/data/config && \
     mkdir -p /app/data/db && \
diff --git a/docker/debian-stretch/Dockerfile.build b/docker/debian-stretch/Dockerfile.build
index e18fc1b..2cadd50 100644
--- a/docker/debian-stretch/Dockerfile.build
+++ b/docker/debian-stretch/Dockerfile.build
@@ -1,6 +1,6 @@
 FROM node:12-stretch AS builder
-COPY pigallery2-release /build
-WORKDIR /build
+COPY pigallery2-release /app
+WORKDIR /app
 RUN npm install --unsafe-perm
 RUN mkdir -p /app/data/config && \
     mkdir -p /app/data/db && \
diff --git a/docker/debian-stretch/selfcontained/Dockerfile b/docker/debian-stretch/selfcontained/Dockerfile
index 6a26c31..d53fa73 100644
--- a/docker/debian-stretch/selfcontained/Dockerfile
+++ b/docker/debian-stretch/selfcontained/Dockerfile
@@ -11,11 +11,11 @@ RUN set -x && npm install --unsafe-perm && \
     npm run create-release && \
     cd /build/release && npm install --unsafe-perm && \
     npm start -- --config-only --force-rewrite-config \
-    --config-path=data/config/config.json \
-    --Server-Database-sqlite-storage='data/db/sqlite.db' \
-    --Server-Database-memory-usersFile='data/db/users.db' \
-    --Server-Media-folder='data/images' \
-    --Server-Media-tempFolder='data/tmp'  || true
+    --config-path=/app/data/config/config.json \
+    --Server-Database-sqlite-storage='/app/data/db/sqlite.db' \
+    --Server-Database-memory-usersFile='/app/data/db/users.db' \
+    --Server-Media-folder='/app/data/images' \
+    --Server-Media-tempFolder='/app/data/tmp'
 
 
 FROM node:12-stretch-slim