diff --git a/metadata.yaml b/metadata.yaml
index 556f3f741..e9d8413f7 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -85,13 +85,13 @@ categories:
           title: API Reference
           type: api-ref
           pdf_name: wafd-api-ref
-          hc_location: api/wafd
+          hc_location: api/dwaf
         - html_location: docs/wafd/umn
           rst_location: umn/source
           title: User Guide
           type: umn
           pdf_name: wafd-umn
-          hc_location: usermanual/wafd
+          hc_location: usermanual/dwaf
       teams:
         - name: docs-security-services-rw
           permission: write
@@ -364,12 +364,12 @@ categories:
           type: api-ref
           pdf_name: obs-api-ref
           hc_location: api/obs
-        - html_location: docs/obs/dev
-          rst_location: dev_guide/source
-          title: Developer Guide
-          type: dev
-          pdf_name: obs-dev-guide
-          hc_location: devg/obs
+        - html_location: docs/obs/tool
+          rst_location: doc/tool/source
+          title: Tool Guide (OBS Browser)
+          type: tool-guide
+          pdf_name: obs-tool-guide
+          hc_location: browsertg/obs
         - html_location: docs/obs/s3api
           rst_location: doc/s3api/source
           title: S3 API Reference