diff --git a/Dockerfile b/Dockerfile
index 70ef4d9..b8a6f18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,27 +1,25 @@
-FROM alpine:3.6
+FROM alpine:3.7
 
-LABEL org.label-schema.name="docker-bench-security" \
-      org.label-schema.url="https://dockerbench.com" \
-      org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
-
-# Switch to the HTTPS endpoint for the apk repositories as per https://github.com/gliderlabs/docker-alpine/issues/184
-RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories
+LABEL \
+  org.label-schema.name="docker-bench-security" \
+  org.label-schema.url="https://dockerbench.com" \
+  org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
 
+# Switch to the HTTPS endpoint for the apk repositories
+# https://github.com/gliderlabs/docker-alpine/issues/184
 RUN \
-  apk upgrade --no-cache && \
+  sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories && \
   apk add --no-cache \
     docker \
     dumb-init && \
-  rm -rf /usr/bin/docker-* /usr/bin/dockerd && \
-  mkdir /usr/local/bin/tests
+  rm -rf /usr/bin/docker?*
 
 COPY ./*.sh /usr/local/bin/
-
 COPY ./tests/*.sh /usr/local/bin/tests/
 
-WORKDIR /usr/local/bin
-
 HEALTHCHECK CMD exit 0
 
+WORKDIR /usr/local/bin
+
 ENTRYPOINT [ "/usr/bin/dumb-init", "docker-bench-security.sh" ]
 
diff --git a/distros/Dockerfile.alpine b/distros/Dockerfile.alpine
index 8a0f810..b8a6f18 100644
--- a/distros/Dockerfile.alpine
+++ b/distros/Dockerfile.alpine
@@ -1,24 +1,25 @@
-FROM alpine:3.6
+FROM alpine:3.7
 
-LABEL org.label-schema.name="docker-bench-security" \
-      org.label-schema.url="https://dockerbench.com" \
-      org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
+LABEL \
+  org.label-schema.name="docker-bench-security" \
+  org.label-schema.url="https://dockerbench.com" \
+  org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
 
+# Switch to the HTTPS endpoint for the apk repositories
+# https://github.com/gliderlabs/docker-alpine/issues/184
 RUN \
-  apk upgrade --no-cache && \
+  sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories && \
   apk add --no-cache \
     docker \
     dumb-init && \
-  rm -rf /usr/bin/docker-* /usr/bin/dockerd && \
-  mkdir /usr/local/bin/tests
+  rm -rf /usr/bin/docker?*
 
 COPY ./*.sh /usr/local/bin/
-
 COPY ./tests/*.sh /usr/local/bin/tests/
 
-WORKDIR /usr/local/bin
-
 HEALTHCHECK CMD exit 0
 
+WORKDIR /usr/local/bin
+
 ENTRYPOINT [ "/usr/bin/dumb-init", "docker-bench-security.sh" ]