diff --git a/otc_metadata/services.py b/otc_metadata/services.py
index 507a020..39d1502 100644
--- a/otc_metadata/services.py
+++ b/otc_metadata/services.py
@@ -106,6 +106,9 @@ class Services(object):
                 if "environment" in srv and srv["environment"] != environment:
                     continue
             if srv["service_category"] == category:
+                for repositories in self.all_repositories:
+                    if repositories["service_type"] == srv["service_type"]:
+                        srv["repositories"] = repositories["repositories"]
                 res.append(copy.deepcopy(srv))
         return res
 
@@ -128,10 +131,12 @@ class Services(object):
                 continue
             res.setdefault(cat, service)
             res_doc = copy.deepcopy(doc)
-            res_doc.update(**service)
             if environment:
                 if "environment" in doc and doc["environment"] != environment:
                     continue
+            for repositories in self.all_repositories:
+                if repositories["service_type"] == service["service_type"]:
+                    res["repositories"] = repositories["repositories"]
             res[cat].setdefault("docs", [])
             res[cat]["docs"].append(res_doc)
         return res