--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -1,26 +1,15 @@
 <?xml version="1.0" ?><manifest>
   <!--
     Remotes
     -->
-  <!--original fetch url was https://android.googlesource.com/-->
-  <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
-  <!--original fetch url was git://github.com/apitrace/-->
-  <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
+  <remote fetch="git://github.com/apitrace/" name="apitrace"/>
   <remote fetch="git://github.com/mozilla-b2g/" name="b2g"/>
-  <!--original fetch url was https://git.mozilla.org/b2g-->
-  <remote fetch="https://git.mozilla.org/b2g" name="b2gmozilla"/>
-  <!--original fetch url was git://codeaurora.org/-->
-  <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
-  <!--original fetch url was http://android.git.linaro.org/git-ro/-->
-  <remote fetch="https://git.mozilla.org/external/linaro" name="linaro"/>
-  <remote fetch="git://github.com/mozilla/" name="mozilla"/>
-  <!--original fetch url was https://git.mozilla.org/releases-->
-  <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
+  <remote fetch="git://codeaurora.org/" name="caf"/>
   <!--
     B2G repositories for all targets
     -->
   <project name="gaia" path="gaia" remote="b2g" revision="99c01f5646b2d8aa5ebf1968114ab2f5db5ac6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="99003a6e7ecee880330a3fb8b5e49fefdb762374"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
   <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="34adfb400e031f3dd3353d92413572db5e3a7376"/>

--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "a954bd2954c422b7d24d92cfd73000cb455dce44", 
-        "remote": "https://git.mozilla.org/releases/gaia.git", 
+        "git_revision": "90240f7a2e66ae8873e1f1b0e5f1d80a98c2c2db",
+        "remote": "https://github.com/mozilla-b2g/gaia.git",
         "branch": ""
-    }, 
-    "revision": "e9e8c44b43178139fca915cfe97ae3c52a9afe34", 
+    },
+    "revision": "e9e8c44b43178139fca915cfe97ae3c52a9afe34",
     "repo_path": "integration/gaia-central"
 }

--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -1,26 +1,15 @@
 <?xml version="1.0" ?><manifest>
   <!--
     Remotes
     -->
-  <!--original fetch url was https://android.googlesource.com/-->
-  <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
-  <!--original fetch url was git://github.com/apitrace/-->
-  <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
+  <remote fetch="git://github.com/apitrace/" name="apitrace"/>
   <remote fetch="git://github.com/mozilla-b2g/" name="b2g"/>
-  <!--original fetch url was https://git.mozilla.org/b2g-->
-  <remote fetch="https://git.mozilla.org/b2g" name="b2gmozilla"/>
-  <!--original fetch url was git://codeaurora.org/-->
-  <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
-  <!--original fetch url was http://android.git.linaro.org/git-ro/-->
-  <remote fetch="https://git.mozilla.org/external/linaro" name="linaro"/>
-  <remote fetch="git://github.com/mozilla/" name="mozilla"/>
-  <!--original fetch url was https://git.mozilla.org/releases-->
-  <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
+  <remote fetch="git://codeaurora.org/" name="caf"/>
   <!--
     B2G repositories for all targets
     -->
   <project name="gaia" path="gaia" remote="b2g" revision="99c01f5646b2d8aa5ebf1968114ab2f5db5ac6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="99003a6e7ecee880330a3fb8b5e49fefdb762374"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
   <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="34adfb400e031f3dd3353d92413572db5e3a7376"/>

--- a/testing/docker/desktop-test/tc-vcs-config.yml
+++ b/testing/docker/desktop-test/tc-vcs-config.yml
@@ -1,16 +1,16 @@
 # Default configuration used by the tc-vs tools these can be overridden by
 # passing the config you wish to use over the command line...
 git: git
 hg: hg
 
 repoCache:
   # Repo url to clone when running repo init..
