diff --git a/.github/CODENOTIFY b/.github/CODENOTIFY
index 35ea29b51742..dfeb89b45076 100644
--- a/.github/CODENOTIFY
+++ b/.github/CODENOTIFY
@@ -4,12 +4,12 @@ src/vs/base/browser/domSanitize.ts @mjbvz
 src/vs/base/parts/quickinput/** @TylerLeonhardt
 
 # Base Widgets
-src/vs/base/browser/ui/grid/** @joaomoreno @benibenj
-src/vs/base/browser/ui/list/** @joaomoreno @benibenj
-src/vs/base/browser/ui/sash/** @joaomoreno @benibenj
-src/vs/base/browser/ui/splitview/** @joaomoreno @benibenj
-src/vs/base/browser/ui/table/** @joaomoreno @benibenj
-src/vs/base/browser/ui/tree/** @joaomoreno @benibenj
+src/vs/base/browser/ui/grid/** @benibenj
+src/vs/base/browser/ui/list/** @benibenj
+src/vs/base/browser/ui/sash/** @benibenj
+src/vs/base/browser/ui/splitview/** @benibenj
+src/vs/base/browser/ui/table/** @benibenj
+src/vs/base/browser/ui/tree/** @benibenj
 
 # Platform
 src/vs/platform/browserView/** @kycutler @jruales
@@ -43,7 +43,7 @@ src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts @TylerLeonha
 src/vs/workbench/contrib/scm/** @lszomoru
 src/vs/workbench/contrib/terminal/** @anthonykim1
 src/vs/workbench/contrib/terminalContrib/** @anthonykim1
-src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts @alexr00 @joaomoreno
+src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts @alexr00
 src/vs/workbench/contrib/preferences/** @rzhao271
 
 # Sessions Contributions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7e6bf875307c..2904f679f73c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,14 +1,14 @@
 # GitHub actions required reviewers
-.github/workflows/monaco-editor.yml @hediet @alexdima @lszomoru @joaomoreno
-.github/workflows/no-package-lock-changes.yml @lszomoru @alexdima @joaomoreno @TylerLeonhardt @rzhao271 @Yoyokrazy
-.github/workflows/no-yarn-lock-changes.yml @lszomoru @alexdima @joaomoreno @TylerLeonhardt @rzhao271 @Yoyokrazy
-.github/workflows/pr-darwin-test.yml @lszomoru @alexdima @joaomoreno @TylerLeonhardt @rzhao271 @Yoyokrazy
-.github/workflows/pr-linux-cli-test.yml @lszomoru @alexdima @joaomoreno @TylerLeonhardt @rzhao271 @Yoyokrazy
-.github/workflows/pr-linux-test.yml @lszomoru @alexdima @joaomoreno @TylerLeonhardt @rzhao271 @Yoyokrazy
-.github/workflows/pr-node-modules.yml @lszomoru @alexdima @joaomoreno @TylerLeonhardt @rzhao271 @Yoyokrazy
-.github/workflows/pr-win32-test.yml @lszomoru @alexdima @joaomoreno @TylerLeonhardt @rzhao271 @Yoyokrazy
-.github/workflows/pr.yml @lszomoru @alexdima @joaomoreno @TylerLeonhardt @rzhao271 @Yoyokrazy
-.github/workflows/telemetry.yml @lramos15 @lszomoru @alexdima @joaomoreno
+.github/workflows/monaco-editor.yml @hediet @alexdima @lszomoru
+.github/workflows/no-package-lock-changes.yml @lszomoru @alexdima @sandy081 @TylerLeonhardt @rzhao271 @Yoyokrazy
+.github/workflows/no-yarn-lock-changes.yml @lszomoru @alexdima @sandy081 @TylerLeonhardt @rzhao271 @Yoyokrazy
+.github/workflows/pr-darwin-test.yml @lszomoru @alexdima @sandy081 @TylerLeonhardt @rzhao271 @Yoyokrazy
+.github/workflows/pr-linux-cli-test.yml @lszomoru @alexdima @sandy081 @TylerLeonhardt @rzhao271 @Yoyokrazy
+.github/workflows/pr-linux-test.yml @lszomoru @alexdima @sandy081 @TylerLeonhardt @rzhao271 @Yoyokrazy
+.github/workflows/pr-node-modules.yml @lszomoru @alexdima @sandy081 @TylerLeonhardt @rzhao271 @Yoyokrazy
+.github/workflows/pr-win32-test.yml @lszomoru @alexdima @sandy081 @TylerLeonhardt @rzhao271 @Yoyokrazy
+.github/workflows/pr.yml @lszomoru @alexdima @sandy081 @TylerLeonhardt @rzhao271 @Yoyokrazy
+.github/workflows/telemetry.yml @lramos15 @lszomoru @alexdima
 
 # VS Code API
 # Ensure the API team is aware of changes to the vscode-dts file
diff --git a/.mailmap b/.mailmap
index 5bd99619330a..9c4139cbdd3d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,2 @@
 Raymond Zhao <raymondzhao@microsoft.com>
 Tyler Leonhardt <tyleonha@microsoft.com> Tyler Leonhardt <me@tylerleonhardt.com>
-João Moreno <joao.moreno@microsoft.com> João Moreno <mail@joaomoreno.com>
diff --git a/extensions/copilot/.github/CODEOWNERS b/extensions/copilot/.github/CODEOWNERS
index 0e2c2176d7ee..4bb631691afe 100644
--- a/extensions/copilot/.github/CODEOWNERS
+++ b/extensions/copilot/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # Ensure Lad and Joao review cache relevant code
-.github/workflows/pr-check-cache.yml @lszomoru @alexdima @joaomoreno
-build/pr-check-cache-files.ts @lszomoru @alexdima @joaomoreno
-test/base/cache-cli.ts @lszomoru @alexdima @joaomoreno
-test/base/cache.ts @lszomoru @alexdima @joaomoreno
+.github/workflows/pr-check-cache.yml @lszomoru @alexdima
+build/pr-check-cache-files.ts @lszomoru @alexdima
+test/base/cache-cli.ts @lszomoru @alexdima
+test/base/cache.ts @lszomoru @alexdima