diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 2a36856..9127301 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -321,7 +321,7 @@
       docker_ee_release: { get_param: docker_ee_release }
       docker_ucp_image: { get_param: docker_ucp_image}
       node_type: "ucp"
-      key_name: { get_param: "OS::stack_name" }
+      key_name: { get_attr: [keypair_name, value] }
       image: { get_param: image }
       flavor: { get_param: ucp_flavor }
       accessible_network: { get_attr: [accessible_network, public_network] }
@@ -346,7 +346,7 @@
         properties:
           metadata: { get_param: master_metadata}
           node_type: "master"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: masters_flavor }
           docker_ee_url: { get_param: docker_ee_url }
@@ -375,10 +375,9 @@
         properties:
           metadata: { get_param: worker_metadata}
           node_type: "worker"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: workers_flavor }
-          key_name: { get_param: "OS::stack_name" }
           docker_ee_url: { get_param: docker_ee_url }
           docker_ee_release: { get_param: docker_ee_release }
           docker_ucp_image: { get_param: docker_ucp_image}
@@ -421,7 +420,7 @@
         properties:
           metadata: { get_param: cmp_metadata }
           node_type: "worker"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: cmps_flavor }
           docker_ee_url: { get_param: docker_ee_url }
@@ -466,7 +465,7 @@
         properties:
           metadata: { get_param: acmp_metadata }
           node_type: "worker"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: acmps_flavor }
           docker_ee_url: { get_param: docker_ee_url }
@@ -512,7 +511,7 @@
         properties:
           metadata: { get_param: gtw_metadata }
           node_type: "worker"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: gtws_flavor }
           docker_ee_url: { get_param: docker_ee_url }
@@ -550,7 +549,7 @@
         properties:
           metadata: { get_param: lma_metadata }
           node_type: "worker"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: lmas_flavor }
           docker_ee_url: { get_param: docker_ee_url }
@@ -588,7 +587,7 @@
         properties:
           metadata: { get_param: osd_metadata }
           node_type: "worker"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: osds_flavor }
           docker_ee_url: { get_param: docker_ee_url }
@@ -633,7 +632,7 @@
         properties:
           metadata: { get_param: spare_metadata }
           node_type: "spare"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: spares_flavor }
           docker_ee_url: { get_param: docker_ee_url }
@@ -678,7 +677,7 @@
         properties:
           metadata: { get_param: ntw_metadata }
           node_type: "worker"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: ntws_flavor }
           docker_ee_url: { get_param: docker_ee_url }
@@ -716,7 +715,7 @@
         properties:
           metadata: { get_param: vbmc_metadata}
           node_type: "worker"
-          key_name: { get_param: "OS::stack_name" }
+          key_name: { get_attr: [keypair_name, value] }
           image: { get_param: image }
           flavor: { get_param: vbmcs_flavor }
           docker_ee_url: { get_param: docker_ee_url }