diff --git a/CODEOWNERS b/CODEOWNERS
index 817af9af2b9..9aa38a15a3a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,5 @@
 /build-system/ @charlielye
-/build_manifest.yml @charlielye
\ No newline at end of file
+/build_manifest.yml @charlielye
+
+# Notify the AVM team of any changes to public oracle.
+/yarn-project/simulator/src/public/public_execution_context.ts @Maddiaa0 @fcarreiro