diff --git a/.kitchen.yml b/.kitchen.yml
index f0ee928..2daaf44 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -52,7 +52,7 @@
 
 suites:
 <% for os_version in ['ocata','pike','queens','rocky'] %>
-  - name: server_cluster
+  - name: server_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         heat.sls: tests/pillar/server_cluster.sls
@@ -63,7 +63,7 @@
             server:
               version: <%=os_version%>
 
-  - name: server_plugin_dirs
+  - name: server_plugin_dirs_<%=os_version%>
     provisioner:
       pillars-from-files:
         heat.sls: tests/pillar/server_plugin_dirs.sls
@@ -74,7 +74,7 @@
             server:
               version: <%=os_version%>
 
-  - name: server_single
+  - name: server_single_<%=os_version%>
     provisioner:
       pillars-from-files:
         heat.sls: tests/pillar/server_single.sls
diff --git a/heat/files/rocky/heat.conf.Debian b/heat/files/rocky/heat.conf.Debian
index 3e40566..5016e1f 100644
--- a/heat/files/rocky/heat.conf.Debian
+++ b/heat/files/rocky/heat.conf.Debian
@@ -230,7 +230,7 @@
 {%- if server.stack_domain_admin is defined %}
 # Keystone domain name which contains heat template-defined users. If
 # `stack_user_domain_id` option is set, this option is ignored. (string value)
-stack_user_domain_name = {{ server.stack_domain_admin.get('domain', 'heat') }}
+stack_user_domain_name = {{ server.stack_domain_admin.get('stack_user_domain_name', 'heat_user_domain') }}
 
 # Keystone username, a user with roles sufficient to manage users and projects
 # in the stack_user_domain. (string value)