diff --git a/CODEOWNERS b/CODEOWNERS
index a9db005a9..56d91a081 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,17 +2,19 @@
 
 # builders
 
-builder/alicloud        dongxiao.zzh@alibaba-inc.com
-builder/azure           @boumenot
-builder/hyperv          @taliesins
-builder/lxc             @ChrisLundquist
-builder/lxd             @ChrisLundquist
-builder/oneandone       @jasmingacic
-builder/oracle          @prydie @owainlewis
-builder/profitbricks    @jasmingacic
-builder/triton          @jen20 @sean-
+/builder/alicloud/              dongxiao.zzh@alibaba-inc.com
+/builder/amazon/ebssurrogate/   @jen20
+/builder/amazon/ebsvolume/      @jen20
+/builder/azure/                 @boumenot
+/builder/hyperv/                @taliesins
+/builder/lxc/                   @ChrisLundquist
+/builder/lxd/                   @ChrisLundquist
+/builder/oneandone/             @jasmingacic
+/builder/oracle/                @prydie @owainlewis
+/builder/profitbricks/          @jasmingacic
+/builder/triton/                @jen20 @sean-
 
 # provisioners
 
-provisioner/ansible     @bhcleek
-provisioner/converge    @stevendborrelli
+/provisioner/ansible/           @bhcleek
+/provisioner/converge/          @stevendborrelli