diff --git a/Dockerfile b/Dockerfile
index 7399fd3..8a0f810 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 LABEL org.label-schema.name="docker-bench-security" \
       org.label-schema.url="https://dockerbench.com" \
diff --git a/distros/Dockerfile.alpine b/distros/Dockerfile.alpine
index 59aa375..8a0f810 100644
--- a/distros/Dockerfile.alpine
+++ b/distros/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 LABEL org.label-schema.name="docker-bench-security" \
       org.label-schema.url="https://dockerbench.com" \
@@ -18,5 +18,7 @@ COPY ./tests/*.sh /usr/local/bin/tests/
 
 WORKDIR /usr/local/bin
 
+HEALTHCHECK CMD exit 0
+
 ENTRYPOINT [ "/usr/bin/dumb-init", "docker-bench-security.sh" ]