diff --git a/config/docker/debian-9/Dockerfile b/config/docker/debian-9/Dockerfile
index d895e33..495972a 100644
--- a/config/docker/debian-9/Dockerfile
+++ b/config/docker/debian-9/Dockerfile
@@ -1,18 +1,24 @@
-FROM ubuntu:18.04
+FROM debian:9
 MAINTAINER Travis Gockel <travis@gockelhut.com>
 
+
 RUN apt-get update          \
  && apt-get install --yes   \
     cmake                   \
     grep                    \
     googletest              \
-    g++-7                   \
     ivy                     \
     lcov                    \
     libgtest-dev            \
     libzookeeper-mt-dev     \
     ninja-build
 
-RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-7 99
+RUN echo 'APT::Default-Release "stable";'                                      >> /etc/apt/apt.conf \
+ && echo 'deb http://deb.debian.org/debian testing main'                       >> /etc/apt/sources.list \
+ && echo 'deb http://security.debian.org/debian-security testing/updates main' >> /etc/apt/sources.list \
+ && echo 'deb http://deb.debian.org/debian testing-updates main'               >> /etc/apt/sources.list \
+ && apt-get update \
+ && apt-get install --yes -t testing g++-7 \
+ && update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-7 99
 
 CMD ["/root/zookeeper-cpp/config/run-tests"]
diff --git a/config/make-packages b/config/make-packages
index ec444dc..d5656c1 100755
--- a/config/make-packages
+++ b/config/make-packages
@@ -37,6 +37,10 @@ while [[ $# -gt 0 ]]; do
       COPY_TO="${key/--copy-to=/}"
       shift
       ;;
+    --help)
+      show_usage
+      exit 1
+      ;;
     --)
       # No shift: want to use the -- in the call
       break