diff --git a/Dockerfile b/Dockerfile
index 86868c6..abc0188 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,18 +73,13 @@ 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 && \
+RUN mkdir -p /opt/comanage && cd /opt/comanage && \
       git clone -b feature-3.1 https://github.com/Internet2/comanage-registry.git && \
-# 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 && \
-      mkdir /var/cache/registry && \
+      mv comanage-registry $COMANAGE_PREFIX-$VERSION && \
+      ln -s /opt/comanage/$COMANAGE_PREFIX-$VERSION  /opt/comanage/current && \
       ln -s /var/cache/registry /opt/comanage/$COMANAGE_PREFIX-$VERSION/local/tmp &&  \
-# # Cleanup
-            rm -rf /tmp/comanage
+      chown -R apache /var/cache/registry && \
+      chmod -R 700 /var/cache/registry
 
 ENV COMANAGE_HOME /opt/comanage/current