diff --git a/metadata.yaml b/metadata.yaml
index 4674fa96..58239a1c 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,41 +1,5 @@
 # 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
-          disable_import: false
-      teams:
-        - name: eco
-          permission: write
-      repository: docs/api-usage
-    - service_title: Blueprints
-      service_type: blueprints
-      service_category: other
-      service_environment: internal
-      docs: []
-      teams:
-        - name: eco
-          permission: write
-      repository: docs/blueprints
-    - service_title: Marketplace
-      service_type: mkp
-      service_category: other
-      service_environment: internal
-      docs: []
-      teams:
-        - name: docs-3rd-party-integration-rw
-          permission: write
-      repository: docs/marketplace
   security-services:
     - service_title: Anti-DDoS
       service_type: antiddos
@@ -92,6 +56,14 @@ 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
+          hc_location: api/dbss
+          disable_import: false
         - html_location: docs/dbss/umn
           rst_location: umn/source
           title: User Guide
@@ -104,6 +76,31 @@ categories:
         - name: docs-security-services-rw
           permission: write
       repository: docs/database-security-service
+    - service_title: Enterprise Project Service
+      service_type: eps
+      service_category: security-services
+      service_environment: internal
+      docs:
+        - html_location: docs/eps/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          link: /enterprise-project-service/api-ref/
+          pdf_name: eps-api-ref
+          hc_location: api/em
+          disable_import: false
+        - html_location: docs/eps/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          link: /enterprise-project-service/umn/
+          pdf_name: eps-umn
+          hc_location: usermanual/em
+          disable_import: false
+      teams:
+        - name: docs-security-services-rw
+          permission: write
+      repository: docs/enterprise-project-service
     - service_title: Host Security Service
       service_type: hss
       service_category: security-services
@@ -260,7 +257,7 @@ categories:
           hc_location: usermanual/aom2
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-paas-rw
           permission: write
       repository: docs/application-operations-management-2
     - service_title: Application Operations Management
@@ -285,34 +282,9 @@ categories:
           hc_location: usermanual/aom
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-paas-rw
           permission: write
       repository: docs/application-operations-management
-    - service_title: Application Performance Management
-      service_type: apm
-      service_category: application
-      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
-          disable_import: false
-        - 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
-          disable_import: false
-      teams:
-        - name: docs-orchestration-rw
-          permission: write
-      repository: docs/application-performance-management
     - service_title: API Gateway (APIG)
       service_type: apig
       service_category: application
@@ -343,9 +315,34 @@ categories:
           hc_location: usermanual/apig
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-paas-rw
           permission: write
       repository: docs/api-gateway
+    - service_title: Application Performance Management
+      service_type: apm
+      service_category: application
+      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
+          disable_import: false
+        - 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
+          disable_import: false
+      teams:
+        - name: docs-paas-rw
+          permission: write
+      repository: docs/application-performance-management
     - service_title: Cloud Service Engine
       service_type: cse
       service_category: application
@@ -368,7 +365,7 @@ categories:
           hc_location: usermanual/cse
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-paas-rw
           permission: write
       repository: docs/cloud-service-engine
     - service_title: Distributed Message Service
@@ -401,7 +398,7 @@ categories:
           hc_location: usermanual/dms
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-paas-rw
           permission: write
       repository: docs/distributed-message-service
     - service_title: Resource Formation Service
@@ -426,7 +423,7 @@ categories:
           hc_location: usermanual/aos
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-cms-rw
           permission: write
       repository: docs/resource-formation-service
     - service_title: Simple Message Notification
@@ -451,159 +448,36 @@ categories:
           hc_location: usermanual/smn
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-cms-rw
           permission: write
       repository: docs/simple-message-notification
-  md:
-    - service_title: Cloud Eye
-      service_type: ces
-      service_category: md
+  other:
+    - service_title: API Usage
+      service_type: apiu
+      service_category: other
       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
-          disable_import: false
-        - 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
+        - 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
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: eco
           permission: write
-      repository: docs/cloud-eye
-    - service_title: Config
-      service_type: config
-      service_category: md
+      repository: docs/api-usage
+    - service_title: Marketplace
+      service_type: mkp
+      service_category: other
       service_environment: internal
-      docs:
-        - html_location: docs/config/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          link: /config/api-ref/
-          pdf_name: config-api-ref
-          hc_location: api/rms
-          disable_import: false
-        - html_location: docs/config/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          link: /config/umn/
-          hc_location: usermanual/rms
-          disable_import: false
+      docs: []
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-3rd-party-integration-rw
           permission: write
-      repository: docs/config
-    - 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
-          disable_import: false
-        - 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
-          disable_import: false
-      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
-          disable_import: false
-        - 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
-          disable_import: false
-      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
-          disable_import: false
-        - 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
-          disable_import: false
-      teams:
-        - name: docs-orchestration-rw
-          permission: write
-      repository: docs/resource-management-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
-          disable_import: false
-        - 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
-          disable_import: false
-      teams:
-        - name: docs-orchestration-rw
-          permission: write
-      repository: docs/tag-management-service
+      repository: docs/marketplace
   compute:
     - service_title: Auto Scaling
       service_type: as
@@ -767,7 +641,7 @@ categories:
           hc_location: usermanual/functiongraph
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-paas-rw
           permission: write
       repository: docs/function-graph
     - service_title: Image Management Service
@@ -1119,6 +993,131 @@ categories:
         - name: docs-storage-rw
           permission: write
       repository: docs/volume-backup-service
+  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
+          disable_import: false
+        - 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
+          disable_import: false
+      teams:
+        - name: docs-cms-rw
+          permission: write
+      repository: docs/cloud-eye
+    - service_title: Config
+      service_type: config
+      service_category: md
+      service_environment: internal
+      docs:
+        - html_location: docs/config/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          link: /config/api-ref/
+          pdf_name: config-api-ref
+          hc_location: api/rms
+          disable_import: false
+        - html_location: docs/config/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          link: /config/umn/
+          hc_location: usermanual/rms
+          disable_import: false
+      teams:
+        - name: docs-cms-rw
+          permission: write
+      repository: docs/config
+    - 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
+          disable_import: false
+        - 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
+          disable_import: false
+      teams:
+        - name: docs-paas-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
+          disable_import: false
+        - 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
+          disable_import: false
+      teams:
+        - name: docs-paas-rw
+          permission: write
+      repository: docs/log-tank-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
+          disable_import: false
+        - 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
+          disable_import: false
+      teams:
+        - name: docs-cms-rw
+          permission: write
+      repository: docs/tag-management-service
   big_data:
     - service_title: Cloud Search Service
       service_type: css
@@ -1649,7 +1648,7 @@ categories:
           hc_location: usermanual/dcs
           disable_import: false
       teams:
-        - name: docs-orchestration-rw
+        - name: docs-paas-rw
           permission: write
       repository: docs/distributed-cache-service
     - service_title: Distributed Database Middleware
diff --git a/zuul.yaml b/zuul.yaml
index 3febda50..72defc0b 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -159,7 +159,6 @@
       - docs/lts
       - docs/rts
       - docs/tms
-      - docs/rms
       - roles
       - templates
       - metadata.yaml
@@ -192,6 +191,7 @@
       - docs/antiddos
       - docs/cfw
       - docs/dbss
+      - docs/eps
       - docs/hss
       - docs/iam
       - docs/kms