diff --git a/mozilla/tools/release/configs/fx-moz18-nightly-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz18-nightly-bootstrap.cfg
index b5a6603ecc2..58e1cd0f051 100644
--- a/mozilla/tools/release/configs/fx-moz18-nightly-bootstrap.cfg
+++ b/mozilla/tools/release/configs/fx-moz18-nightly-bootstrap.cfg
@@ -69,7 +69,7 @@ ausServer       = aus2-staging.mozilla.org
 buildTree       = Mozilla1.8
 # where QA updates/builds go
 stagingUser     = cltbld
-stagingServer   = stage.mozilla.org
+stagingServer   = stage-old.mozilla.org
 externalStagingUser     = cltbld
 externalStagingServer   = ftp.mozilla.org
 # where beta updates/builds go
@@ -78,7 +78,7 @@ ftpServer       = ftp.mozilla.org
 bouncerServer   = download.mozilla.org
 # username and server to push builds
 sshUser         = ffxbld
-sshServer       = stage.mozilla.org
+sshServer       = stage-old.mozilla.org
 useTalkback     = 0
 symbolServer     = production-1.8-master.mozilla.org
 symbolServerUser = cltbld
diff --git a/mozilla/tools/release/configs/fx-moz19-nightly-bootstrap.cfg b/mozilla/tools/release/configs/fx-moz19-nightly-bootstrap.cfg
index 175e998badb..c92aea26dde 100644
--- a/mozilla/tools/release/configs/fx-moz19-nightly-bootstrap.cfg
+++ b/mozilla/tools/release/configs/fx-moz19-nightly-bootstrap.cfg
@@ -68,7 +68,7 @@ ausServerUrl      = https://aus2.mozilla.org
 buildTree       = Firefox
 # where QA updates/builds go
 stagingUser     = cltbld
-stagingServer   = stage.mozilla.org
+stagingServer   = stage-old.mozilla.org
 externalStagingUser     = cltbld
 externalStagingServer   = ftp.mozilla.org
 # where beta updates/builds go
@@ -77,10 +77,10 @@ ftpServer       = ftp.mozilla.org
 bouncerServer   = download.mozilla.org
 # username and server to push builds
 sshUser         = ffxbld
-sshServer       = stage.mozilla.org
+sshServer       = stage-old.mozilla.org
 useTalkback     = 0
 # symbol server variables
-symbolServer     = stage.mozilla.org
+symbolServer     = stage-old.mozilla.org
 symbolServerUser = ffxbld
 symbolServerPath = /mnt/netapp/breakpad/symbols_ffx
 win32_symbolServerKey  = /c/Documents and Settings/cltbld/.ssh/ffxbld_dsa
diff --git a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
index 765b336d92d..7af08214575 100644
--- a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
@@ -209,7 +209,7 @@ $ssh_version   = "2";
 $ssh_user      = "ffxbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 # CONFIG: $ssh_server    = "%sshServer%";
-$ssh_server    = "stage.mozilla.org";
+$ssh_server    = "stage-old.mozilla.org";
 $ReleaseGroup  = "firefox";
 $ftp_path      = "/home/ftp/pub/firefox/nightly";
 $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly";
diff --git a/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
index ca7f5c48136..82649b9c11d 100644
--- a/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
@@ -209,7 +209,7 @@ $ssh_version   = "2";
 $ssh_user      = "ffxbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 # CONFIG: $ssh_server    = "%sshServer%";
-$ssh_server    = "stage.mozilla.org";
+$ssh_server    = "stage-old.mozilla.org";
 $ReleaseGroup  = "firefox";
 $ftp_path      = "/home/ftp/pub/firefox/nightly";
 $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly";
diff --git a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
index e585d1f9c4b..c4938b8996e 100644
--- a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
@@ -204,7 +204,7 @@ $ssh_version   = "2";
 $ssh_user      = "ffxbld";
 $ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 # CONFIG: $ssh_server    = "%sshServer%";
-$ssh_server    = "stage.mozilla.org";
+$ssh_server    = "stage-old.mozilla.org";
 $ReleaseGroup  = "firefox";
 $ftp_path      = "/home/ftp/pub/firefox/nightly";
 $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly";