diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 14b269fd3c2..6a24811abf3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,14 +2,13 @@
 
 * @GoogleContainerTools/skaffold-team
 
-# Buildpacks owners
-
-**/**buildpacks** @GoogleContainerTools/skaffold-team
-
 # JIB owners
 
 **/**jib** @GoogleContainerTools/skaffold-team @loosebazooka @TadCordle @chanseokoh
 
+# kpt owners
+pkg/skaffold/deploy/**kpt** @GoogleContainerTools/skaffold-team @yuwenma
+
 # Debug owners
 
 pkg/skaffold/debug/** @GoogleContainerTools/skaffold-team @loosebazooka @quoctruong
diff --git a/MAINTAINERS b/MAINTAINERS
index 567a6b8c451..2a46b547ebd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,7 +1,7 @@
-Balint Pato <balintp@google.com>
+Brian de Alwis <bdealwis@google.com>
 David Gageot <david@gageot.net>
+Gaurav Ghosh <gaghosh@google.com>
+Marlon Gamez <marlongamez@google.com>
 Nick Kubala <nkubala@google.com>
 Tejal Desai <tejaldesai@google.com>
-Brian de Alwis <bdealwis@google.com>
 Thomas Strömberg <tstromberg@google.com>
-Gaurav Ghosh <gaghosh@google.com>