diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 02fe846ace..32be28ca01 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -18,7 +18,10 @@ RUN mkdir -p /data/db
 ADD license /etc/awx/license
 ADD license /etc/tower/license
 RUN pip2 install honcho
+RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.0.0/dumb-init_1.0.0_amd64.deb
+RUN dpkg -i dumb-init_*.deb
 ADD start_development.sh /start_development.sh
 
 EXPOSE 8013 8080 22
+ENTRYPOINT ["/usr/bin/dumb-init"]
 CMD /start_development.sh
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 4f8cc1e109..42f9865722 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -32,5 +32,5 @@ ADD start_everything.sh /start_everything.sh
 ADD start_development.sh /start_development.sh
 
 EXPOSE 8013 8080 27017 22
-ENTRYPOINT /usr/bin/dumb-init
+ENTRYPOINT ["/usr/bin/dumb-init"]
 CMD /start_development.sh