--- a/mozilla-tests/production_addon_config.py
+++ b/mozilla-tests/production_addon_config.py
@@ -9,17 +9,17 @@ SLAVES = {
     'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,4)]),
 }
 
 SLAVES['tegra_android-xul'] = SLAVES['tegra_android']
 SLAVES['tegra_android-o'] = SLAVES['tegra_android']
 
 TRY_SLAVES = {}
 
-GRAPH_CONFIG = ['--resultsServer', 'graphs-old.mozilla.org',
+GRAPH_CONFIG = ['--resultsServer', 'graphs.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'build_tools_repo_path': 'build/tools',
     'stage_server': 'stage.mozilla.org',
     'stage_username': 'ffxbld',
     'stage_ssh_key': 'ffxbld_dsa',
 }

--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -14,17 +14,17 @@ SLAVES = {
 }
 
 SLAVES['leopard-o'] = SLAVES['leopard']
 SLAVES['tegra_android-xul'] = SLAVES['tegra_android']
 SLAVES['tegra_android-o'] = SLAVES['tegra_android']
 
 TRY_SLAVES = {}
 
-GRAPH_CONFIG = ['--resultsServer', 'graphs-old.mozilla.org',
+GRAPH_CONFIG = ['--resultsServer', 'graphs.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'disable_tinderbox_mail': True,
     'build_tools_repo_path': 'build/tools',
     'stage_server': 'stage.mozilla.org',
     'stage_username': 'ffxbld',
     'stage_ssh_key': 'ffxbld_dsa',

--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -52,17 +52,17 @@ TRY_SLAVES = {
 # Local overrides for default values
 GLOBAL_VARS = {
     'config_repo_path': 'build/buildbot-configs',
     'buildbotcustom_repo_path': 'build/buildbotcustom',
     'stage_server': 'stage.mozilla.org',
     'aus2_host': 'aus2-staging.mozilla.org',
     'download_base_url': 'http://ftp.mozilla.org/pub/mozilla.org/firefox',
     'mobile_download_base_url': 'http://ftp.mozilla.org/pub/mozilla.org/mobile',
-    'graph_server': 'graphs-old.mozilla.org',
+    'graph_server': 'graphs.mozilla.org',
     'build_tools_repo_path': 'build/tools',
     'base_clobber_url': 'http://build.mozilla.org/clobberer/index.php',
     'disable_tinderbox_mail': True,
     # List of talos masters to notify of new builds,
     # and if a failure to notify the talos master should result in a warning,
     # and sendchange retry count before give up
     'talos_masters': [
         ('buildbot-master10.build.mozilla.org:9301', True, 5),

--- a/talos-pool/config.py
+++ b/talos-pool/config.py
@@ -1,11 +1,11 @@
 from buildbot.steps.shell import WithProperties
 
-GRAPH_CONFIG = ['--resultsServer', 'graphs-old.mozilla.org',
+GRAPH_CONFIG = ['--resultsServer', 'graphs.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 TALOS_CMD = ['python', 'run_tests.py', '--noisy', WithProperties('%(configFile)s')]
 
 TALOS_DIRTY_OPTS = {'talosAddOns': ['profiles/dirtyDBs.zip', 'profiles/dirtyMaxDBs.zip']}
 
 TALOS_TP4_OPTS = {'plugins': 'zips/plugins.zip', 'pageset': 'zips/pagesets.zip'}