diff --git a/.dockerignore b/.dockerignore
index 0a82b23c..aff14128 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,13 +1,20 @@
 .github/
 .idea/
+.git/
 node_modules/
 benchmark/
+release/
 demo/
 dist/
+PiGallery2.iml
 docs/
 out-tsc/
 test/
 docker/
+src/**/*.js
+src/**/*.js.map
+gulpfile.js
+gulpfile.js.map
 .travis.yml
 config.json
 karma.conf.js
diff --git a/.gitignore b/.gitignore
index 8eb694b4..86e76cc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,9 @@
 PiGallery2.iml
 node_modules/
 pigallery2.zip
-src/frontend/**/*.js
-src/frontend/**/*.js.map
+src/**/*.js
+src/**/*.js.map
 src/frontend/dist
-src/backend/**/*.js
-src/backend/**/*.js.map
-src/common/**/*.js
-src/common/**/*.js.map
 test/coverage
 test/backend/**/*.js
 test/backend/**/*.js.map
diff --git a/docker/amd64/debian-stretch/Dockerfile b/docker/amd64/debian-stretch/Dockerfile
index 217e4e29..4f9ab711 100644
--- a/docker/amd64/debian-stretch/Dockerfile
+++ b/docker/amd64/debian-stretch/Dockerfile
@@ -5,7 +5,7 @@ COPY package*.json /build/
 WORKDIR /build
 RUN set -x && npm install --unsafe-perm
 # build app
-COPY stretch /build
+COPY . /build
 RUN mkdir -p /build/release/data/config && \
     mkdir -p /build/release/data/db && \
     mkdir -p /build/release/data/images && \
diff --git a/docker/arm32v6/alpine/Dockerfile b/docker/arm32v6/alpine/Dockerfile
index bee49905..d41c93c5 100644
--- a/docker/arm32v6/alpine/Dockerfile
+++ b/docker/arm32v6/alpine/Dockerfile
@@ -11,7 +11,7 @@ COPY package*.json /build/
 WORKDIR /build
 RUN set -x && npm install --unsafe-perm
 # build app
-COPY stretch /build
+COPY . /build
 RUN mkdir -p /build/release/data/config && \
     mkdir -p /build/release/data/db && \
     mkdir -p /build/release/data/images && \