diff --git a/tuskar/manager/plan.py b/tuskar/manager/plan.py
index 4f131a9a..0ee1f9c3 100644
--- a/tuskar/manager/plan.py
+++ b/tuskar/manager/plan.py
@@ -189,7 +189,7 @@ class PlansManager(object):
             template_seed.update_role_resource_references(
                 deployment_plan.master_template,
                 seed_role,
-                plan.generate_group_id(role_namespace))
+                db_role.name)
 
             template_seed.update_role_property_references(
                 deployment_plan.master_template,
diff --git a/tuskar/tests/manager/test_plan.py b/tuskar/tests/manager/test_plan.py
index 537bd395..9cce607c 100644
--- a/tuskar/tests/manager/test_plan.py
+++ b/tuskar/tests/manager/test_plan.py
@@ -210,7 +210,7 @@ class PlansManagerTestCase(TestCase):
         self.assertIsNot(config_property, None)
         self.assertEqual(config_property.value,
                          {'ip_addresses':
-                          {'get_attr': ['r1-1-servers', 'foo_ip']}})
+                          {'get_attr': ['r1', 'foo_ip']}})
 
         # verify both entries are present from RESOURCE_REGISTRY
         parsed_env = parser.parse_environment(