diff --git a/docker/.dockerignore b/.dockerignore
similarity index 100%
rename from docker/.dockerignore
rename to .dockerignore
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a604dc9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,19 @@
+# Dockerfile for running combine - https://github.com/mlsecproject/combine
+# written by Jose Nazario from Kyle Maxwell's
+
+MAINTAINER jose nazario jose@monkey.org
+FROM python:2
+RUN groupadd -r combine && \
+    useradd -r -g combine -d /home/combine -s /sbin/nologin -c "Combine user" combine
+
+WORKDIR /home/combine
+USER combine
+ENV HOME /home/combine
+ENV USER combine
+ADD . /home/combine
+COPY combine-example.cfg /home/combine/combine.cfg
+USER root
+RUN pip install -r requirements.txt && \
+    chown -R combine:combine /home/combine 
+USER combine
+CMD ["python", "combine.py", "-e"]
diff --git a/docker/README.md b/README-Docker.md
similarity index 100%
rename from docker/README.md
rename to README-Docker.md
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 6661eec..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Dockerfile for running combine - https://github.com/mlsecproject/combine
-# written by Kyle Maxwell
-
-#MAINTAINER Kyle Maxwell, krmaxwell@gmail.com
-FROM ubuntu:14.04
-RUN apt-get update && \
-  apt-get dist-upgrade -y
-RUN apt-get install -y --no-install-recommends \
-  python-pip  \
-  python-dev \
-  build-essential \
-  python-virtualenv \
-  git && \
-
-  groupadd -r combine && \
-  useradd -r -g combine -d /home/combine -s /sbin/nologin -c "Combine user" combine
-
-WORKDIR /home
-RUN git clone https://github.com/mlsecproject/combine.git && \
-  chown -R combine:combine /home/combine && \
-  cd combine && \
-  pip install -r requirements.txt
-
-USER combine
-ENV HOME /home/combine
-ENV USER combine
-COPY combine.cfg /home/combine/
-WORKDIR /home/combine
-CMD ["python", "combine.py", "-e"]