diff --git a/tasks/keystone_install.yml b/tasks/keystone_install.yml
index 36814928..c64e88dc 100644
--- a/tasks/keystone_install.yml
+++ b/tasks/keystone_install.yml
@@ -17,6 +17,18 @@
   when:
     - ansible_pkg_mgr == 'apt'
 
+- name: Create WSGI symlinks
+  file:
+    src: "{{ item.src }}"
+    dest: "/var/www/cgi-bin/keystone/{{ item.dest }}"
+    state: link
+    force: yes
+  with_items:
+    - src: "{{ keystone_bin }}/keystone-wsgi-admin"
+      dest: admin
+    - src: "{{ keystone_bin }}/keystone-wsgi-public"
+      dest: main
+
 - name: Create developer mode constraint file
   copy:
     dest: "/opt/developer-pip-constraints.txt"
diff --git a/tasks/keystone_post_install.yml b/tasks/keystone_post_install.yml
index 85d31766..4a24c4e4 100644
--- a/tasks/keystone_post_install.yml
+++ b/tasks/keystone_post_install.yml
@@ -48,15 +48,3 @@
   notify:
     - Restart Apache
 
-- name: Drop Keystone WSGI Configs
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: "{{ keystone_system_user_name }}"
-    group: "{{ keystone_system_group_name }}"
-    mode: "{{ item.mode|default('0644') }}"
-  with_items:
-    - { src: "keystone-wsgi.py.j2", dest: "/var/www/cgi-bin/keystone/admin", mode: "0755" }
-    - { src: "keystone-wsgi.py.j2", dest: "/var/www/cgi-bin/keystone/main", mode: "0755" }
-  notify:
-    - Restart Apache
diff --git a/templates/keystone-wsgi.py.j2 b/templates/keystone-wsgi.py.j2
deleted file mode 100644
index ae70669a..00000000
--- a/templates/keystone-wsgi.py.j2
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2013 OpenStack Foundation
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import os
-
-import pbr.version
-_version_ = pbr.version.VersionInfo('keystone').version_string()
-
-#TODO(cloudnull) This should be removed in the N time frame
-if '8' in _version_:
-    from keystone.server import wsgi as wsgi_server
-    name = os.path.basename(__file__)
-    application = wsgi_server.initialize_application(name)
-else:
-    import os
-    from oslo_log import log
-    from oslo_log import versionutils
-    from keystone.i18n import _LW
-    from keystone.server import wsgi as wsgi_server
-    name = os.path.basename(__file__)
-    LOG = log.getLogger(__name__)
-    def deprecation_warning():
-        versionutils.report_deprecated_feature(
-            LOG,
-            _LW('httpd/keystone.py is deprecated as of Mitaka'
-                ' in favor of keystone-wsgi-admin and keystone-wsgi-public'
-                ' and may be removed in O.')
-        )
-    application = wsgi_server.initialize_application(
-        name,
-        post_log_configured_function=deprecation_warning
-    )