diff --git a/sysmocom-upload-bsc.sh b/sysmocom-upload-bsc-v1.sh
similarity index 92%
rename from sysmocom-upload-bsc.sh
rename to sysmocom-upload-bsc-v1.sh
index 49c27fd50b..adc3e50ac7 100755
--- a/sysmocom-upload-bsc.sh
+++ b/sysmocom-upload-bsc-v1.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ `pwd` != '/home/sysmocom/generic-poky/build.sysmobsc' ]; then
+if [ `pwd` != '/home/yoctopyrobuild/build.sysmobsc-v1' ]; then
 	echo "Must be called from the sysmoBSC build directory"
 	exit 0
 fi
diff --git a/sysmocom-upload-bsc-v2.sh b/sysmocom-upload-bsc-v2.sh
new file mode 100755
index 0000000000..09363b6056
--- /dev/null
+++ b/sysmocom-upload-bsc-v2.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ `pwd` != '/home/yoctopyrobuild/build.sysmobsc-v2' ]; then
+	echo "Must be called from the sysmoBSC build directory"
+	exit 0
+fi
+
+rsync --delete -avz tmp/deploy/ipk/    generic@sysmocom-downloads:sysmobsc-v2/201705-testing/ipk
+rsync --delete -avz tmp/deploy/images/ generic@sysmocom-downloads:sysmobsc-v2/201705-testing/images
+rsync --delete -avz tmp/deploy/tools/  generic@sysmocom-downloads:sysmobsc-v2/201705-testing/tools
+rsync --delete -avz tmp/deploy/sdk/    generic@sysmocom-downloads:sysmobsc-v2/201705-testing/sdk
+rsync --delete -avz tmp/cache/    generic@sysmocom-downloads:sysmobsc-v2/201705-testing/cache-state
+rsync --delete -avz cache/    generic@sysmocom-downloads:sysmobsc-v2/201705-testing/cache
+rsync --delete -avz conf/    generic@sysmocom-downloads:sysmobsc-v2/201705-testing/conf
+rsync -avz tmp/deploy/sources/  generic@sysmocom-downloads:sysmobsc-v2/201705-testing/sources
+
diff --git a/sysmocom-upload-bts.sh b/sysmocom-upload-bts.sh
index d9f6aae714..640e357a29 100755
--- a/sysmocom-upload-bts.sh
+++ b/sysmocom-upload-bts.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ `pwd` != '/home/sysmocom/generic-poky/build' ]; then
+if [ `pwd` != '/home/yoctopyrobuild/build.sysmobts' ]; then
 	echo "Must be called from the sysmoBTS build directory"
 	exit 0
 fi