diff --git a/contrib/build-server/hwloc-nightly-tarball.sh b/contrib/build-server/hwloc-nightly-tarball.sh
index 2a0ff10371..5cb68e9b1b 100755
--- a/contrib/build-server/hwloc-nightly-tarball.sh
+++ b/contrib/build-server/hwloc-nightly-tarball.sh
@@ -17,6 +17,9 @@ raw_uri=https://raw.github.com/open-mpi/hwloc
 # where to put built tarballs
 outputroot=$HOME/hwloc/nightly
 
+# Target where to scp the final tarballs
+output_ssh_target=ompiteam@192.185.39.252
+
 # where to find the build script
 script_uri=contrib/nightly/make_snapshot_tarball
 
@@ -111,13 +114,23 @@ for branch in $branches; do
         fi
         echo "=== Posting tarball to open-mpi.org"
         # tell the web server to cleanup old nightly tarballs
-        ssh -p 2222 ompiteam@192.185.39.252 "git/ompi/contrib/build-server/remove-old.pl 7 public_html/software/hwloc/nightly/$branch"
+        ssh -p 2222 \
+	    $output_ssh_target \
+	    "git/ompi/contrib/build-server/remove-old.pl 7 public_html/software/hwloc/nightly/$branch"
         # upload the new ones
-        scp -P 2222 $outputroot/$branch/hwloc-$latest_snapshot.tar.* ompiteam@192.185.39.252:public_html/software/hwloc/nightly/$branch/
-        scp -P 2222 $outputroot/$branch/latest_snapshot.txt ompiteam@192.185.39.252:public_html/software/hwloc/nightly/$branch/
+        scp -P 2222 \
+	    $outputroot/$branch/hwloc-$latest_snapshot.tar.* \
+	    $output_ssh_target:public_html/software/hwloc/nightly/$branch/
+        scp -P 2222 \
+	    $outputroot/$branch/latest_snapshot.txt \
+	    $output_ssh_target:public_html/software/hwloc/nightly/$branch/
         # direct the web server to regenerate the checksums
-        ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/hwloc/nightly/$branch && md5sum hwloc* > md5sums.txt"
-        ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/hwloc/nightly/$branch && sha1sum hwloc* > sha1sums.txt"
+        ssh -p 2222 \
+	    $output_ssh_target \
+	    "cd public_html/software/hwloc/nightly/$branch && md5sum hwloc* > md5sums.txt"
+        ssh -p 2222 \
+	    $output_ssh_target \
+	    "cd public_html/software/hwloc/nightly/$branch && sha1sum hwloc* > sha1sums.txt"
     fi
 
     # Failed builds are not removed.  But if a human forgets to come
diff --git a/contrib/build-server/openmpi-nightly-tarball.sh b/contrib/build-server/openmpi-nightly-tarball.sh
index decdd2fa01..b2eb35cebf 100755
--- a/contrib/build-server/openmpi-nightly-tarball.sh
+++ b/contrib/build-server/openmpi-nightly-tarball.sh
@@ -18,6 +18,9 @@ master_raw_uri=https://raw.github.com/open-mpi/ompi
 # adjusted to match your site!
 outputroot=$HOME/openmpi/nightly
 
+# Target where to scp the final tarballs
+output_ssh_target=ompiteam@192.185.39.252
+
 # where to find the build script
 script_uri=contrib/nightly/create_tarball.sh
 
@@ -116,13 +119,23 @@ for branch in $branches; do
         fi
         echo "=== Posting tarball to open-mpi.org"
         # tell the web server to cleanup old nightly tarballs
-        ssh -p 2222 ompiteam@192.185.39.252 "git/ompi/contrib/build-server/remove-old.pl 7 public_html/nightly/$branch"
+        ssh -p 2222 \
+	    $output_ssh_target \
+	    "git/ompi/contrib/build-server/remove-old.pl 7 public_html/nightly/$branch"
         # upload the new ones
