diff --git a/metadata.yaml b/metadata.yaml
index 5002bc75..55128e17 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -29,12 +29,6 @@ categories:
       service_category: security-services
       service_environment: internal
       docs:
-        - html_location: docs/dbss/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          link: /database-security-service/api-ref/
-          pdf_name: dbss-api-ref
         - html_location: docs/dbss/umn
           rst_location: umn/source
           title: User Guide
@@ -484,6 +478,168 @@ categories:
         - name: docs-bigdata-ai-rw
           permission: write
       repository: docs/mapreduce-service
+  md:
+    - service_title: Application Performance Management
+      service_type: apm
+      service_category: md
+      service_environment: internal
+      docs:
+        - html_location: docs/apm/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          link: /application-performance-management/api-ref/
+          pdf_name: apm-api-ref
+          hc_location: api/apm
+        - html_location: docs/apm/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          link: /application-performance-management/umn/
+          pdf_name: apm-umn
+          hc_location: usermanual/apm
+      teams:
+        - name: docs-orchestration-rw
+          permission: write
+      repository: docs/application-performance-management
+    - service_title: Cloud Eye
+      service_type: ces
+      service_category: md
+      service_environment: internal
+      docs:
+        - html_location: docs/ces/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          link: /cloud-eye/api-ref/
+          pdf_name: ces-api-ref
+          hc_location: api/ces
+        - html_location: docs/ces/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          link: /cloud-eye/umn/
+          pdf_name: ces-umn
+          hc_location: usermanual/ces
+      teams:
+        - name: docs-orchestration-rw
+          permission: write
+      repository: docs/cloud-eye
+    - service_title: Cloud Trace Service
+      service_type: cts
+      service_category: md
+      service_environment: internal
+      docs:
+        - html_location: docs/cts/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          link: /cloud-trace-service/api-ref/
+          pdf_name: cts-api-ref
+          hc_location: api/cts
+        - html_location: docs/cts/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          link: /cloud-trace-service/umn/
+          pdf_name: cts-umn
+          hc_location: usermanual/cts
+      teams:
+        - name: docs-orchestration-rw
+          permission: write
+      repository: docs/cloud-trace-service
+    - service_title: Log Tank Service
+      service_type: lts
+      service_category: md
+      service_environment: internal
+      docs:
+        - html_location: docs/lts/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          link: /log-tank-service/api-ref/
+          pdf_name: lts-api-ref
+          hc_location: api/lts
+        - html_location: docs/lts/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          link: /log-tank-service/umn/
+          pdf_name: lts-umn
+          hc_location: usermanual/lts
+      teams:
+        - name: docs-orchestration-rw
+          permission: write
+      repository: docs/log-tank-service
+    - service_title: Resource Management Service
+      service_type: rms
+      service_category: md
+      service_environment: internal
+      docs:
+        - html_location: docs/rms/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          link: /resource-management-service/api-ref/
+          pdf_name: rms-api-ref
+          hc_location: api/rms
+        - html_location: docs/rms/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          link: /resource-management-service/umn/
+          pdf_name: rms-umn
+          hc_location: usermanual/rms
+      teams:
+        - 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
+      service_environment: internal
+      docs:
+        - html_location: docs/tms/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          link: /tag-management-service/api-ref/
+          pdf_name: tms-api-ref
+          hc_location: api/tms
+        - html_location: docs/tms/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          link: /tag-management-service/umn/
+          pdf_name: tms-umn
+          hc_location: usermanual/tms
+      teams:
+        - name: docs-orchestration-rw
+          permission: write
+      repository: docs/tag-management-service
   compute:
     - service_title: Auto Scaling
       service_type: as
@@ -944,145 +1100,6 @@ categories:
         - name: docs-container-rw
           permission: write
       repository: docs/software-repository-container
-  md:
-    - service_title: Cloud Eye
-      service_type: ces
-      service_category: md
-      service_environment: internal
-      docs:
-        - html_location: docs/ces/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          link: /cloud-eye/api-ref/
-          pdf_name: ces-api-ref
-          hc_location: api/ces
-        - html_location: docs/ces/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /cloud-eye/umn/
-          pdf_name: ces-umn
-          hc_location: usermanual/ces
-      teams:
-        - name: docs-orchestration-rw
-          permission: write
-      repository: docs/cloud-eye
-    - service_title: Cloud Trace Service
-      service_type: cts
-      service_category: md
-      service_environment: internal
-      docs:
-        - html_location: docs/cts/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          link: /cloud-trace-service/api-ref/
-          pdf_name: cts-api-ref
-          hc_location: api/cts
-        - html_location: docs/cts/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /cloud-trace-service/umn/
-          pdf_name: cts-umn
-          hc_location: usermanual/cts
-      teams:
-        - name: docs-orchestration-rw
-          permission: write
-      repository: docs/cloud-trace-service
-    - service_title: Log Tank Service
-      service_type: lts
-      service_category: md
-      service_environment: internal
-      docs:
-        - html_location: docs/lts/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          link: /log-tank-service/api-ref/
-          pdf_name: lts-api-ref
-          hc_location: api/lts
-        - html_location: docs/lts/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /log-tank-service/umn/
-          pdf_name: lts-umn
-          hc_location: usermanual/lts
-      teams:
-        - name: docs-orchestration-rw
-          permission: write
-      repository: docs/log-tank-service
-    - service_title: Resource Management Service
-      service_type: rms
-      service_category: md
-      service_environment: internal
-      docs:
-        - html_location: docs/rms/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          link: /resource-management-service/api-ref/
-          pdf_name: rms-api-ref
-          hc_location: api/rms
-        - html_location: docs/rms/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /resource-management-service/umn/
-          pdf_name: rms-umn
-          hc_location: usermanual/rms
-      teams:
-        - 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
-      service_environment: internal
-      docs:
-        - html_location: docs/tms/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          link: /tag-management-service/api-ref/
-          pdf_name: tms-api-ref
-          hc_location: api/tms
-        - html_location: docs/tms/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /tag-management-service/umn/
-          pdf_name: tms-umn
-          hc_location: usermanual/tms
-      teams:
-        - name: docs-orchestration-rw
-          permission: write
-      repository: docs/tag-management-service
   network:
     - service_title: Direct Connect
       service_type: dc