diff --git a/roles/openstacksdk/meta/main.yml b/roles/openstacksdk/meta/main.yml
index d07cd0c..b328fac 100644
--- a/roles/openstacksdk/meta/main.yml
+++ b/roles/openstacksdk/meta/main.yml
@@ -22,8 +22,3 @@
     - name: Ubuntu
       versions:
         - focal
-
-dependencies:
-  - role: defaults
-  - role: openstack_helm_endpoints
-    openstack_helm_endpoints_list: ["identity"]
diff --git a/roles/openstacksdk/templates/clouds.yaml.j2 b/roles/openstacksdk/templates/clouds.yaml.j2
index 19c3fcd..b855a63 100644
--- a/roles/openstacksdk/templates/clouds.yaml.j2
+++ b/roles/openstacksdk/templates/clouds.yaml.j2
@@ -1,13 +1,13 @@
 clouds:
   atmosphere:
     auth:
-      auth_url: "https://{{ openstack_helm_endpoints['identity']['host_fqdn_override']['public']['host'] }}"
-      username: "{{ openstack_helm_endpoints['identity']['auth']['admin']['username'] }}"
-      password: "{{ openstack_helm_endpoints['identity']['auth']['admin']['password'] }}"
+      auth_url: "https://{{ openstack_helm_endpoints_keystone_api_host }}"
+      username: "admin-{{ openstack_helm_endpoints_region_name }}"
+      password: "{{ openstack_helm_endpoints_keystone_admin_password }}"
       project_name: admin
       user_domain_name: Default
       project_domain_name: Default
-    region_name: "{{ openstack_helm_endpoints['identity']['auth']['admin']['region_name'] }}"
+    region_name: "{{ openstack_helm_endpoints_keystone_region_name }}"
 {% if cluster_issuer_type is defined and cluster_issuer_type in ('self-signed', 'ca') %}
     cacert: /usr/local/share/ca-certificates/atmosphere.crt
 {% endif %}