diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index 9c54d911e..8b73de2be 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -42,8 +42,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.email "mr-cheff@users.noreply.github.com"
-          git config --global user.name "mr-cheff"
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
 
       - name: Install system dependencies
         run: |
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index 5c5e9b574..b7ea736b1 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -38,8 +38,8 @@ jobs:
 
       - name: Setup Git
         run: |
-          git config --global user.email "mr-cheff@users.noreply.github.com"
-          git config --global user.name "mr-cheff"
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
 
       - name: Setup pnpm
         run: npm install -g pnpm
diff --git a/CODEOWNERS b/CODEOWNERS
index 64c09c8d3..5f964be1d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @mr-cheff
+* @mauro-balades