--- a/taskcluster/scripts/builder/build-emulator-x86.sh
+++ b/taskcluster/scripts/builder/build-emulator-x86.sh
@@ -14,17 +14,17 @@ test $GECKO_HEAD_REV # Should be an hg r
 test $TARGET
 
 . setup-ccache.sh
 
 # Figure out where the remote manifest is so we can use caches for it.
 
 MANIFEST=${MANIFEST:="$WORKSPACE/gecko/b2g/config/$TARGET/sources.xml"}
 
-tc-vcs repo-checkout $WORKSPACE/B2G https://git.mozilla.org/b2g/B2G.git $MANIFEST
+tc-vcs repo-checkout $WORKSPACE/B2G https://github.com/mozilla-b2g/B2G $MANIFEST
 
 # Ensure symlink has been created to gecko...
 rm -f $WORKSPACE/B2G/gecko
 ln -s $WORKSPACE/gecko $WORKSPACE/B2G/gecko
 
 ### Install package dependencies
 install-packages.sh $WORKSPACE/gecko
 

--- a/taskcluster/scripts/builder/build-emulator.sh
+++ b/taskcluster/scripts/builder/build-emulator.sh
@@ -16,17 +16,17 @@ test $TARGET
 . setup-ccache.sh
 
 # Figure out where the remote manifest is so we can use caches for it.
 
 if [ -z "$MANIFEST" ]; then
   MANIFEST="$WORKSPACE/gecko/b2g/config/$TARGET/sources.xml"
 fi
 
-tc-vcs repo-checkout $WORKSPACE/B2G https://git.mozilla.org/b2g/B2G.git $MANIFEST
+tc-vcs repo-checkout $WORKSPACE/B2G https://github.com/mozilla-b2g/B2G $MANIFEST
 
 # Ensure symlink has been created to gecko...
 rm -f $WORKSPACE/B2G/gecko
 ln -s $WORKSPACE/gecko $WORKSPACE/B2G/gecko
 
 ### Install package dependencies
 install-packages.sh $WORKSPACE/gecko
 

--- a/taskcluster/scripts/phone-builder/pre-build.sh
+++ b/taskcluster/scripts/phone-builder/pre-build.sh
@@ -15,17 +15,17 @@ test $GECKO_BASE_REPOSITORY # Should be 
 test $GECKO_HEAD_REV # Should be an hg revision to pull down
 test $TARGET
 test $VARIANT
 
 . ../builder/setup-ccache.sh
 
 # Figure out where the remote manifest is so we can use caches for it.
 MANIFEST=$(repository-url.py $GECKO_HEAD_REPOSITORY $GECKO_HEAD_REV b2g/config/$TARGET/sources.xml)
-tc-vcs repo-checkout $WORKSPACE/B2G https://git.mozilla.org/b2g/B2G.git $MANIFEST
+tc-vcs repo-checkout $WORKSPACE/B2G https://github.com/mozilla-b2g/B2G $MANIFEST
 
 # Ensure symlink has been created to gecko...
 rm -f $WORKSPACE/B2G/gecko
 ln -s $WORKSPACE/gecko $WORKSPACE/B2G/gecko
 
 debug_flag=""
 if [ 0$B2G_DEBUG -ne 0 ]; then
   debug_flag='--debug'

--- a/testing/mozharness/mozharness/mozilla/building/buildb2gbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildb2gbase.py
@@ -367,17 +367,17 @@ class B2GBuildBaseScript(BuildbotMixin, 
         }]
         rev = self.vcs_checkout(**repos[0])
         self.set_buildbot_property("tools_revision", rev, write_to_file=True)
 
     def checkout_sources(self):
         dirs = self.query_abs_dirs()
         gecko_config = self.load_gecko_config()
         b2g_manifest_intree = gecko_config.get('b2g_manifest_intree')
-        b2g_repo = gecko_config.get('b2g_repo','https://git.mozilla.org/b2g/B2G.git')
+        b2g_repo = gecko_config.get('b2g_repo','https://github.com/mozilla-b2g/B2G.git')
         b2g_branch = gecko_config.get('b2g_branch','master')
 
         if gecko_config.get('config_version') >= 2:
             repos = [
                 {'vcs': 'gittool', 'repo': b2g_repo, 'branch': b2g_branch, 'dest': dirs['work_dir']},
             ]
 
             if b2g_manifest_intree: