diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index 8996a8e75d..128c841487 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -33,6 +33,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block keystone_source_install %}
 ADD keystone-base-archive /keystone-base-source
+ADD wsgi /var/lib/kolla/venv/bin/keystone-wsgi-public
 
 {% set keystone_base_pip_packages = [
     '/keystone[ldap]',
@@ -40,14 +41,10 @@ ADD keystone-base-archive /keystone-base-source
 
 RUN ln -s keystone-base-source/* keystone \
     && {{ macros.install_pip(keystone_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/keystone /var/www/cgi-bin/keystone \
-    && cp -r /keystone/etc/* /etc/keystone/ \
-    && cp /var/lib/kolla/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
-    && cp /var/lib/kolla/venv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main
+    && mkdir -p /etc/keystone \
+    && cp -r /keystone/etc/* /etc/keystone/
 {% endblock %}
 
-RUN chmod 755 /var/www/cgi-bin/keystone/*
-
 {{ macros.kolla_patch_sources() }}
 
 {% block keystone_base_footer %}{% endblock %}
diff --git a/docker/keystone/keystone-base/wsgi b/docker/keystone/keystone-base/wsgi
new file mode 100644
index 0000000000..852ee95eb9
--- /dev/null
+++ b/docker/keystone/keystone-base/wsgi
@@ -0,0 +1,2 @@
+#!/var/lib/kolla/venv/bin/python
+from keystone.wsgi.api import application