diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index b218fa0e..b60f17e8 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -33,7 +33,7 @@ update_symlinks() {
 
 upload() {
 	echo Uploading "$@"
-	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@nightheron.gentoo.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@releng-incoming.gentoo.org:
 }
 
 post_build() {
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 37e01bd1..a2f2cec6 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -75,8 +75,8 @@ post_build() {
 			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
 			;;
 		*)
-			DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+			DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+			DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
 			;;
 	esac
 	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index c2e0c8b1..ab2ac660 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -76,8 +76,8 @@ post_build() {
 			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
 			;;
 		*)
-			DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+			DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+			DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
 			;;
 	esac
 	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 0d1506a4..004560a0 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -29,7 +29,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@nightheron.gentoo.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@releng-incoming.gentoo.org:
 }
 
 post_build() {
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index fa20b5ca..662b2895 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -30,5 +30,5 @@ update_symlinks() {
 
 
 post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
 }
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 79975984..ffb6d34e 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -30,5 +30,5 @@ update_symlinks() {
 
 
 post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
 }
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 0db433fa..d30f4147 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -30,5 +30,5 @@ update_symlinks() {
 
 
 post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
 }
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index ca12d89d..46e9e9cf 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
 
 
 post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
 }
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 1b13c6b5..34ecd6c5 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -30,5 +30,5 @@ update_symlinks() {
 
 
 post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
 }
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index c3037712..9bc947e9 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
 
 
 post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
 }
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 5444cc4e..4b13e28b 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -33,7 +33,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@nightheron.gentoo.org:
+	rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@releng-incoming.gentoo.org:
 }
 
 post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b3328ed3..13258032 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -26,7 +26,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@nightheron.gentoo.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@releng-incoming.gentoo.org:
 }
 
 post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 59572644..ddf661c0 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -32,7 +32,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@releng-incoming.gentoo.org:
 }
  
 post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 76e1bdf5..04abc577 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -31,7 +31,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@releng-incoming.gentoo.org:
 }
 
 post_build() {
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index b48c7536..a15df683 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -26,7 +26,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@releng-incoming.gentoo.org:
 }
 
 post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index c9f3f7e9..1141b3b9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -26,7 +26,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@releng-incoming.gentoo.org:
 }
 
 post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 0eeaddd6..18cbfb9d 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -28,7 +28,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@nightheron.gentoo.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@releng-incoming.gentoo.org:
 }
 
 post_build() {
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 2373041e..5d147ab8 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -54,8 +54,8 @@ post_build() {
 			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
 			;;
 		*)
-			DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+			DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+			DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
 			;;
 	esac
 	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 52f07b12..bdd9fe35 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -62,8 +62,8 @@ post_build() {
 			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
 			;;
 		*)
-			DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+			DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+			DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
 			;;
 	esac
 	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null