diff --git a/docker_templates/keystone/Dockerfile.j2 b/docker_templates/keystone/Dockerfile.j2
index 142a52dd6a..ec8144b914 100644
--- a/docker_templates/keystone/Dockerfile.j2
+++ b/docker_templates/keystone/Dockerfile.j2
@@ -48,17 +48,15 @@ RUN apt-get install -y --no-install-recommends \
 
     {% endif %}
 
-ADD ./keystone.tar /
-RUN ln -s /keystone-* /keystone
-
-RUN cd /keystone \
+ADD keystone.tar /
+RUN ln -s /keystone-* keystone \
     && useradd --user-group keystone \
-    && pip install -r requirements.txt \
-    && pip install --install-option="--install-scripts=/usr/bin" /keystone \
+    && pip --no-cache-dir install /keystone \
     && mkdir -p /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \
     && cp -r /keystone/etc/* /etc/keystone/ \
-    && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/admin \
-    && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/main
+    && cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/admin \
+    && cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/main \
+    && chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone
 
 {% endif %}