diff --git a/CODEOWNERS b/CODEOWNERS
index cfac49475..a9db005a9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -3,16 +3,16 @@
 # builders
 
 builder/alicloud        dongxiao.zzh@alibaba-inc.com
-builder/azure           chrboum@microsoft.com
-builder/hyperv          taliesins@interxion.com
-builder/lxc             rampantdurandal@gmail.com
-builder/lxd             rampantdurandal@gmail.com
-builder/oneandone       jasmin@stackpointcloud.com
-builder/oracle          andrew.pryde@oracle.com @owainlewis
-builder/profitbricks    jasmin@stackpointcloud.com
-builder/triton          james@jen20.com sean@chittenden.org
+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     billie.cleek@idexpertscorp.com
-provisioner/converge    brian@brianthicks.com
+provisioner/ansible     @bhcleek
+provisioner/converge    @stevendborrelli