diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..7b491c1
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,7 @@
+# TODO
+
+- [ ] Build docker images in ci.
+- [ ] Generate documentation for docker usage.
+  - [ ] Generally need to create a local wrapper script to mount volumes.
+  - [ ] Completions can be installed / used with the wrapper script by calling
+        `docker run --it --rm <image> --generate-completion-script <shell> > /path/to/completions/on/local`
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 33be46c..a08ac1d 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -56,11 +56,6 @@ RUN export DEBIAN_FRONTEND=nointeractive DEBCONF_NOINTERACTIVE_SEEN=true && \
 
 COPY --from=build /staging/hpa /usr/local/bin
 
-# Setup completion
-RUN mkdir /root/.bash_completion && \
-  echo "source /root/.bash_completion/hpa.bash" >>/root/.bashrc && \
-  /usr/local/bin/hpa --generate-completion-script bash >/root/.bash_completion/hpa.bash
-
 # Setup volumes
 RUN mkdir /config && \
   mkdir /consults && \
@@ -72,4 +67,5 @@ RUN mkdir /config && \
 
 VOLUME /config /consults /playbook /template
 
-CMD ["/bin/bash", "-xc", "/usr/local/bin/hpa"]
+ENTRYPOINT [ "/usr/local/bin/hpa" ] 
+CMD ["--help"]