diff --git "a/\173\043 roles \043\175/openstack_database" "b/\173\043 roles \043\175/openstack_database"
index 3c3c87f..6380651 100644
--- "a/\173\043 roles \043\175/openstack_database"
+++ "b/\173\043 roles \043\175/openstack_database"
@@ -6,8 +6,9 @@
         <reclass_storage_node_name>:
           classes:
 #}
-          - cluster.${_param:cluster_name}.openstack.database
           - service.galera.slave.cluster
+          - cluster.${_param:cluster_name}.openstack.database
+          - cluster.${_param:cluster_name}.openstack.database.slave
 {{- set_param('keepalived_vip_interface', 'br_ctl') }}
 {{- register_metaparam('mysql_cluster_role', 'openstack_database') }}
 {{- register_metaparam('keepalived_vip_priority', 'openstack_database') }}
diff --git "a/\173\043 roles \043\175/openstack_database_leader" "b/\173\043 roles \043\175/openstack_database_leader"
index b196729..69a0c17 100644
--- "a/\173\043 roles \043\175/openstack_database_leader"
+++ "b/\173\043 roles \043\175/openstack_database_leader"
@@ -6,9 +6,9 @@
         <reclass_storage_node_name>:
           classes:
 #}
-          - cluster.${_param:cluster_name}.openstack.database
-          - cluster.${_param:cluster_name}.openstack.database_init
           - service.galera.master.cluster
+          - cluster.${_param:cluster_name}.openstack.database
+          - cluster.${_param:cluster_name}.openstack.database.master
 {{- set_param('keepalived_vip_interface', 'br_ctl') }}
 {{- register_metaparam('mysql_cluster_role', 'openstack_database') }}
 {{- register_metaparam('keepalived_vip_priority', 'openstack_database') }}