diff --git a/doc/source/admin/openstack-operations/verify-deploy.rst b/doc/source/admin/openstack-operations/verify-deploy.rst
index daa9bda35a..42593c48e2 100644
--- a/doc/source/admin/openstack-operations/verify-deploy.rst
+++ b/doc/source/admin/openstack-operations/verify-deploy.rst
@@ -75,7 +75,7 @@ the OpenStack API and dashboard, as an administrator.
       | [ID truncated] | RegionOne | swift        | object-store   | True    | public    | https://10.23.100.127:8080/v1/AUTH_%(project_id)s |
       | [ID truncated] | RegionOne | designate    | dns            | True    | admin     | http://172.29.236.100:9001                        |
       | [ID truncated] | RegionOne | cinderv2     | volumev2       | True    | public    | https://10.23.100.127:8776/v2/%(project_id)s      |
-      | [ID truncated] | RegionOne | keystone     | identity       | True    | admin     | http://172.29.236.100:35357/v3                    |
+      | [ID truncated] | RegionOne | keystone     | identity       | True    | admin     | http://172.29.236.100:5000/v3                     |
       | [ID truncated] | RegionOne | ceilometer   | metering       | True    | admin     | http://172.29.236.100:8777/                       |
       | [ID truncated] | RegionOne | nova         | compute        | True    | public    | https://10.23.100.127:8774/v2.1/%(project_id)s    |
       | [ID truncated] | RegionOne | keystone     | identity       | True    | internal  | http://172.29.236.100:5000/v3                     |
diff --git a/inventory/group_vars/all/keystone.yml b/inventory/group_vars/all/keystone.yml
index b6a24464c0..309499d2e0 100644
--- a/inventory/group_vars/all/keystone.yml
+++ b/inventory/group_vars/all/keystone.yml
@@ -18,7 +18,7 @@
 
 keystone_admin_user_name: admin
 keystone_admin_tenant_name: admin
-keystone_admin_port: 35357
+keystone_admin_port: 5000
 keystone_service_port: 5000
 keystone_service_proto: http
 keystone_service_region: "{{ service_region }}"
diff --git a/inventory/group_vars/haproxy/haproxy.yml b/inventory/group_vars/haproxy/haproxy.yml
index dada5477e1..92f5f23fa2 100644
--- a/inventory/group_vars/haproxy/haproxy.yml
+++ b/inventory/group_vars/haproxy/haproxy.yml
@@ -141,16 +141,6 @@ haproxy_default_services:
       haproxy_backend_options:
         - "httpchk HEAD / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
       haproxy_service_enabled: "{{ groups['keystone_all'] is defined and groups['keystone_all'] | length > 0 }}"
-  - service:
-      haproxy_service_name: keystone_admin
-      haproxy_backend_nodes: "{{ groups['keystone_all'] | default([])  }}"
-      haproxy_port: 35357
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: "http"
-      haproxy_backend_options:
-        - "httpchk HEAD / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
-      haproxy_whitelist_networks: "{{ haproxy_keystone_admin_whitelist_networks }}"
-      haproxy_service_enabled: "{{ groups['keystone_all'] is defined and groups['keystone_all'] | length > 0 }}"
   - service:
       haproxy_service_name: neutron_server
       haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}"