diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 55fc52c2..e4bd1ecb 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -4,7 +4,6 @@
     description: Base job for launching Rally task at Devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally-openstack
       # NOTE(andreykurilin): it is a required project to fetch the latest
       #   version and test master of rally-openstack with master of rally
@@ -13,6 +12,9 @@
     roles:
       - zuul: openstack/devstack
     vars:
+      devstack_localrc:
+        # TODO(frickler): drop this once python-keystoneclient no longer needs it
+        KEYSTONE_ADMIN_ENDPOINT: true
       devstack_plugins:
         rally-openstack: https://opendev.org/openstack/rally-openstack
     run: tests/ci/playbooks/run-rally-task.yaml
diff --git a/.zuul.d/rally-task-barbican.yaml b/.zuul.d/rally-task-barbican.yaml
index 2fc45daf..b55d6496 100644
--- a/.zuul.d/rally-task-barbican.yaml
+++ b/.zuul.d/rally-task-barbican.yaml
@@ -3,7 +3,6 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/barbican
diff --git a/.zuul.d/rally-task-designate.yaml b/.zuul.d/rally-task-designate.yaml
index e65ac647..8e945c73 100644
--- a/.zuul.d/rally-task-designate.yaml
+++ b/.zuul.d/rally-task-designate.yaml
@@ -9,7 +9,6 @@
       rally_task: rally-jobs/designate.yaml
       devstack_localrc:
         DESIGNATE_SERVICE_PORT_DNS: 5322
-        USE_PYTHON3: true
       devstack_plugins:
         designate: https://opendev.org/openstack/designate
         rally-openstack: https://opendev.org/openstack/rally-openstack
diff --git a/.zuul.d/rally-task-heat.yaml b/.zuul.d/rally-task-heat.yaml
index b7574be6..94e5c5f0 100644
--- a/.zuul.d/rally-task-heat.yaml
+++ b/.zuul.d/rally-task-heat.yaml
@@ -3,11 +3,13 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/heat
     vars:
+      devstack_localrc:
+        # TODO(frickler): drop this once heat no longer needs it
+        KEYSTONE_ADMIN_ENDPOINT: true
       devstack_plugins:
         rally-openstack: https://opendev.org/openstack/rally-openstack
         heat: https://opendev.org/openstack/heat
diff --git a/.zuul.d/rally-task-ironic.yaml b/.zuul.d/rally-task-ironic.yaml
index f678a7ab..ca0563f9 100644
--- a/.zuul.d/rally-task-ironic.yaml
+++ b/.zuul.d/rally-task-ironic.yaml
@@ -3,7 +3,6 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/ironic
diff --git a/.zuul.d/rally-task-magnum.yaml b/.zuul.d/rally-task-magnum.yaml
index 0df658cb..331a2d20 100644
--- a/.zuul.d/rally-task-magnum.yaml
+++ b/.zuul.d/rally-task-magnum.yaml
@@ -3,13 +3,15 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/magnum
       - name: openstack/python-magnumclient
       - name: openstack/heat
     vars:
+      devstack_localrc:
+        # TODO(frickler): drop this once heat no longer needs it
+        KEYSTONE_ADMIN_ENDPOINT: true
       devstack_plugins:
         rally-openstack: https://opendev.org/openstack/rally-openstack
         magnum: https://opendev.org/openstack/magnum
diff --git a/.zuul.d/rally-task-manila.yaml b/.zuul.d/rally-task-manila.yaml
index e9fd3eb8..d30e4db5 100644
--- a/.zuul.d/rally-task-manila.yaml
+++ b/.zuul.d/rally-task-manila.yaml
@@ -3,6 +3,9 @@
     parent: rally-task-at-devstack
     vars:
       rally_task: rally-jobs/manila.yaml
+      devstack_localrc:
+        # TODO(frickler): drop this once heat no longer needs it
+        KEYSTONE_ADMIN_ENDPOINT: true
       devstack_services:
         # disable redundant services for the job
         ceilometer-acentral: false
@@ -27,7 +30,6 @@
     vars:
       rally_task: rally-jobs/manila-no-ss.yaml
       devstack_localrc:
-        USE_PYTHON3: true
         LIBS_FROM_GIT: python-manilaclient
         SHARE_DRIVER: manila.tests.share.drivers.dummy.DummyDriver
         MANILA_ENABLED_BACKENDS: alpha,beta,gamma
@@ -59,7 +61,6 @@
     vars:
       rally_task: rally-jobs/manila.yaml
       devstack_localrc:
