diff --git a/.dockerignore b/.dockerignore
index 122d23db..e3082b7d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,15 @@
-node_modules
-.travis*
+.eslintignore
+.eslintrc.json
 .git
+.github
 .gitignore
-*.png
-firmware
-docker/Dockerfile*
\ No newline at end of file
+.npmrc
+.travis*
+.travis.yml
+README.md
+docker/Dockerfile*
+images
+node_modules
+scripts
+test
+update.sh
\ No newline at end of file
diff --git a/.travis/docker.sh b/.travis/docker.sh
index cdfdac97..c215a344 100755
--- a/.travis/docker.sh
+++ b/.travis/docker.sh
@@ -15,7 +15,7 @@ build_and_push() {
 }
 
 push_manifest() {
-  export DOCKER_CLI_EXPERIMENTAL=enabled  
+  export DOCKER_CLI_EXPERIMENTAL=enabled
 
   docker manifest create $DOCKER_USERNAME/zigbee2mqtt:latest$1 $DOCKER_USERNAME/zigbee2mqtt:latest$1 $DOCKER_USERNAME/zigbee2mqtt:arm32v6$1 $DOCKER_USERNAME/zigbee2mqtt:arm64v8$1
 
diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64
index 05528528..7b42f683 100644
--- a/docker/Dockerfile.amd64
+++ b/docker/Dockerfile.amd64
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 
 # Copy files
 ADD . /app
diff --git a/docker/Dockerfile.arm32v6 b/docker/Dockerfile.arm32v6
index 0930b330..d88bca9d 100644
--- a/docker/Dockerfile.arm32v6
+++ b/docker/Dockerfile.arm32v6
@@ -1,4 +1,4 @@
-FROM arm32v6/alpine:3.9
+FROM arm32v6/alpine:3.10
 
 # Setup cross-build
 ENV QEMU_EXECVE 1
diff --git a/docker/Dockerfile.arm64v8 b/docker/Dockerfile.arm64v8
index 4ac5c5ca..08759d28 100644
--- a/docker/Dockerfile.arm64v8
+++ b/docker/Dockerfile.arm64v8
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.9
+FROM arm64v8/alpine:3.10
 
 # Setup cross-build
 ENV QEMU_EXECVE 1
diff --git a/docker/qemu-aarch64-static b/docker/qemu-aarch64-static
index f44233bc..50c7d166 100755
Binary files a/docker/qemu-aarch64-static and b/docker/qemu-aarch64-static differ
diff --git a/docker/qemu-arm-static b/docker/qemu-arm-static
index bf5897b1..56f295cd 100755
Binary files a/docker/qemu-arm-static and b/docker/qemu-arm-static differ