diff --git a/ansible/roles/horizon/templates/_9998-kolla-settings.py.j2 b/ansible/roles/horizon/templates/_9998-kolla-settings.py.j2
index 71a46acf12..a15d49004d 100644
--- a/ansible/roles/horizon/templates/_9998-kolla-settings.py.j2
+++ b/ansible/roles/horizon/templates/_9998-kolla-settings.py.j2
@@ -53,7 +53,8 @@ AVAILABLE_REGIONS = [
 {% endif %}
 
 OPENSTACK_HOST = "{{ kolla_internal_fqdn }}"
-OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_url }}"
+# TODO(fprzewozn): URL /v3 suffix is required until Horizon bug #2073639 is resolved
+OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_url }}/v3"
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ keystone_default_user_role }}"
 
 {% if enable_keystone_federation | bool %}
diff --git a/releasenotes/notes/bug-2073159-c54c773c72c8fb11.yaml b/releasenotes/notes/bug-2073159-c54c773c72c8fb11.yaml
new file mode 100644
index 0000000000..15d7087780
--- /dev/null
+++ b/releasenotes/notes/bug-2073159-c54c773c72c8fb11.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes behaviour of Change Password screen in Horizon until
+    `bug #2073639 <https://launchpad.net/bugs/2073639>`__ is resolved.
+    `LP#2073159 <https://launchpad.net/bugs/2073159>`__