diff --git a/CODEOWNERS b/CODEOWNERS
index 53131941..7bd29253 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -5,18 +5,6 @@
 
 /pkg/storage/                   @peusebiu
 
-/pkg/exporter/                  @adodon2go
-
-/pkg/extensions/search/         @shimish2
-
-/pkg/extensions/scrub/          @Andreea-Lupu
+/pkg/extensions/search/         @vrajashkr
 
 /pkg/extensions/sync/           @peusebiu
-
-/pkg/extensions/monitoring/     @adodon2go
-
-/cmd/zxp/                       @adodon2go
-
-/cmd/zb/                        @roxanaN
-
-
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index cc7baa8f..da6a7bb1 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -4,8 +4,8 @@
 
 | Maintainer | Github ID | Affiliation |
 | --------------- | --------- | ----------- |
-| Ramkumar Chinchani | [rchincha](https://github.com/rchincha) | [Cisco Systems](https://www.cisco.com) |
-| Ravi Chamarthy | [rchamarthy](https://github.com/rchamarthy) | [Cisco Systems](https://www.cisco.com) |
-| Serge Hallyn | [hallyn](https://github.com/hallyn) | [Cisco Systems](https://www.cisco.com) |
+| Ramkumar Chinchani | [rchincha](https://github.com/rchincha) | [Microsoft](https://www.microsoft.com) |
+| Ravi Chamarthy | [rchamarthy](https://github.com/rchamarthy) | [Ciroos AI](https://www.ciroos.ai) |
+| Serge Hallyn | [hallyn](https://github.com/hallyn) | [Geico](https://www.geico.com) |
 | Andrei Aaron | [andaaron](https://github.com/andaaron) | [Luxoft](https://www.luxoft.com/) | 
-| Tycho Andersen | [tych0](https://github.com/tych0) | [Netflix](https://www.netflix.com) |
+| Tycho Andersen | [tych0](https://github.com/tych0) | [AMD](https://www.amd.com) |