diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 904ae5318b7..615f201f7d9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -83,10 +83,12 @@ jobs:
       shell: bash
       run: |
         # Get latest stable release. Return only first column from result (tag).
-        LAST_VERSION=$(gh release view --repo pulumi/pulumi-aws --json tagName -q .tagName)
+        LAST_VERSION=$(gh release view --repo pulumi/pulumi-aws --json tagName -q .tagName || echo "No stable release" )
         {
           echo 'summary<<EOF'
-          schema-tools compare --provider="aws" --old-commit="$LAST_VERSION" --new-commit="--local-path=provider/cmd/pulumi-resource-aws/schema.json"
+          if [[ "$LAST_VERSION" != "No stable release" ]]; then
+            schema-tools compare --provider="aws" --old-commit="$LAST_VERSION" --new-commit="--local-path=provider/cmd/pulumi-resource-aws/schema.json"
+          fi
           echo 'EOF'
         } >> "$GITHUB_OUTPUT"
     - name: Upload Provider Binaries
diff --git a/upstream.sh b/upstream.sh
index b3d09931dca..f5609ac627a 100755
--- a/upstream.sh
+++ b/upstream.sh
@@ -186,6 +186,8 @@ init() {
   fi
 
   git submodule update --force --init
+  cd upstream && git clean -fxd && cd ..
+
   if [[ "${force}" == "true" ]]; then
     clean_rebases
     clean_branches