diff --git a/Dockerfile b/Dockerfile
index 7f1db5c..01945d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
-FROM    docker.io/alpine
+FROM docker.io/alpine:3.7
 MAINTAINER Jan Christian Grünhage <jan.christian@gruenhage.xyz>
 
-RUN     apk update \
-        && apk upgrade \
-        && apk add \
-            s6
-ADD     root    /
+RUN apk update \
+ && apk upgrade \
+ && apk add \
+      s6 \
+      su-exec
+ADD root /
 
-CMD     ["/bin/s6-svscan", "/etc/s6.d"]
+CMD ["/bin/s6-svscan", "/etc/s6.d"]
diff --git a/root/etc/s6.d/.s6-svscan/finish b/root/etc/s6.d/.s6-svscan/finish
old mode 100644
new mode 100755
index 96b4b06..22665fa
--- a/root/etc/s6.d/.s6-svscan/finish
+++ b/root/etc/s6.d/.s6-svscan/finish
@@ -1 +1,2 @@
-#!/bin/sh
\ No newline at end of file
+#!/bin/sh
+exec /bin/true
diff --git a/root/etc/s6.d/cron/finish b/root/etc/s6.d/cron/finish
old mode 100644
new mode 100755