diff --git a/Dockerfile b/Dockerfile
index 6214104c22e7b..ecc1e8cdf477a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,8 +24,10 @@ RUN install_packages \
     # Used both to install dependencies and at run time
   bash less \
     # Just in case you have to shell into the image
-  locales
+  locales \
     # Deal with utf-8 characters properly
+  dumb-init
+    # Reap zombie git gc processes
 RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
diff --git a/preview/Dockerfile b/preview/Dockerfile
index f1a5bae74427c..2863791ba8bab 100644
--- a/preview/Dockerfile
+++ b/preview/Dockerfile
@@ -25,4 +25,5 @@ COPY preview /docs_build/preview
 COPY template /docs_build/template
 COPY resources /docs_build/resources
 
+ENTRYPOINT ["dumb-init", "--"]
 CMD ["/docs_build/build_docs.pl", "--in_standard_docker", "--preview"]
diff --git a/preview/build.sh b/preview/build.sh
index b45a9b923cb8f..d1369d20b8d19 100755
--- a/preview/build.sh
+++ b/preview/build.sh
@@ -5,7 +5,7 @@
 set -eo pipefail
 
 export IMAGE=docker.elastic.co/docs/preview
-export VERSION=17
+export VERSION=18
 
 cd $(git rev-parse --show-toplevel)
 ./build_docs --docker-build build