diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index 53757cd8d..ca5ad2225 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.3
+FROM alpine:3.7
 
 RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
 
 ENV HOME /tmp
 
-COPY tiller /tiller
+COPY tiller /bin/tiller
 
 EXPOSE 44134
-
-CMD ["/tiller"]
+USER nobody
+ENTRYPOINT ["/bin/tiller"]
 
diff --git a/rootfs/Dockerfile.experimental b/rootfs/Dockerfile.experimental
index 990bcde51..66a218477 100644
--- a/rootfs/Dockerfile.experimental
+++ b/rootfs/Dockerfile.experimental
@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.3
+FROM alpine:3.7
 
 RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
 
 ENV HOME /tmp
 
-COPY tiller /tiller
+COPY tiller /bin/tiller
 
 EXPOSE 44134
-
-CMD ["/tiller", "--experimental-release"]
+USER nobody
+ENTRYPOINT ["/bin/tiller", "--experimental-release"]