-        scp -P 2222 $outputroot/$branch/openmpi-$latest_snapshot.tar.* ompiteam@192.185.39.252:public_html/nightly/$branch/
-        scp -P 2222 $outputroot/$branch/latest_snapshot.txt ompiteam@192.185.39.252:public_html/nightly/$branch/
+        scp -P 2222 \
+	    $outputroot/$branch/openmpi-$latest_snapshot.tar.* \
+	    $output_ssh_target:public_html/nightly/$branch/
+        scp -P 2222 \
+	    $outputroot/$branch/latest_snapshot.txt \
+	    $output_ssh_target:public_html/nightly/$branch/
         # direct the web server to regenerate the checksums
-        ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/nightly/$branch && md5sum openmpi* > md5sums.txt"
-        ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/nightly/$branch && sha1sum openmpi* > sha1sums.txt"
+        ssh -p 2222 \
+	    $output_ssh_target \
+	    "cd public_html/nightly/$branch && md5sum openmpi* > md5sums.txt"
+        ssh -p 2222 \
+	    $output_ssh_target \
+	    "cd public_html/nightly/$branch && sha1sum openmpi* > sha1sums.txt"
     fi
 
     # Failed builds are not removed.  But if a human forgets to come
diff --git a/contrib/build-server/pmix-nightly-tarball.sh b/contrib/build-server/pmix-nightly-tarball.sh
index f347eddfc8..bf95d60ff6 100755
--- a/contrib/build-server/pmix-nightly-tarball.sh
+++ b/contrib/build-server/pmix-nightly-tarball.sh
@@ -19,6 +19,9 @@ release_raw_uri=https://raw.github.com/pmix/releases
 # where to put built tarballs
 outputroot=$HOME/pmix/nightly
 
+# Target where to scp the final tarballs
+output_ssh_target=ompiteam@192.185.39.252
+
 # where to find the build script
 script_uri=contrib/nightly/create_tarball.sh
 
@@ -121,13 +124,23 @@ for branch in $branches; do
         fi
         echo "=== Posting tarball to open-mpi.org"
         # tell the web server to cleanup old nightly tarballs
-        ssh -p 2222 ompiteam@192.185.39.252 "git/ompi/contrib/build-server/remove-old.pl 7 public_html/software/pmix/nightly/$branch"
+        ssh -p 2222 \
+	    $output_ssh_target \
+	    "git/ompi/contrib/build-server/remove-old.pl 7 public_html/software/pmix/nightly/$branch"
         # upload the new ones
-        scp -P 2222 $outputroot/$branch/pmix-$latest_snapshot.tar.* ompiteam@192.185.39.252:public_html/software/pmix/nightly/$branch/
-        scp -P 2222 $outputroot/$branch/latest_snapshot.txt ompiteam@192.185.39.252:public_html/software/pmix/nightly/$branch/
+        scp -P 2222 \
+	    $outputroot/$branch/pmix-$latest_snapshot.tar.* \
+	    $output_ssh_target:public_html/software/pmix/nightly/$branch/
+        scp -P 2222 \
+	    $outputroot/$branch/latest_snapshot.txt \
+	    $output_ssh_target:public_html/software/pmix/nightly/$branch/
         # direct the web server to regenerate the checksums
-        ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/pmix/nightly/$branch && md5sum pmix* > md5sums.txt"
-        ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/pmix/nightly/$branch && sha1sum pmix* > sha1sums.txt"
+        ssh -p 2222 \
+	    $output_ssh_target \
+	    "cd public_html/software/pmix/nightly/$branch && md5sum pmix* > md5sums.txt"
+        ssh -p 2222 \
+	    $output_ssh_target \
+	    "cd public_html/software/pmix/nightly/$branch && sha1sum pmix* > sha1sums.txt"
     fi
 
     # Failed builds are not removed.  But if a human forgets to come