diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index cc30200787..aef3ec2719 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -59,6 +59,13 @@ def RepoSync(buildroot, rw_checkout=False, retries=_DEFAULT_RETRIES):
       # is needed so that the buildbot can kill us if git is not making
       # progress.
       RunCommand(['repo', '--trace', 'sync'], cwd=buildroot)
+      if rw_checkout:
+        # Always re-run in case of new git repos or repo sync
+        # failed in a previous run because of a forced Stop Build.
+        RunCommand(['repo', 'forall', '-c', 'git', 'config',
+                    'url.ssh://git@gitrw.chromium.org:9222.pushinsteadof',
+                    'http://git.chromium.org/git'], cwd=buildroot)
+
       retries = 0
     except:
       retries -= 1
@@ -508,7 +515,7 @@ def main():
   parser.add_option('-t', '--tracking-branch', dest='tracking_branch',
                     default='cros/master', help='Run the buildbot on a branch')
   parser.add_option('-u', '--url', dest='url',
-                    default='ssh://git@gitrw.chromium.org:9222/manifest',
+                    default='http://git.chromium.org/git/manifest',
                     help='Run the buildbot on internal manifest')
 
   (options, args) = parser.parse_args()