diff --git a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
index 59670f5d9a3..099f2c82a25 100644
--- a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
@@ -210,7 +210,7 @@ $ssh_version   = "2";
 $ssh_user      = "cltbld";
 #$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 # CONFIG: $ssh_server    = "%sshServer%";
-$ssh_server    = "production-1.8-master.build.mozilla.org";
+$ssh_server    = "stage.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 0b3a99b1692..299b363f2ba 100644
--- a/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
@@ -210,7 +210,7 @@ $ssh_version   = 2;
 $ssh_user      = "cltbld";
 #$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 # CONFIG: $ssh_server    = "%sshServer%";
-$ssh_server    = "production-1.8-master.build.mozilla.org";
+$ssh_server    = "stage.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 69c46e43e50..6d0aaf7e0f2 100644
--- a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
@@ -203,7 +203,7 @@ $ssh_version   = "2";
 $ssh_user      = "cltbld";
 #$ssh_key       = "'$ENV{HOME}/.ssh/ffxbld_dsa'";
 # CONFIG: $ssh_server    = "%sshServer%";
-$ssh_server    = "production-1.8-master.build.mozilla.org";
+$ssh_server    = "stage.mozilla.org";
 #$ReleaseGroup  = "firefox";
 $ftp_path      = "/home/ftp/pub/firefox/nightly";
 $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly";