diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9232910bc0e..8dec97ffc80 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,8 @@
-.github/CODEOWNERS  @netlify/netlify-dev
-docs/               @netlify/netlify-dev @netlify/docs
-site/               @netlify/netlify-dev @netlify/docs
-/scripts/docs.js    @netlify/netlify-dev @netlify/docs
+.github/CODEOWNERS        @netlify/netlify-dev
+docs/                     @netlify/netlify-dev @netlify/docs
+site/                     @netlify/netlify-dev @netlify/docs
+/scripts/docs.js          @netlify/netlify-dev @netlify/docs
+/src/functions-templates/ @netlify/compute
+/src/lib/functions/       @netlify/compute
+/src/lib/edge-functions/  @netlify/compute
+/src/utils/functions/     @netlify/compute
diff --git a/package.json b/package.json
index 519a0896419..d60e7d22e0d 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
     "Ardie Wen",
     "Arthur Puyou <arthur@puyou.fr> (https://twitter.com/apuyou)",
     "Ashal Farhan",
-    "Axel Fuhrmann (https://twitter.com/axelfuh)",
     "Battulga Tsogtgerel <theonlytulga@gmail.com>",
     "Be <be.0@gmx.com> (https://beasintheverb.me/)",
     "Benaiah Mischenko <benaiah@mischenko.com> (https://benaiah.me)",