diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index d0df8e6210..0000000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1,30 +0,0 @@
-# Each line is a file pattern followed by one or more owners.
-
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-# @global-owner1 and @global-owner2 will be requested for
-# review when someone opens a pull request.
-*       @surajshetty3416, @netchampfaris
-
-# Website
-website/  @scmmishra
-templates/  @scmmishra
-www/ @scmmishra
-
-integrations/ @Mangesh-Khairnar
-
-patches/ @surajshetty3416 @sahil28297
-
-dashboard/ @prssanna
-
-email/ @Thunderbottom
-
-event_streaming/ @ruchamahabal
-
-data_import* @netchampfaris
-
-core/ @surajshetty3416
-
-requirements.txt @gavindsouza
-
-chat/ @god
\ No newline at end of file
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000..2ff8752871
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,17 @@
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+
+*					@surajshetty3416, @netchampfaris
+website/			@scmmishra
+templates/			@scmmishra
+www/ 				@scmmishra
+integrations/		@Mangesh-Khairnar
+patches/			@surajshetty3416 @sahil28297
+dashboard/			@prssanna
+email/				@Thunderbottom
+event_streaming/ 	@ruchamahabal
+data_import* 		@netchampfaris
+core/				@surajshetty3416
+requirements.txt	@gavindsouza
\ No newline at end of file