diff --git a/CODEOWNERS b/CODEOWNERS
index 916948444..11186f501 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -17,6 +17,7 @@
 /builder/scaleway/                      @sieben @mvaude @jqueuniet @fflorens @brmzkw
 /builder/hcloud/                        @LKaemmerling
 /builder/hyperone                       @m110 @gregorybrzeski @ad-m
+/builder/yandex                         @GennadySpb @alexanderKhaustov @seukyaso
 
 # provisioners
 
@@ -24,6 +25,7 @@
 /provisioner/converge/                  @stevendborrelli
 
 # post-processors
+
 /post-processor/alicloud-import/        dongxiao.zzh@alibaba-inc.com
 /post-processor/checksum/               v.tolstov@selfip.ru
 /post-processor/googlecompute-export/   crunkleton@google.com