diff --git a/Dockerfile b/Dockerfile
index 7810ee4..27dfa56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # 
 # docker run -it -p 8000:8000 jupyter/oauthenticator
 
-FROM jupyter/jupyterhub
+FROM jupyterhub/jupyterhub:0.7.2
 
 MAINTAINER Project Jupyter <ipython-dev@scipy.org>
 
diff --git a/Dockerfile.template b/Dockerfile.template
new file mode 100644
index 0000000..9664d88
--- /dev/null
+++ b/Dockerfile.template
@@ -0,0 +1,28 @@
+# Designed to be run as 
+# 
+# docker run -it -p 8000:8000 jupyter/oauthenticator
+
+FROM jupyterhub/jupyterhub:${VERSION}
+
+MAINTAINER Project Jupyter <ipython-dev@scipy.org>
+
+# Install oauthenticator from git
+ADD oauthenticator /src/oauthenticator
+ADD dockerspawner /src/dockerspawner
+RUN pip install /src/oauthenticator
+RUN pip install /src/dockerspawner
+
+# Create oauthenticator directory and put necessary files in it
+RUN mkdir /srv/oauthenticator
+WORKDIR /srv/oauthenticator
+ENV OAUTHENTICATOR_DIR /srv/oauthenticator
+ADD ssl /srv/oauthenticator/ssl
+RUN chmod 700 /srv/oauthenticator
+RUN groupadd hubadmin
+RUN echo "%hubadmin ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+ADD jupyterhub_config.py /srv/jupyterhub/jupyterhub_config.py
+
+ENV USERS_DIR /output
+
+VOLUME /home
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 0662bf3..148131f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
 VERSION=`cat VERSION`
-REPO="balkian/jupyterhub-oauth"
+REPO="gsiupm/jupyterhub-oauth"
 TEST=$(REPO):test-$(VERSION)
 FINAL=$(REPO):$(VERSION)
 
 
-build:
+Dockerfile: Dockerfile.template VERSION
+	cat Dockerfile.template | VERSION=$(VERSION) envsubst > Dockerfile
+
+build: Dockerfile
 	docker build -t $(TEST) .
 
 run:
diff --git a/VERSION b/VERSION
index d3bdbdf..7486fdb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7
+0.7.2
diff --git a/dockerspawner b/dockerspawner
index f0ea6d0..a166091 160000
--- a/dockerspawner
+++ b/dockerspawner
@@ -1 +1 @@
-Subproject commit f0ea6d065c8a6a2be3e1295e2e30ab17f312a273
+Subproject commit a1660913ddef073cf4757ff1dac6e68a1736340d
diff --git a/jupyterhub_config.py b/jupyterhub_config.py
index 342f179..f6b59c2 100644
--- a/jupyterhub_config.py
+++ b/jupyterhub_config.py
@@ -19,7 +19,7 @@ teams = os.environ.get('OAUTHENTICATOR_TEAMS', None)
 
 c.JupyterHub.log_level = 10
 c.JupyterHub.spawner_class = 'dockerspawner.DockerSpawner'
-c.DockerSpawner.container_image = 'jupyter/scipy-singleuser'
+c.DockerSpawner.container_image = 'jupyter/scipy-notebook'
 c.DockerSpawner.use_internal_ip = True
 
 notebook_dir = os.environ.get('DOCKER_NOTEBOOK_DIR') or '/home/jovyan/work'
diff --git a/oauthenticator b/oauthenticator
index fb38f60..ac730b2 160000
--- a/oauthenticator
+++ b/oauthenticator
@@ -1 +1 @@
-Subproject commit fb38f60a5611056653bedf7416dbc922394b7cf8
+Subproject commit ac730b276184640227c2ca999bfccfe7472fca85