diff --git a/CODEOWNERS b/CODEOWNERS
index 49d223de302c6066efd1308a276bd60f08c7a3b8..30a501394ec616ed714c0497e32a4807284e61b6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -12,11 +12,11 @@
 
 /macro/C2F/      @i.selyuzhenkov
 /macro/analysis/ @i.selyuzhenkov
-/macro/KF/       @s.gorbunov @v.akishina
+/macro/KF/       @se.gorbunov @v.akishina
 
 # Core
 /core/             @f.uhlig @v.friese @p.-a.loizeau
-/core/qa/          @s.gorbunov
+/core/qa/          @se.gorbunov
 /core/data/test/   @f.uhlig
 /core/data/raw/    @p.-a.loizeau
 /core/base/utils/  @f.uhlig @s.lebedev
@@ -30,9 +30,9 @@
 # Reco
 /reco/              @f.uhlig @v.friese @p.-a.loizeau
 /reco/littrack/     @s.lebedev @andrey.lebedev
-/reco/L1/           @s.gorbunov @v.akishina
+/reco/L1/           @se.gorbunov @v.akishina
 /reco/eventbuilder/ @d.smith
-/reco/KF/           @s.gorbunov @v.akishina
+/reco/KF/           @se.gorbunov @v.akishina
 
 # Analysis
 /analysis/                                 @i.selyuzhenkov
diff --git a/scripts/inform_codeowners.sh b/scripts/inform_codeowners.sh
index 4403dd252aebf0c65cff9557ede3768af65e5969..1ce3b9ad30bc8932989873c4cad72543b4f6fc13 100755
--- a/scripts/inform_codeowners.sh
+++ b/scripts/inform_codeowners.sh
@@ -137,6 +137,10 @@ function generate_file_list() {
   fi
   echo "Upstream name is :" $UPSTREAM
 
+  # Rebase the MR to extract the changed files properly
+  # If upstream/master was changed while the pipline was running one would otherwise get
+  # a wrong list of files
+  git rebase $UPSTREAM/master
   BASE_COMMIT=$UPSTREAM/master
   CHANGED_FILES=$(git diff --name-only $BASE_COMMIT)
 }