diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 203abe81..0f0eae34 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -47,7 +47,6 @@ Options:
   --interval <days>   Exit if last successful run was less than <days> ago
   -l|--lock <file>    File to grab a lock on to prevent multiple invocations
   -X|--nonetwork      Do not perform network operations (like uploading result)
-                      This needs to be supported by the config file as well.
   -h|--help           Show this message and quit
 
 EOH
@@ -270,6 +269,29 @@ verify_dnssec() {
     fi
 }
 
+upload() {
+	if [[ ${nonetwork} == 0 ]]; then
+		echo Uploading "$@"
+		local SSH_CMD=(
+			ssh
+			-i ${UPLOAD_KEY}
+			-o UserKnownHostsFile=/dev/null
+			-o VerifyHostKeyDNS=yes
+			-o StrictHostKeyChecking=no
+		)
+		local RSYNC_OPTS=(
+			-e "${SSH_CMD[*]}"
+			--archive
+			--omit-dir-times
+			--delay-updates
+		)
+		rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
+	else
+		echo Would now upload "$@"
+		ls -l $@
+	fi
+}
+
 run_catalyst_commands() {
 	doneconfig=0
 	for config_file in "${config_files[@]}"; do
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index c2359f59..f755c9b5 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -33,24 +33,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	echo Uploading "$@"
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 0b07c988..b14013f7 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -65,24 +65,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	echo " ** Uploading $@"
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index b15d3569..829ff4c5 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -54,29 +54,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-    if [[ ${nonetwork} == 0 ]]; then
-	echo Uploading "$@"
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-    else
-	echo Would now upload "$@"
-	ls -l $@
-    fi
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index c14cb56b..5346153f 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -28,23 +28,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index d93a1370..8ad8f767 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -34,23 +34,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 852be0d4..009d5fd9 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -27,23 +27,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 68f49290..3a81822e 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -32,23 +32,6 @@ update_symlinks() {
 		popd >/dev/null
 	done
 }
-
-upload() {
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
  
 post_build() {
 	local set=$1 spec=$2
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index ecd4a738..a93975ca 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -34,23 +34,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 68b51a2d..0e2d7826 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -55,29 +55,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-    if [[ ${nonetwork} == 0 ]]; then
-	echo Uploading "$@"
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-    else
-	echo Would now upload "$@"
-	ls -l $@
-    fi
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index ce73642b..e809b598 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -42,26 +42,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-    if [[ ${nonetwork} == 0 ]]; then
-	echo Uploading "$@"
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-    fi
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 11bdf6cc..15b5382b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -27,23 +27,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 1a5ea91d..5a351358 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -27,23 +27,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 77dd62ee..668971db 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -29,23 +29,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2
 
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index bb779d7e..5822d992 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -52,24 +52,6 @@ update_symlinks() {
 	done
 }
 
-upload() {
-	echo " ** Uploading $@"
-	local SSH_CMD=(
-		ssh
-		-i ${UPLOAD_KEY}
-		-o UserKnownHostsFile=/dev/null
-		-o VerifyHostKeyDNS=yes
-		-o StrictHostKeyChecking=no
-	)
-	local RSYNC_OPTS=(
-		-e "${SSH_CMD[*]}"
-		--archive
-		--omit-dir-times
-		--delay-updates
-	)
-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
 	local set=$1 spec=$2