diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 39524f84f..304adfcfb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,12 +1,19 @@
 # NHS Notify Code Owners
 
-*                                                                      @NHSDigital/nhs-notify-supplier-api
-/.github/                                                              @NHSDigital/nhs-notify-admins
-*.code-workspace                                                       @NHSDigital/nhs-notify-admins
+*                           @NHSDigital/nhs-notify-supplier-api
+
+/.github/                   @NHSDigital/nhs-notify-supplier-api-admins
+*.code-workspace            @NHSDigital/nhs-notify-supplier-api-admins
+/docs/                      @NHSDigital/nhs-notify-supplier-api
+/infrastructure/terraform/  @NHSDigital/nhs-notify-platform
 
 # Codeowners must be final check
-/.github/CODEOWNERS @NHSDigital/nhs-notify-code-owners
-/CODEOWNERS @NHSDigital/nhs-notify-code-owners
+/.github/CODEOWNERS         @NHSDigital/nhs-notify-code-owners
+/CODEOWNERS                 @NHSDigital/nhs-notify-code-owners
+
+# Each NHS Notify repository should have clear code owners set.
+# Do not use GitHub team names, instead use the GitHub usernames
+# of the people who are responsible for the code maintenance.
 
 # This is a comment.
 # Each line is a file pattern followed by one or more owners.