diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
index 89950587b25..72783c5d707 100644
--- a/.ci/flutter_master.version
+++ b/.ci/flutter_master.version
@@ -1 +1 @@
-36fe51524f7219b4cfe9869a63d691d20443d994
+889a15eb9df6961b9a4dc3bf751ff67cb54a2065
diff --git a/.ci/scripts/prepare_tool.sh b/.ci/scripts/prepare_tool.sh
index b25d769d9b7..2e173921ce1 100755
--- a/.ci/scripts/prepare_tool.sh
+++ b/.ci/scripts/prepare_tool.sh
@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 
 # To set FETCH_HEAD for "git merge-base" to work
-git fetch origin master
+git fetch origin main
 
 # Pinned version of the plugin tools, to avoid breakage in this repository
 # when pushing updates from flutter/plugins.