diff --git a/Dockerfile b/Dockerfile
index c5aba1cfe9..80dc194c1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.4
 MAINTAINER Thomas Boerger <thomas@webhippie.de>
 
 EXPOSE 22 3000
diff --git a/Dockerfile.rpi b/Dockerfile.rpi
index c618c94f2a..e82428c1b5 100644
--- a/Dockerfile.rpi
+++ b/Dockerfile.rpi
@@ -1,4 +1,4 @@
-FROM hypriot/rpi-alpine-scratch:edge
+FROM hypriot/rpi-alpine-scratch:v3.4
 MAINTAINER Thomas Boerger <thomas@webhippie.de>
 
 EXPOSE 22 3000