diff --git a/MODULES_OWNERS b/MODULES_OWNERS
index d04cb10..cbc1dc6 100644
--- a/MODULES_OWNERS
+++ b/MODULES_OWNERS
@@ -8,7 +8,7 @@
 # See go/mainline-owners-policy for more details.
 
 hansson@google.com #{LAST_RESORT_SUGGESTION}
-satayev@google.com #{LAST_RESORT_SUGGESTION}
+robertogil@google.com #{LAST_RESORT_SUGGESTION}
 
 # backup:
 dariofreni@google.com #{LAST_RESORT_SUGGESTION}
diff --git a/OWNERS b/OWNERS
index 6008ec0..460cfa1 100644
--- a/OWNERS
+++ b/OWNERS
@@ -6,7 +6,7 @@ gurpreetgs@google.com
 hansson@google.com
 paulduffin@google.com
 pedroql@google.com
-satayev@google.com
+robertogil@google.com
 
 # Escalations
 jham@google.com
\ No newline at end of file
diff --git a/build/mainline_modules_sdks_test_data/OWNERS b/build/mainline_modules_sdks_test_data/OWNERS
index 3c17a96..2fba213 100644
--- a/build/mainline_modules_sdks_test_data/OWNERS
+++ b/build/mainline_modules_sdks_test_data/OWNERS
@@ -1,3 +1,3 @@
 hansson@google.com
 paulduffin@google.com
-satayev@google.com
+robertogil@google.com
diff --git a/javatests/com/android/modules/updatablesharedlibs/OWNERS b/javatests/com/android/modules/updatablesharedlibs/OWNERS
index 55f5b97..778e15d 100644
--- a/javatests/com/android/modules/updatablesharedlibs/OWNERS
+++ b/javatests/com/android/modules/updatablesharedlibs/OWNERS
@@ -2,4 +2,4 @@
 
 andreionea@google.com
 pedroql@google.com
-satayev@google.com
+robertogil@google.com