-        USE_PYTHON3: true
         LIBS_FROM_GIT: python-manilaclient
         SHARE_DRIVER: manila.tests.share.drivers.dummy.DummyDriver
         MANILA_ENABLED_BACKENDS: alpha,beta,gamma
diff --git a/.zuul.d/rally-task-mistral.yaml b/.zuul.d/rally-task-mistral.yaml
index 8bcf5154..95f095b9 100644
--- a/.zuul.d/rally-task-mistral.yaml
+++ b/.zuul.d/rally-task-mistral.yaml
@@ -3,13 +3,15 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/heat
       - name: openstack/mistral
       - name: openstack/python-mistralclient
     vars:
+      devstack_localrc:
+        # TODO(frickler): drop this once heat no longer needs it
+        KEYSTONE_ADMIN_ENDPOINT: true
       devstack_plugins:
         rally-openstack: https://opendev.org/openstack/rally-openstack
         mistral: https://opendev.org/openstack/mistral
@@ -25,4 +27,4 @@
         ceilometer-collector: false
         horizon: false
         tempest: false
-      rally_task: rally-jobs/mistral.yaml
\ No newline at end of file
+      rally_task: rally-jobs/mistral.yaml
diff --git a/.zuul.d/rally-task-murano.yaml b/.zuul.d/rally-task-murano.yaml
index 771588b1..bbb7aa48 100644
--- a/.zuul.d/rally-task-murano.yaml
+++ b/.zuul.d/rally-task-murano.yaml
@@ -3,12 +3,14 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/heat
       - name: openstack/murano
     vars:
+      devstack_localrc:
+        # TODO(frickler): drop this once heat no longer needs it
+        KEYSTONE_ADMIN_ENDPOINT: true
       devstack_plugins:
         rally-openstack: https://opendev.org/openstack/rally-openstack
         murano: https://opendev.org/openstack/murano
diff --git a/.zuul.d/rally-task-neutron-with-extensions.yaml b/.zuul.d/rally-task-neutron-with-extensions.yaml
index 8b620c31..66604179 100644
--- a/.zuul.d/rally-task-neutron-with-extensions.yaml
+++ b/.zuul.d/rally-task-neutron-with-extensions.yaml
@@ -3,7 +3,6 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/networking-bgpvpn
diff --git a/.zuul.d/rally-task-octavia.yaml b/.zuul.d/rally-task-octavia.yaml
index 1720d836..7d6aaa3e 100644
--- a/.zuul.d/rally-task-octavia.yaml
+++ b/.zuul.d/rally-task-octavia.yaml
@@ -3,7 +3,6 @@
     description: A Rally job for checking Octavia Plugin
     parent: rally-task-at-devstack
     required-projects:
-      - name: openstack/devstack-gate
       - name: openstack/diskimage-builder
       - name: openstack/octavia
       - name: openstack/octavia-lib
diff --git a/.zuul.d/rally-task-telemetry.yaml b/.zuul.d/rally-task-telemetry.yaml
index cb40c821..a0076a4a 100644
--- a/.zuul.d/rally-task-telemetry.yaml
+++ b/.zuul.d/rally-task-telemetry.yaml
@@ -3,12 +3,15 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/heat
       - name: openstack/ceilometer
     vars:
+      devstack_localrc:
+        CEILOMETER_BACKEND: gnocchi
+        # TODO(frickler): drop this once heat no longer needs it
+        KEYSTONE_ADMIN_ENDPOINT: true
       devstack_plugins:
         rally-openstack: https://opendev.org/openstack/rally-openstack
         ceilometer: https://opendev.org/openstack/ceilometer
@@ -21,5 +24,3 @@
         ceilometer-api: true
         ceilometer-collector: true
       rally_task: rally-jobs/telemetry.yaml
-      devstack_localrc:
-        CEILOMETER_BACKEND: gnocchi
diff --git a/.zuul.d/rally-task-watcher.yaml b/.zuul.d/rally-task-watcher.yaml
index f25a5b53..a1cd6357 100644
--- a/.zuul.d/rally-task-watcher.yaml
+++ b/.zuul.d/rally-task-watcher.yaml
@@ -3,7 +3,6 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/watcher
diff --git a/.zuul.d/rally-task-zaqar.yaml b/.zuul.d/rally-task-zaqar.yaml
index 2d624d3a..6befafed 100644
--- a/.zuul.d/rally-task-zaqar.yaml
+++ b/.zuul.d/rally-task-zaqar.yaml
@@ -3,7 +3,6 @@
     parent: rally-task-at-devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
       - name: openstack/zaqar
