diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5c0e55719ca0..1518d641836e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -29,12 +29,6 @@
 
 /content/manuals/security/ @aevesdocker @sarahsanders-docker
 
-/content/manuals/trusted-content/ @craig-osterhout
-
-/content/manuals/docker-hub/official_images/ @craig-osterhout
-
-/content/manuals/registry/ @craig-osterhout
-
 /content/manuals/admin/ @sarahsanders-docker
 
 /content/manuals/billing/ @sarahsanders-docker
@@ -44,3 +38,7 @@
 /content/manuals/ai/ @ArthurFlag
 
 /_vendor @sarahsanders-docker @ArthurFlag
+
+/content/manuals/cloud/ @craig-osterhout
+
+/content/manuals/dhi/ @craig-osterhout
diff --git a/.github/labeler.yml b/.github/labeler.yml
index a4fd92c0e1be..858575385b56 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -50,6 +50,11 @@ area/build-cloud:
       - any-glob-to-any-file:
           - content/manuals/build-cloud/**
 
+area/cloud:
+  - changed-files:
+      - any-glob-to-any-file:
+          - content/manuals/cloud/**
+
 area/compose:
   - changed-files:
       - any-glob-to-any-file:
@@ -62,6 +67,11 @@ area/desktop:
       - any-glob-to-any-file:
           - content/manuals/desktop/**
 
+area/dhi:
+  - changed-files:
+      - any-glob-to-any-file:
+          - content/manuals/dhi/**
+
 area/engine:
   - changed-files:
       - any-glob-to-any-file: