diff --git a/Dockerfile b/Dockerfile
index 404e2cb..0ced361 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,29 +4,19 @@ 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"
 
-ENV VERSION 1.12.6
-ENV SHA256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd
+RUN \
+  apk add --no-cache \
+    docker \
+    dumb-init && \
+  rm -rf /usr/bin/docker-* /usr/bin/dockerd && \
+  mkdir /usr/local/bin/tests
 
-WORKDIR /usr/bin
+COPY ./*.sh /usr/local/bin/
 
-RUN apk update && \
-    apk upgrade && \
-    apk --update add coreutils wget ca-certificates && \
-    wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz && \
-    wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz.sha256 && \
-    sha256sum -c docker-$VERSION.tgz.sha256 && \
-    echo "$SHA256 docker-$VERSION.tgz" | sha256sum -c - && \
-    tar -xzvf docker-$VERSION.tgz -C /tmp && \
-    mv /tmp/docker/docker . && \
-    chmod u+x docker* && \
-    rm -rf /tmp/docker* && \
-    apk del wget ca-certificates && \
-    rm -rf /var/cache/apk/* docker-$VERSION.tgz docker-$VERSION.tgz.sha256
+COPY ./tests/*.sh /usr/local/bin/tests/
 
-RUN mkdir /docker-bench-security
 
-COPY . /docker-bench-security
+WORKDIR /usr/local/bin
 
-WORKDIR /docker-bench-security
+ENTRYPOINT [ "/usr/bin/dumb-init", "docker-bench-security.sh" ]
 
-ENTRYPOINT ["/bin/sh", "docker-bench-security.sh"]
diff --git a/distros/Dockerfile.alpine b/distros/Dockerfile.alpine
index 404e2cb..0ced361 100644
--- a/distros/Dockerfile.alpine
+++ b/distros/Dockerfile.alpine
@@ -4,29 +4,19 @@ 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"
 
-ENV VERSION 1.12.6
-ENV SHA256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd
+RUN \
+  apk add --no-cache \
+    docker \
+    dumb-init && \
+  rm -rf /usr/bin/docker-* /usr/bin/dockerd && \
+  mkdir /usr/local/bin/tests
 
-WORKDIR /usr/bin
+COPY ./*.sh /usr/local/bin/
 
-RUN apk update && \
-    apk upgrade && \
-    apk --update add coreutils wget ca-certificates && \
-    wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz && \
-    wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz.sha256 && \
-    sha256sum -c docker-$VERSION.tgz.sha256 && \
-    echo "$SHA256 docker-$VERSION.tgz" | sha256sum -c - && \
-    tar -xzvf docker-$VERSION.tgz -C /tmp && \
-    mv /tmp/docker/docker . && \
-    chmod u+x docker* && \
-    rm -rf /tmp/docker* && \
-    apk del wget ca-certificates && \
-    rm -rf /var/cache/apk/* docker-$VERSION.tgz docker-$VERSION.tgz.sha256
+COPY ./tests/*.sh /usr/local/bin/tests/
 
-RUN mkdir /docker-bench-security
 
-COPY . /docker-bench-security
+WORKDIR /usr/local/bin
 
-WORKDIR /docker-bench-security
+ENTRYPOINT [ "/usr/bin/dumb-init", "docker-bench-security.sh" ]
 
-ENTRYPOINT ["/bin/sh", "docker-bench-security.sh"]