diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 53dac821..eeaaf01c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -92,35 +92,41 @@ post_build() {
 		--delay-updates
 	)
 	case $HOSTNAME in
-		nightheron) DEST=${BUILD_DESTDIR_BASE} ;;
-		*) DEST=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} ;;
+		nightheron)
+			DEST_DEFAULT=${BUILD_DESTDIR_BASE}
+			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
+			;;
 	esac
 	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
 	mkdir -p ${TMPDIR}/empty
-	"${cmd[@]}" ${TMPDIR}/empty ${DEST}
+	"${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			"${cmd[@]}" ${file}* ${DEST}
+			"${cmd[@]}" ${file}* ${DEST_DEFAULT}
 		fi
 	done
 	if [ -f *${DATESTAMP}*.iso ]; then
-		"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}
+		"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
 	elif [ -f *${TIMESTAMP}*.iso ]; then
-		"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}
+		"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
 	fi
 	popd >/dev/null
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
-	"${cmd[@]}" ${TMPDIR}/empty ${DEST}/hardened
+	"${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			"${cmd[@]}" $file* ${DEST}/hardened
+			"${cmd[@]}" $file* ${DEST_HARDENED}
 		fi
 	done
 	if [ -f *${DATESTAMP}*.iso ]; then
-		"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}/hardened
+		"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
 	elif [ -f *${TIMESTAMP}*.iso ]; then
-		"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}/hardened
+		"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
 	fi
 }
 
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 6ec010ce..5398ba10 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -63,35 +63,41 @@ post_build() {
 		--delay-updates
 	)
 	case $HOSTNAME in
-		nightheron) DEST=${BUILD_DESTDIR_BASE} ;;
-		*) DEST=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} ;;
+		nightheron)
+			DEST_DEFAULT=${BUILD_DESTDIR_BASE}
+			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
+			;;
 	esac
 	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
 	mkdir -p ${TMPDIR}/empty
-	"${cmd[@]}" ${TMPDIR}/empty ${DEST}
+	"${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
 	for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			"${cmd[@]}" ${file}* ${DEST}
+			"${cmd[@]}" ${file}* ${DEST_DEFAULT}
 		fi
 	done
 	if [ -f *${DATESTAMP}*.iso ]; then
-		"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}
+		"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
 	elif [ -f *${TIMESTAMP}*.iso ]; then
-		"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}
+		"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
 	fi
 	popd >/dev/null
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
-	"${cmd[@]}" ${TMPDIR}/empty ${DEST}/hardened
+	"${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
 	for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			"${cmd[@]}" $file* ${DEST}/hardened
+			"${cmd[@]}" $file* ${DEST_HARDENED}
 		fi
 	done
 	if [ -f *${DATESTAMP}*.iso ]; then
-		"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}/hardened
+		"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDEND}
 	elif [ -f *${TIMESTAMP}*.iso ]; then
-		"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}/hardened
+		"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
 	fi
 }