-  repoUrl: https://git.mozilla.org/external/google/gerrit/git-repo.git
+  repoUrl: https://gerrit.googlesource.com/git-repo.git
   # Version of repo to utilize...
   repoRevision: master
   # The root where all downloaded cache files are stored on the local machine...
   cacheDir: '{{env.HOME}}/.tc-vcs-repo/'
   # Name/prefixed used as part of the base url.
   cacheName: sources/{{name}}.tar.gz
   # Command used to upload the tarball
   uploadTar: "curl --header 'Content-Type: application/x-tar' --header 'Content-Encoding: gzip' -X PUT --data-binary @'{{source}}' '{{url}}'"

--- a/testing/docker/desktop1604-test/tc-vcs-config.yml
+++ b/testing/docker/desktop1604-test/tc-vcs-config.yml
@@ -1,16 +1,16 @@
 # Default configuration used by the tc-vs tools these can be overridden by
 # passing the config you wish to use over the command line...
 git: git
 hg: hg
 
 repoCache:
   # Repo url to clone when running repo init..
-  repoUrl: https://git.mozilla.org/external/google/gerrit/git-repo.git
+  repoUrl: https://gerrit.googlesource.com/git-repo.git
   # Version of repo to utilize...
   repoRevision: master
   # The root where all downloaded cache files are stored on the local machine...
   cacheDir: '{{env.HOME}}/.tc-vcs-repo/'
   # Name/prefixed used as part of the base url.
   cacheName: sources/{{name}}.tar.gz
   # Command used to upload the tarball
   uploadTar: "curl --header 'Content-Type: application/x-tar' --header 'Content-Encoding: gzip' -X PUT --data-binary @'{{source}}' '{{url}}'"

--- a/testing/docker/phone-builder/Dockerfile
+++ b/testing/docker/phone-builder/Dockerfile
@@ -3,12 +3,15 @@ MAINTAINER    Wander Lairson Costa <wcos
 
 # Add utilities and configuration
 ADD           bin                   /home/worker/bin
 
 # Builds need the share module enabled
 ADD           hgrc /home/worker/.hgrc
 RUN chown -R worker:worker /home/worker/.hgrc
 
+# Make sure we use our own config
+COPY          tc-vcs-config.yml /etc/taskcluster-vcs.yml
+
 RUN           yum install -y bc lzop java-1.7.0-openjdk
 RUN           pip install awscli
 RUN           npm install -g bower gulp apm grunt-cli
 

new file mode 100644
--- /dev/null
+++ b/testing/docker/phone-builder/tc-vcs-config.yml
@@ -0,0 +1,40 @@
+# Default configuration used by the tc-vs tools these can be overridden by
+# passing the config you wish to use over the command line...
+git: git
+hg: hg
+
+repoCache:
+  # Repo url to clone when running repo init..
+  repoUrl: https://gerrit.googlesource.com/git-repo.git
+  # Version of repo to utilize...
+  repoRevision: master
+  # The root where all downloaded cache files are stored on the local machine...
+  cacheDir: '{{env.HOME}}/.tc-vcs-repo/'
+  # Name/prefixed used as part of the base url.
+  cacheName: sources/{{name}}.tar.gz
+  # Command used to upload the tarball
+  uploadTar: "curl --retry 5 --fail --header 'Content-Type: application/x-tar' --header 'Content-Encoding: gzip' -X PUT --data-binary @'{{source}}' '{{url}}'"
+  # Large http get requests are often slower using nodes built in http layer so
+  # we utilize a subprocess which is responsible for fetching...
+  get: curl --retry 5 --fail -L -o {{dest}} {{url}}
+  # Used to create clone tarball
+  compress: tar -czf {{dest}} {{source}}
+  # All cache urls use tar + gz this is the command used to extract those files
+  # downloaded by the "get" command.
+  extract: tar -x -z -C {{dest}} -f {{source}}
+
+cloneCache:
+  # The root where all downloaded cache files are stored on the local machine...
+  cacheDir: '{{env.HOME}}/.tc-vcs/'
+  # Command used to upload the tarball
+  uploadTar: "curl --retry 5 --fail --header 'Content-Type: application/x-tar' --header 'Content-Encoding: gzip' -X PUT --data-binary @'{{source}}' '{{url}}'"
+  # Large http get requests are often slower using nodes built in http layer so
+  # we utilize a subprocess which is responsible for fetching...
+  get: curl --retry 5 --fail -L -o {{dest}} {{url}}
+  # Used to create clone tarball
+  compress: tar -czf {{dest}} {{source}}
+  # All cache urls use tar + gz this is the command used to extract those files
+  # downloaded by the "get" command.
+  extract: tar -x -z --strip-components 1 -C {{dest}} -f {{source}}
+  # Name/prefixed used as part of the base url.
+  cacheName: clones/{{name}}.tar.gz

--- a/testing/docker/tester/tc-vcs-config.yml
+++ b/testing/docker/tester/tc-vcs-config.yml
@@ -1,16 +1,16 @@
 # Default configuration used by the tc-vs tools these can be overridden by
 # passing the config you wish to use over the command line...
 git: git
 hg: hg
 
 repoCache:
   # Repo url to clone when running repo init..
-  repoUrl: https://git.mozilla.org/external/google/gerrit/git-repo.git
+  repoUrl: https://gerrit.googlesource.com/git-repo.git
   # Version of repo to utilize...
   repoRevision: master
   # The root where all downloaded cache files are stored on the local machine...
   cacheDir: '{{env.HOME}}/.tc-vcs-repo/'
   # Name/prefixed used as part of the base url.
   cacheName: sources/{{name}}.tar.gz
   # Command used to upload the tarball
   uploadTar: "curl --header 'Content-Type: application/x-tar' --header 'Content-Encoding: gzip' -X PUT --data-binary @'{{source}}' '{{url}}'"

--- a/testing/mozharness/mozharness/mozilla/building/buildb2gbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildb2gbase.py
@@ -99,17 +99,17 @@ class B2GBuildBaseScript(BuildbotMixin, 
                  require_config_file=False,
                  config={},
                  all_actions=[],
                  default_actions=[]):
         default_config = {
             'vcs_share_base': os.environ.get('HG_SHARE_BASE_DIR'),
             'buildbot_json_path': os.environ.get('PROPERTIES_FILE'),
             'tools_repo': 'https://hg.mozilla.org/build/tools',
-            'repo_repo': "https://git.mozilla.org/external/google/gerrit/git-repo.git",
+            'repo_repo': 'https://gerrit.googlesource.com/git-repo.git',
             'repo_rev': 'stable',
             'hgurl': 'https://hg.mozilla.org/',
         }
         default_config.update(config)
 
         config_options = config_options + self.default_config_options
 
         super(B2GBuildBaseScript, self).__init__(
@@ -396,17 +396,17 @@ class B2GBuildBaseScript(BuildbotMixin, 
                 manifest_filename = os.path.join(conf_dir, 'sources.xml')
                 self.info("Using manifest at %s" % manifest_filename)
                 have_gecko = True
             else:
                 # Checkout B2G and b2g-manifests. We'll do gecko later
                 b2g_manifest_branch = gecko_config.get('b2g_manifest_branch', 'master')
                 repos.append(
                     {'vcs': 'gittool',
-                     'repo': 'https://git.mozilla.org/b2g/b2g-manifest.git',
+                     'repo': 'https://github.com/mozilla-b2g/b2g-manifest',
                      'dest': os.path.join(dirs['work_dir'], 'b2g-manifest'),
                      'branch': b2g_manifest_branch},
                 )
                 manifest_filename = gecko_config.get('b2g_manifest', self.config['target'] + '.xml')
                 manifest_filename = os.path.join(dirs['work_dir'], 'b2g-manifest', manifest_filename)
                 self.vcs_checkout_repos(repos)
                 have_gecko = False