diff --git a/metadata.yaml b/metadata.yaml
index e281c3ff1..3339c9fd5 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -370,6 +370,12 @@ categories:
           type: tool-guide
           pdf_name: obs-tool-guide
           hc_location: browsertg/obs
+        - html_location: docs/obs/api-swift
+          rst_location: doc/swiftapi/source
+          title: API Reference (Swift)
+          type: swiftapi
+          pdf_name: obs-swiftapi
+          hc_location: api_swift/obs
         - html_location: docs/obs/s3api
           rst_location: doc/s3api/source
           title: S3 API Reference
@@ -481,191 +487,6 @@ categories:
         - name: docs-container-rw
           permission: write
       repository: docs/software-repository-container
-  network:
-    - service_title: Content Delivery Network (Akamai)
-      service_type: cdn
-      docs:
-        - html_location: docs/cdn/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: cdn-umn
-          hc_location: usermanual/cdn
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/content-delivery-network
-    - service_title: Direct Connect
-      service_type: dc
-      docs:
-        - html_location: docs/dc/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          pdf_name: dc-api-ref
-          hc_location: api/dc
-        - html_location: docs/dc/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: dc-umn
-          hc_location: usermanual/dc
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/direct-connect
-    - service_title: Domain Name Service
-      service_type: dns
-      docs:
-        - html_location: docs/dns/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          pdf_name: dns-api-ref
-          hc_location: api/dns
-        - html_location: docs/dns/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: dns-umn
-          hc_location: usermanual/dns
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/domain-name-service
-    - service_title: Elastic IP
-      service_type: eip
-      docs:
-        - html_location: docs/eip/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          pdf_name: eip-api-ref
-          hc_location: api/eip
-        - html_location: docs/eip/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: eip-umn
-          hc_location: usermanual/eip
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/elastic-ip
-    - service_title: Elastic Load Balancing
-      service_type: elb
-      docs:
-        - html_location: docs/elb/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          pdf_name: elb-api-ref
-          hc_location: api/elb
-        - html_location: docs/elb/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: elb-umn
-          hc_location: usermanual/elb
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/elastic-load-balancing
-    - service_title: NAT Gateway
-      service_type: natgw
-      docs:
-        - html_location: docs/natgw/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          pdf_name: natgw-api-ref
-          hc_location: api/natgw
-        - html_location: docs/natgw/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: natgw-umn
-          hc_location: usermanual/natgw
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/nat-gateway
-    - service_title: Private Link Access
-      service_type: plas
-      docs:
-        - html_location: docs/plas/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          pdf_name: plas-api-ref
-          hc_location: api/plas
-        - html_location: docs/plas/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: plas-umn
-          hc_location: usermanual/plas
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/private-link-access-service
-    - service_title: Virtual Private Cloud
-      service_type: vpc
-      docs:
-        - html_location: docs/vpc/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          pdf_name: vpc-api-ref
-          hc_location: api/vpc
-        - html_location: docs/vpc/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: vpc-umn
-          hc_location: usermanual/vpc
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/virtual-private-cloud
-    - service_title: VPC Endpoint
-      service_type: vpcep
-      docs:
-        - html_location: docs/vpcep/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          pdf_name: vpcep-api-ref
-          hc_location: api/vpcep
-        - html_location: docs/vpcep/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: vpcep-umn
-          hc_location: usermanual/vpcep
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/vpc-endpoint
-    - service_title: Virtual Private Network
-      service_type: vpn
-      docs:
-        - html_location: docs/vpn/api-ref
-          rst_location: api-ref/source
-          title: API Reference
-          type: api-ref
-          pdf_name: vpn-api-ref
-          hc_location: api/vpn
-        - html_location: docs/vpn/umn
-          rst_location: umn/source
-          title: User Guide
-          type: umn
-          pdf_name: vpn-umn
-          hc_location: usermanual/vpn
-      teams:
-        - name: docs-network-rw
-          permission: write
-      repository: docs/virtual-private-network
   md:
     - service_title: Cloud Eye
       service_type: ces
@@ -900,20 +721,179 @@ categories:
         - name: docs-bigdata-ai-rw
           permission: write
       repository: docs/mapreduce-service
-  database:
-    - service_title: Data Admin Service
-      service_type: das
+  network:
+    - service_title: Direct Connect
+      service_type: dc
       docs:
-        - html_location: docs/das/umn
+        - html_location: docs/dc/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: dc-api-ref
+          hc_location: api/dc
+        - html_location: docs/dc/umn
           rst_location: umn/source
           title: User Guide
           type: umn
-          pdf_name: das-umn
-          hc_location: usermanual/das
+          pdf_name: dc-umn
+          hc_location: usermanual/dc
       teams:
-        - name: docs-database-rw
+        - name: docs-network-rw
           permission: write
-      repository: docs/data-admin-service
+      repository: docs/direct-connect
+    - service_title: Domain Name Service
+      service_type: dns
+      docs:
+        - html_location: docs/dns/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: dns-api-ref
+          hc_location: api/dns
+        - html_location: docs/dns/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: dns-umn
+          hc_location: usermanual/dns
+      teams:
+        - name: docs-network-rw
+          permission: write
+      repository: docs/domain-name-service
+    - service_title: Elastic IP
+      service_type: eip
+      docs:
+        - html_location: docs/eip/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: eip-api-ref
+          hc_location: api/eip
+        - html_location: docs/eip/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: eip-umn
+          hc_location: usermanual/eip
+      teams:
+        - name: docs-network-rw
+          permission: write
+      repository: docs/elastic-ip
+    - service_title: Elastic Load Balancing
+      service_type: elb
+      docs:
+        - html_location: docs/elb/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: elb-api-ref
+          hc_location: api/elb
+        - html_location: docs/elb/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: elb-umn
+          hc_location: usermanual/elb
+      teams:
+        - name: docs-network-rw
+          permission: write
+      repository: docs/elastic-load-balancing
+    - service_title: NAT Gateway
+      service_type: natgw
+      docs:
+        - html_location: docs/natgw/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: natgw-api-ref
+          hc_location: api/nat
+        - html_location: docs/natgw/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: natgw-umn
+          hc_location: usermanual/nat
+      teams:
+        - name: docs-network-rw
+          permission: write
+      repository: docs/nat-gateway
+    - service_title: Private Link Access
+      service_type: plas
+      docs:
+        - html_location: docs/plas/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: plas-api-ref
+          hc_location: api/plas
+        - html_location: docs/plas/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: plas-umn
+          hc_location: usermanual/plas
+      teams:
+        - name: docs-network-rw
+          permission: write
+      repository: docs/private-link-access-service
+    - service_title: Virtual Private Cloud
+      service_type: vpc
+      docs:
+        - html_location: docs/vpc/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: vpc-api-ref
+          hc_location: api/vpc
+        - html_location: docs/vpc/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: vpc-umn
+          hc_location: usermanual/vpc
+      teams:
+        - name: docs-network-rw
+          permission: write
+      repository: docs/virtual-private-cloud
+    - service_title: VPC Endpoint
+      service_type: vpcep
+      docs:
+        - html_location: docs/vpcep/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: vpcep-api-ref
+          hc_location: api/vpcep
+        - html_location: docs/vpcep/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: vpcep-umn
+          hc_location: usermanual/vpcep
+      teams:
+        - name: docs-network-rw
+          permission: write
+      repository: docs/vpc-endpoint
+    - service_title: Virtual Private Network
+      service_type: vpn
+      docs:
+        - html_location: docs/vpn/api-ref
+          rst_location: api-ref/source
+          title: API Reference
+          type: api-ref
+          pdf_name: vpn-api-ref
+          hc_location: api/vpn
+        - html_location: docs/vpn/umn
+          rst_location: umn/source
+          title: User Guide
+          type: umn
+          pdf_name: vpn-umn
+          hc_location: usermanual/vpn
+      teams:
+        - name: docs-network-rw
+          permission: write
+      repository: docs/virtual-private-network
+  database:
     - service_title: Distributed Cache Service
       service_type: dcs
       docs: