diff --git a/.builder/action/aws-c-http-test.sh b/.builder/action/aws-c-http-test.sh
index 0e21158f1..b81b69f5c 100644
--- a/.builder/action/aws-c-http-test.sh
+++ b/.builder/action/aws-c-http-test.sh
@@ -2,8 +2,18 @@ PROXY_SETUP=/tmp/setup_proxy_test_env.sh
 if [ -f "$PROXY_SETUP" ]; then
     source $PROXY_SETUP
     export AWS_PROXY_NO_VERIFY_PEER=on
-    echo "setting proxy integration test envrionment"
+    echo "setting proxy integration test environment"
+fi
+
+if [ -d "./build/aws-c-http/" ]; then
+    # This is the directory (relative to repo root) that will contain the build when the repo is built directly by the
+    # builder
+    cd ./build/aws-c-http/
+elif [ -d "../../aws-c-http" ]; then
+    # This is the directory (relative to repo root) that will contain the build when the repo is built as an upstream
+    # consumer
+    cd ../../aws-c-http
 fi
 
-cd ./build/aws-c-http/
 ctest --output-on-failure
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0b61da7a7..50000da88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
     - name: Build ${{ env.PACKAGE_NAME }}
       run: |
         aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
-        ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} downstream
+        ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build downstream -p ${{ env.PACKAGE_NAME }}
 
   linux-compiler-compat:
     runs-on: ubuntu-latest
@@ -56,7 +56,7 @@ jobs:
       - name: Build ${{ env.PACKAGE_NAME }}
         run: |
           aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
-          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --spec downstream
+          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }}
 
   clang-sanitizers:
     runs-on: ubuntu-latest
@@ -86,7 +86,7 @@ jobs:
       - name: Build ${{ env.PACKAGE_NAME }}
         run: |
           aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
-          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON downstream
+          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON
 
   windows:
     runs-on: windows-latest
@@ -122,6 +122,6 @@ jobs:
       run: |
         python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
         chmod a+x builder
-        ./builder build -p ${{ env.PACKAGE_NAME }} downstream
+        ./builder build downstream -p ${{ env.PACKAGE_NAME }}