diff --git a/Dockerfile b/Dockerfile
index a063f2e10..d70144205 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 MAINTAINER Thomas Boerger <thomas@webhippie.de>
 
 EXPOSE 22 3000
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a9dc3adc1..93a7a2d88 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM multiarch/alpine:aarch64-v3.5
+FROM multiarch/alpine:aarch64-v3.6
 
 EXPOSE 22 3000
 
diff --git a/Dockerfile.rpi b/Dockerfile.rpi
index 373b8025a..dcaa336a9 100644
--- a/Dockerfile.rpi
+++ b/Dockerfile.rpi
@@ -1,4 +1,4 @@
-FROM multiarch/alpine:armhf-v3.5
+FROM multiarch/alpine:armhf-v3.6
 MAINTAINER Thomas Boerger <thomas@webhippie.de>
 
 EXPOSE 22 3000