diff --git a/Dockerfile b/Dockerfile
index 02e22e801d..ac8b4f1992 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:3.5
 MAINTAINER Thomas Boerger <thomas@webhippie.de>
 
 EXPOSE 22 3000
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d9788ee739..34598332fc 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM aarch64/alpine:3.5
+FROM multiarch/alpine:aarch64-v3.5
 
 EXPOSE 22 3000
 
diff --git a/Dockerfile.rpi b/Dockerfile.rpi
index 3484b2e6e2..23b9f130b4 100644
--- a/Dockerfile.rpi
+++ b/Dockerfile.rpi
@@ -1,4 +1,4 @@
-FROM hypriot/rpi-alpine-scratch:v3.4
+FROM multiarch/alpine:armhf-v3.5
 MAINTAINER Thomas Boerger <thomas@webhippie.de>
 
 EXPOSE 22 3000