diff --git a/orm/services/customer_manager/cms_rest/app.py b/orm/services/customer_manager/cms_rest/app.py
index b0b3b1df..ebd00285 100755
--- a/orm/services/customer_manager/cms_rest/app.py
+++ b/orm/services/customer_manager/cms_rest/app.py
@@ -42,3 +42,6 @@ def main(argv=None):
     path, filename = os.path.split(path_and_file)
     runner = CommandRunner()
     runner.run(['serve', path + '/config.py'])
+
+if __name__ == "__main__":
+    main()
diff --git a/orm/services/resource_distributor/rds/services/helpers.py b/orm/services/resource_distributor/rds/services/helpers.py
new file mode 100644
index 00000000..65d34a1e
--- /dev/null
+++ b/orm/services/resource_distributor/rds/services/helpers.py
@@ -0,0 +1,25 @@
+import re
+import yaml
+
+
+def create_final_yaml(title, description, resources, outputs):
+    """put all yaml strings together.
+
+    :param title: ther version of yaml
+    :param description: file description
+    :param resources: body of the yaml file
+    :param outputs: the output of the yaml
+    :return: the full string of yaml file
+    """
+    title_yaml = re.sub("'", "", yaml.dump(title, default_flow_style=False)).strip()
+    description_yaml = yaml.dump(description, default_flow_style=False).strip()
+    resources_yaml = re.sub(r"'{,2}", '',
+                            yaml.dump(resources, default_flow_style=False)).strip()
+    outputs_yaml = yaml.dump(outputs).strip()
+
+    return '\n\n'.join([
+        title_yaml,
+        description_yaml,
+        resources_yaml,
+        outputs_yaml
+    ])
diff --git a/orm/services/resource_distributor/rds/services/yaml_customer_builder.py b/orm/services/resource_distributor/rds/services/yaml_customer_builder.py
index e99dd077..c838464e 100755
--- a/orm/services/resource_distributor/rds/services/yaml_customer_builder.py
+++ b/orm/services/resource_distributor/rds/services/yaml_customer_builder.py
@@ -1,8 +1,7 @@
 """yaml build build yaml from json input."""
 import logging
-import re
-import yaml
 
+from orm.services.resource_distributor.rds.services.helpers import create_final_yaml
 from pecan import conf
 
 logger = logging.getLogger(__name__)
@@ -20,27 +19,6 @@ def get_users_quotas(data, region):
     return users, quotas
 
 
-def create_final_yaml(title, description, resources, outputs):
-    """put all yaml strings together.
-
-    :param title: ther version of yaml
-    :param description: file description
-    :param resources: body of the yaml file
-    :param outputs: the output of the yaml
-    :return: the full string of yaml file
-    """
-    title_yaml = re.sub("'", "", yaml.dump(title, default_flow_style=False))
-    description_yaml = yaml.dump(description, default_flow_style=False)
-    resourcesyaml = re.sub("''", '', yaml.dump(resources,
-                                               default_flow_style=False))
-    resources_yaml = re.sub("'", '', resourcesyaml)
-    yamldata = title_yaml
-    yamldata = yamldata + "\n" + description_yaml
-    yamldata = yamldata + "\n" + resources_yaml
-    yamldata = yamldata + "\n" + yaml.dump(outputs)
-    return yamldata
-
-
 def _metadata_to_tags(metadata):
 
     return '[' + ','.join(
diff --git a/orm/services/resource_distributor/rds/services/yaml_group_builder.py b/orm/services/resource_distributor/rds/services/yaml_group_builder.py
index d4dcb23f..290b9334 100755
--- a/orm/services/resource_distributor/rds/services/yaml_group_builder.py
+++ b/orm/services/resource_distributor/rds/services/yaml_group_builder.py
@@ -1,34 +1,12 @@
 """yaml build build yaml from json input."""
 import logging
-import re
-import yaml
-
+from orm.services.resource_distributor.rds.services.helpers import create_final_yaml
 from pecan import conf
+from pprint import pformat
 
 logger = logging.getLogger(__name__)
 
 
-def create_final_yaml(title, description, resources, outputs):
-    """put all yaml strings together.
-
-    :param title: ther version of yaml
-    :param description: file description
-    :param resources: body of the yaml file
-    :param outputs: the output of the yaml
-    :return: the full string of yaml file
-    """
-    title_yaml = re.sub("'", "", yaml.dump(title, default_flow_style=False))
-    description_yaml = yaml.dump(description, default_flow_style=False)
-    resourcesyaml = re.sub("''", '', yaml.dump(resources,
-                                               default_flow_style=False))
-    resources_yaml = re.sub("'", '', resourcesyaml)
-    yamldata = title_yaml
-    yamldata = yamldata + "\n" + description_yaml
-    yamldata = yamldata + "\n" + resources_yaml
-    yamldata = yamldata + "\n" + yaml.dump(outputs)
-    return yamldata
-
-
 def yamlbuilder(alldata, region):
     logger.info("building group yaml")
     logger.debug("start building group yaml for region %s" % region['name'])
@@ -39,31 +17,71 @@ def yamlbuilder(alldata, region):
     :param region: data per region
     :return: the full string of yaml file
     """
+    logger.info("group alldata {} for region {}".format(pformat(alldata), region))
+
     outputs = {}
     resources = {}
     yaml_version = conf.yaml_configs.group_yaml.yaml_version
     title = {'heat_template_version': yaml_version}
     description = {'description': 'yaml file for region - %s' % region['name']}
     jsondata = alldata
-    group_name = jsondata['name']
-    group_description = '"%s"' % (jsondata['description'])
     status = {"0": False, "1": True}[str(jsondata['enabled'])]
-    outputs['outputs'] = {}
-    resources['resources'] = {}
 
-    resources['resources'][group_name] =\
-        {'type': 'OS::Keystone::Group\n',
-         'properties': {'name': "%s" % group_name,
-                        'description': group_description,
-                        'domain': alldata['domain_name'],
-                        'roles': []}}
-
-    # create the output
-    outputs['outputs'][group_name] =\
-        {"value": {"get_resource": "%s" % group_name}}
+    if "roles" in alldata:
+        outputs['outputs'], resources['resources'] = build_group_roles_yaml(jsondata)
+    else:
+        outputs['outputs'], resources['resources'] = build_group_yaml(jsondata)
 
     # putting all parts together for full yaml
     yamldata = create_final_yaml(title, description, resources, outputs)
     logger.debug(
         "done building group yaml for region %s " % region['name'])
+
     return yamldata
+
+
+def build_group_yaml(jsondata):
+    resources = {}
+    outputs = {}
+    group_name = jsondata['name']
+
+    resources[group_name] = {
+        'type': 'OS::Keystone::Group\n',
+        'properties': {
+            'name': "%s" % group_name,
+            'description': jsondata['description'],
+            'domain': jsondata['domain_name'],
+            'roles': []
+        }
+    }
+
+    outputs[group_name] = {
+        "value": {
+            "get_resource": "%s" % group_name
+        }
+    }
+
+    return outputs, resources
+
+
+def build_group_roles_yaml(jsondata):
+    resources = {}
+    outputs = {}
+    group_name = jsondata['name']
+    template_name = "{}-Role-Assignment".format(group_name)
+
+    resources[template_name] = {
+        'type': 'OS::Keystone::GroupRoleAssignment\n',
+        'properties': {
+            'group': "%s" % group_name,
+            'roles': jsondata['roles']
+        }
+    }
+
+    outputs[template_name] = {
+        "value": {
+            "get_resource": "%s" % template_name
+        }
+    }
+
+    return outputs, resources