diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 21782ad1d8..3da4c3ee88 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,12 +1,8 @@
 # CODEOWNERS file for OpenHands repository
 # See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-# Frontend code owners
-/frontend/ @amanape
-/openhands-ui/ @amanape
-
-# Evaluation code owners
+/frontend/ @amanape @hieptl
+/openhands-ui/ @amanape @hieptl
+/openhands/ @tofarr @malhotra5 @hieptl
+/enterprise/ @chuckbutkus @tofarr @malhotra5
 /evaluation/ @xingyaoww @neubig
-
-# Documentation code owners
-/docs/ @mamoodi
diff --git a/trigger_commit.txt b/trigger_commit.txt
deleted file mode 100644
index 402f8bb0e5..0000000000
--- a/trigger_commit.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Trigger E2E test run