diff --git a/Dockerfile b/Dockerfile
index 3850182..b7b4a7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,8 +19,9 @@ FROM tier/shibboleth_sp
 ARG registry=docker.io
 ARG maintainer=tier
 ARG imagename=comanage
-ARG version=2.0.0
-ARG tierversion=17070
+ARG version=3.1.0
+ARG tierversion=180401
+
 
 MAINTAINER $maintainer
 LABEL Vendor="Internet2"
@@ -48,6 +49,7 @@ RUN yum -y install --setopt=tsflags=nodocs \
     php-pear-MDB2-Driver-mysqli \
     php-pecl-memcached \
     php-xml \
+    git \
     vim && yum -y clean all
 
 #
@@ -72,18 +74,16 @@ ENV MAINTAINER=$maintainer
 ENV COMANAGE_URL=https://github.com/Internet2/comanage-registry/archive/$VERSION.tar.gz
 ENV COMANAGE_PREFIX=comanage-registry
 
-RUN mkdir -p /tmp/comanage && cd /tmp/comanage && \
+# Note using git to grab this alternate develop branch
+RUN mkdir -p /opt/comanage && cd /opt/comanage && \
       wget -q $COMANAGE_URL && \
-# Perform verifications [TODO]
-# Prepare filesystem
-      mkdir -p /opt/comanage && \
       tar xf $VERSION.tar.gz && \
-      mv $COMANAGE_PREFIX-$VERSION /opt/comanage/. && \
-      ln -s /opt/comanage/$VERSION /opt/comanage/current && \
+      ln -s /opt/comanage/$COMANAGE_PREFIX-$VERSION  /opt/comanage/current && \
       mkdir /var/cache/registry && \
-      ln -s /var/cache/registry /opt/comanage/$COMANAGE_PREFIX-$VERSION/local/tmp &&  \
-# # Cleanup
-            rm -rf /tmp/comanage
+      cp -r /opt/comanage/current/app/tmp.dist /var/cache/registry && \
+      chown -R apache /var/cache/registry && \
+      chmod -R 700 /var/cache/registry && \
+      ln -s /var/cache/registry /opt/comanage/current/local/tmp
 
 ENV COMANAGE_HOME /opt/comanage/current