diff --git a/.zuul.d/rally-tox-functional.yaml b/.zuul.d/rally-tox-functional.yaml
index 1d575c3d..96fd2455 100644
--- a/.zuul.d/rally-tox-functional.yaml
+++ b/.zuul.d/rally-tox-functional.yaml
@@ -6,7 +6,6 @@
       Uses tox with the ``functional`` environment.
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally-openstack
       # NOTE(andreykurilin): it is a required project to fetch the latest
       #   version and test master of rally-openstack with master of rally
@@ -15,9 +14,10 @@
     roles:
       - zuul: openstack/devstack
     vars:
+      devstack_localrc:
+        # TODO(frickler): drop this once python-keystoneclient no longer needs it
+        KEYSTONE_ADMIN_ENDPOINT: true
       devstack_plugins:
         rally-openstack: https://opendev.org/openstack/rally-openstack
-      devstack_localrc:
-        USE_PYTHON3: true
       tox_env: "functional"
     run: tests/ci/playbooks/tox-functional-env-run.yaml
diff --git a/.zuul.d/rally-verify-tempest.yaml b/.zuul.d/rally-verify-tempest.yaml
index 0b38585c..700290c6 100644
--- a/.zuul.d/rally-verify-tempest.yaml
+++ b/.zuul.d/rally-verify-tempest.yaml
@@ -3,7 +3,6 @@
     parent: devstack
     required-projects:
       - name: openstack/devstack
-      - name: openstack/devstack-gate
       - name: openstack/rally-openstack
       - name: openstack/rally
     timeout: 7200
@@ -11,7 +10,8 @@
       - zuul: openstack/devstack
     vars:
       devstack_localrc:
-        USE_PYTHON3: true
+        # TODO(frickler): drop this once python-keystoneclient no longer needs it
+        KEYSTONE_ADMIN_ENDPOINT: true
       devstack_plugins:
         rally-openstack: https://opendev.org/openstack/rally-openstack
     run: tests/ci/playbooks/run-rally-verify.yaml
diff --git a/devstack/lib/rally b/devstack/lib/rally
index 23542c95..c7455933 100644
--- a/devstack/lib/rally
+++ b/devstack/lib/rally
@@ -43,36 +43,19 @@ OSPROFILER_CONNECTION_STRING=${OSPROFILER_CONNECTION_STRING:-""}
 # Creates a configuration file for the current deployment
 # Uses the following variables:
 #
-# - ``ADMIN_PASSWORD``, ``KEYSTONE_SERVICE_PROTOCOL``,
-#   ``KEYSTONE_SERVICE_HOST``, ``KEYSTONE_SERVICE_PORT``,
-#   ``IDENTITY_API_VERSION`` - must be defined
+# - ``ADMIN_PASSWORD``, ``REGION_NAME``
+#   ``OS_AUTH_URL``
 #   ``OSPROFILER_HMAC_KEYS`` - optional, for integration with osprofiler
 #   ``OSPROFILER_CONNECTION_STRING`` - optional, if this is set together with
 #       OSPROFILER_HMAC_KEYS rally html report will use osprofiler api to
 #       generate html report for each trace and embed it as iframe to our
-#       native html repor
+#       native html report
 #   ``RALLY_OSPROFILER_CHART`` - optional, a path to store osprofiler's reports
 #
 
 # _create_deployment_config filename
 function _create_deployment_config() {
-if [[ "$IDENTITY_API_VERSION" == 2.0 ]]
-then
-    cat >$1 <<EOF
-{
-    "openstack": {
-        "auth_url": "$OS_AUTH_URL",
-        "region_name": "$REGION_NAME",
-        "admin": {
-            "username": "admin",
-            "password": "$ADMIN_PASSWORD",
-            "tenant_name": "admin",
-        }
-EOF
-fi
-if [[ "$IDENTITY_API_VERSION" == 3 ]]
-then
-    cat >$1 <<EOF
+cat >$1 <<EOF
 {
     "openstack": {
         "auth_url": "$OS_AUTH_URL",
@@ -85,7 +68,6 @@ then
             "project_domain_name": "Default"
         },
 EOF
-fi
 
 # Now add osprofiler config if necessary
 if [[ ! -z "$OSPROFILER_HMAC_KEYS" ]]; then