diff --git a/.github/workflows/ci-nightly.yml b/.github/workflows/ci-nightly.yml
index f1bb05ac28..a1c30a3864 100644
--- a/.github/workflows/ci-nightly.yml
+++ b/.github/workflows/ci-nightly.yml
@@ -302,6 +302,7 @@ jobs:
       E2E_TEST_FILTER: SCRIPTS
       CI_PLATFORM: ${{ matrix.platform }}
       CI_KEEP_TEMP_PLATFORM: "ubuntu-24.04"
+      S3_TESTDATA: ${{ secrets.S3_TESTDATA }}
     steps:
       - name: Download workspace archive
         uses: actions/download-artifact@v4
@@ -406,7 +407,7 @@ jobs:
             }
 
   upload:
-    needs: [verify_nightly]
+    needs: [verify_nightly, e2e_subs_nightly]
     strategy:
       matrix:
         platform: ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-14"]
diff --git a/scripts/travis/deploy_packages.sh b/scripts/travis/deploy_packages.sh
index 8eae9307b4..1f188721b7 100755
--- a/scripts/travis/deploy_packages.sh
+++ b/scripts/travis/deploy_packages.sh
@@ -29,6 +29,8 @@ if [ "${NIGHTLY_BUILD}" == "true" ]; then
     if [ "${OSARCH}" == "darwin/arm64" ]; then
         ./scripts/travis/build.sh --make_universal
         OSARCH="darwin/universal"
+    else
+        scripts/travis/build.sh --make_debug
     fi
     NO_BUILD=true
 fi
diff --git a/test/scripts/e2e.sh b/test/scripts/e2e.sh
index e163e489ce..c1ecc2a289 100755
--- a/test/scripts/e2e.sh
+++ b/test/scripts/e2e.sh
@@ -7,6 +7,8 @@ set -e
 # Suppress telemetry reporting for tests
 export ALGOTEST=1
 
+S3_TESTDATA=${S3_TESTDATA:-algorand-testdata}
+
 SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
 
 SRCROOT="$(pwd -P)"
@@ -205,8 +207,8 @@ if [ -z "$E2E_TEST_FILTER" ] || [ "$E2E_TEST_FILTER" == "SCRIPTS" ]; then
         tar -j -c -f "${CI_E2E_FILENAME}.tar.bz2" --exclude node.log --exclude agreement.cdv net
         rm -rf "${TEMPDIR}/net"
         RSTAMP=$(TZ=UTC python -c 'import time; print("{:08x}".format(0xffffffff - int(time.time() - time.mktime((2020,1,1,0,0,0,-1,-1,-1)))))')
-        echo aws s3 cp --acl public-read "${TEMPDIR}/${CI_E2E_FILENAME}.tar.bz2" "s3://algorand-testdata/indexer/e2e4/${RSTAMP}/${CI_E2E_FILENAME}.tar.bz2"
-        aws s3 cp --acl public-read "${TEMPDIR}/${CI_E2E_FILENAME}.tar.bz2" "s3://algorand-testdata/indexer/e2e4/${RSTAMP}/${CI_E2E_FILENAME}.tar.bz2"
+        echo aws s3 cp --acl public-read "${TEMPDIR}/${CI_E2E_FILENAME}.tar.bz2" "s3://${S3_TESTDATA}/indexer/e2e4/${RSTAMP}/${CI_E2E_FILENAME}.tar.bz2"
+        aws s3 cp --acl public-read "${TEMPDIR}/${CI_E2E_FILENAME}.tar.bz2" "s3://${S3_TESTDATA}/indexer/e2e4/${RSTAMP}/${CI_E2E_FILENAME}.tar.bz2"
         popd
     fi