diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index afb42f27fbc..a12e6f6761a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -385,9 +385,10 @@ jobs:
           PACKAGE_VERSION: ${{ needs.build.outputs.version }}
         with:
           max_attempts: 7
-          retry_on: error
           timeout_minutes: 5
           command: |
+            set -o pipefail
+
             cd dist
             PACKAGES=("@winglang/sdk" "@winglang/compiler" "@wingconsole/design-system" "@wingconsole/ui" "@wingconsole/server" "@wingconsole/app" "winglang")
             for PACKAGE in "${PACKAGES[@]}"; do
@@ -402,6 +403,11 @@ jobs:
               TARBALL=$(echo "$PACKAGE-$PACKAGE_VERSION.tgz" | sed 's/@//g' | sed 's/\//-/g')
 
               npm publish "$TARBALL" --access public --verbose
+
+              if [ $? -ne 0 ]; then
+                echo "Publishing $PACKAGE failed, exiting"
+                exit 1
+              fi
             done
 
       - name: Publish Extension to Visual Studio Marketplace
diff --git a/.github/workflows/tf-aws-test.yml b/.github/workflows/tf-aws-test.yml
index bbf37c389fe..3e64eb51344 100644
--- a/.github/workflows/tf-aws-test.yml
+++ b/.github/workflows/tf-aws-test.yml
@@ -64,6 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+      max-parallel: 10
       matrix: ${{ fromJson(needs.setup.outputs.tests) }}
     name: ${{ matrix.test.name }}
     steps: