diff --git a/metadata.yaml b/metadata.yaml
index 2df1c803..5dd4c12e 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,5 +1,38 @@
 # Auto-generated by otc_metadata.generate_docexports.data
 categories:
+  other:
+    - service_title: API Usage
+      service_type: apiu
+      service_category: other
+      service_environment: internal
+      docs:
+        - html_location: docs/apiu/guidelines
+          rst_location: doc/guidelines/source
+          title: API Usage Guidelines
+          type: guidelines
+          link: /api-usage/guidelines/
+          pdf_name: apiu-guidelines
+          hc_location: api-usage/guidelines
+      teams:
+        - name: eco
+          permission: write
+      repository: docs/api-usage
+    - service_title: Blueprints
+      service_type: blueprints
+      service_category: other
+      service_environment: internal
+      docs:
+        - html_location: docs/blueprints/best-practice
+          rst_location: doc/best-practice/source
+          title: Best Practice
+          type: best-practice
+          link: /blueprints/best-practice/
+          pdf_name: blueprints-best-practice
+          hc_location: bestpractice/blueprints
+      teams:
+        - name: eco
+          permission: write
+      repository: docs/blueprints
   security-services:
     - service_title: Anti DDoS
       service_type: antiddos
@@ -196,6 +229,13 @@ categories:
           link: /application-operations-management/umn/
           pdf_name: aom-umn
           hc_location: usermanual/aom
+        - html_location: docs/aom/umn2
+          rst_location: umn2/source
+          title: User Guide 2.0
+          type: umn2
+          link: /application-operations-management/umn2/
+          pdf_name: aom-umn2.0
+          hc_location: usermanual2/aom
       teams:
         - name: docs-orchestration-rw
           permission: write
@@ -308,83 +348,6 @@ categories:
         - name: docs-orchestration-rw
           permission: write
       repository: docs/simple-message-notification
-  other:
-    - service_title: API Usage
-      service_type: apiu
-      service_category: other
-      service_environment: internal
-      docs:
-        - html_location: docs/apiu/guidelines
-          rst_location: doc/guidelines/source
-          title: API Usage Guidelines
-          type: guidelines
-          link: /api-usage/guidelines/
-          pdf_name: apiu-guidelines
-          hc_location: api-usage/guidelines
-      teams:
-        - name: eco
-          permission: write
-      repository: docs/api-usage
-    - service_title: Blueprints
-      service_type: blueprints
-      service_category: other
-      service_environment: internal
-      docs:
-        - html_location: docs/blueprints/best-practice
-          rst_location: doc/best-practice/source
-          title: Best Practice
-          type: best-practice
-          link: /blueprints/best-practice/
-          pdf_name: blueprints-best-practice
-          hc_location: bestpractice/blueprints
-      teams:
-        - name: eco
-          permission: write
-      repository: docs/blueprints
-    - service_title: Cloud Topology Designer
-      service_type: ctd
-      service_category: other
-      service_environment: internal
-      docs:
-        - html_location: docs/ctd/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /cloud-topology-designer/umn/
-          pdf_name: ctd-umn
-      teams:
-        - name: topology-designer-rw
-          permission: write
-    - service_title: Status Dashboard
-      service_type: sd
-      service_category: other
-      service_environment: internal
-      docs:
-        - html_location: docs/sd/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /status-dashboard/umn/
-          pdf_name: sd-umn
-          hc_location: usermanual/sd
-      teams:
-        - name: docs-eco-rw
-          permission: write
-      repository: docs/status-dashboard
-    - service_title: Telekom Cloud Create
-      service_type: tcc
-      service_category: other
-      service_environment: internal
-      docs:
-        - html_location: docs/tcc/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /telekom-cloud-create/umn/
-          pdf_name: tcc-umn
-      teams:
-        - name: topology-designer-rw
-          permission: write
   md:
     - service_title: Application Performance Management
       service_type: apm
@@ -409,6 +372,26 @@ categories:
         - name: docs-orchestration-rw
           permission: write
       repository: docs/application-performance-management
+    - service_title: Cloud Create
+      service_type: cc
+      service_category: md
+      service_environment: internal
+      docs:
+        - html_location: docs/cc/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          link: /cloud-create/api-ref/
+          pdf_name: cc-api-ref
+        - html_location: docs/cc/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          link: /cloud-create/umn/
+          pdf_name: cc-umn
+      teams:
+        - name: topology-designer-rw
+          permission: write
     - service_title: Cloud Eye
       service_type: ces
       service_category: md
@@ -501,29 +484,6 @@ categories:
         - name: docs-orchestration-rw
           permission: write
       repository: docs/resource-management-service
-    - service_title: Resource Template Service
-      service_type: rts
-      service_category: md
-      service_environment: internal
-      docs:
-        - html_location: docs/rts/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          link: /resource-template-service/api-ref/
-          pdf_name: rts-api-ref
-          hc_location: api/rts
-        - html_location: docs/rts/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /resource-template-service/umn/
-          pdf_name: rts-umn
-          hc_location: usermanual/rts
-      teams:
-        - name: docs-orchestration-rw
-          permission: write
-      repository: docs/resource-template-service
     - service_title: Tag Management Service
       service_type: tms
       service_category: md
@@ -716,7 +676,7 @@ categories:
           pdf_name: fg-umn
           hc_location: usermanual/functiongraph
       teams:
-        - name: docs-compute-rw
+        - name: docs-container-rw
           permission: write
       repository: docs/function-graph
     - service_title: Image Management Service