diff --git a/otc_metadata/data/documents/testservice-umn.yaml b/otc_metadata/data/documents/testservice-umn.yaml
new file mode 100644
index 0000000..f9171a4
--- /dev/null
+++ b/otc_metadata/data/documents/testservice-umn.yaml
@@ -0,0 +1,13 @@
+---
+hc_location: usermanual/testservice
+html_location: docs/testservice/umn
+link: /testservice/umn/
+rst_location: umn/source
+service_type: testservice
+title: User Guide
+type: umn
+cloud_environments:
+  - name: eu_de
+    visibility: public
+    pdf_visibility: public
+    pdf_enabled: true
diff --git a/otc_metadata/data/repositories/testservice.yaml b/otc_metadata/data/repositories/testservice.yaml
new file mode 100644
index 0000000..1da807d
--- /dev/null
+++ b/otc_metadata/data/repositories/testservice.yaml
@@ -0,0 +1,13 @@
+---
+service_type: testservice
+repositories:
+  - environment: public
+    repo: opentelekomcloud-docs/testservice
+    type: github
+    cloud_environments:
+      - eu_de
+  - environment: internal
+    repo: docs/testservice
+    type: gitea
+    cloud_environments:
+      - eu_de
diff --git a/otc_metadata/data/services/testservice.yaml b/otc_metadata/data/services/testservice.yaml
new file mode 100644
index 0000000..3a3e14b
--- /dev/null
+++ b/otc_metadata/data/services/testservice.yaml
@@ -0,0 +1,12 @@
+---
+environment: public
+is_global: false
+service_category: security-services
+service_title: Test Service
+service_type: testservice
+service_uri: testservice
+cloud_environments:
+  - name: eu_de
+teams:
+  - name: docs-security-services-rw
+    permission: write
diff --git a/otc_metadata/services.py b/otc_metadata/services.py
index c2ad881..71f1002 100644
--- a/otc_metadata/services.py
+++ b/otc_metadata/services.py
@@ -350,9 +350,11 @@ class Services(object):
         res = dict()
         res = {}
         services = self.all_services
+        print(services)
         for service in services:
             if service["service_type"] == service_type:
                 res = service
+                print(res)
                 for repositories in self.all_repositories:
                     if repositories["service_type"] == service["service_type"]:
                         res["repositories"] = repositories["repositories"]
diff --git a/tools/bootstrap_repositories.py b/tools/bootstrap_repositories.py
index 992ee40..46b0880 100644
--- a/tools/bootstrap_repositories.py
+++ b/tools/bootstrap_repositories.py
@@ -149,13 +149,15 @@ def main():
 
     args = parser.parse_args()
     logging.basicConfig(level=logging.DEBUG)
-    services = []
+
     if args.service_type:
         services = [data.get_service_with_repo_by_service_type(service_type=args.service_type)]
     else:
         services = data.services_with_repos()
 
+    print(services)
     for service in services:
+        print(service)
         process_repositories(args, service)
 
 
diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py
index 2bd5d8f..ce2e764 100644
--- a/tools/generate_doc_confpy.py
+++ b/tools/generate_doc_confpy.py
@@ -461,10 +461,11 @@ def main():
             + " without updating service-based-view"
         )
         exit(1)
+
     if args.service_type:
-        services = [data.service_dict.get(args.service_type)]
+        services = [data.get_service_with_repo_by_service_type(service_type=args.service_type)]
     else:
-        services = data.all_services
+        services = data.services_with_repos()
 
     if args.token:
         api_session.headers.update({"Authorization": f"token {args.token}"})