diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 0035665b..60bd21c9 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -108,7 +108,7 @@ jobs:
         allowed-changes: |
           sdk/**/pulumi-plugin.json
           sdk/dotnet/Pulumi.*.csproj
-          sdk/go/*/internal/pulumiUtilities.go
+          sdk/go/**/pulumiUtilities.go
           sdk/nodejs/package.json
           sdk/python/pyproject.toml
     - name: Compress SDK folder
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index bfe494b4..ecd0cc42 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -109,7 +109,7 @@ jobs:
         allowed-changes: |
           sdk/**/pulumi-plugin.json
           sdk/dotnet/Pulumi.*.csproj
-          sdk/go/*/internal/pulumiUtilities.go
+          sdk/go/**/pulumiUtilities.go
           sdk/nodejs/package.json
           sdk/python/pyproject.toml
     - name: Compress SDK folder
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 230fd370..a5de7e55 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -49,5 +49,3 @@ jobs:
 name: pull-request
 on:
   pull_request_target: {}
-
-
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 610ed40a..3ca64103 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -108,7 +108,7 @@ jobs:
         allowed-changes: |
           sdk/**/pulumi-plugin.json
           sdk/dotnet/Pulumi.*.csproj
-          sdk/go/*/internal/pulumiUtilities.go
+          sdk/go/**/pulumiUtilities.go
           sdk/nodejs/package.json
           sdk/python/pyproject.toml
     - name: Compress SDK folder
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index 2ac44a78..927a0904 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -118,7 +118,7 @@ jobs:
         allowed-changes: |
           sdk/**/pulumi-plugin.json
           sdk/dotnet/Pulumi.*.csproj
-          sdk/go/*/internal/pulumiUtilities.go
+          sdk/go/**/pulumiUtilities.go
           sdk/nodejs/package.json
           sdk/python/pyproject.toml
     - name: Compress SDK folder
@@ -294,6 +294,18 @@ jobs:
     - name: Workflow is not a success
       if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped')
       run: exit 1
+    - uses: guibranco/github-status-action-v2@0849440ec82c5fa69b2377725b9b7852a3977e76
+      with: 
+        authToken: ${{secrets.GITHUB_TOKEN}}
+        # Write an explicit status check called "Sentinel" which will only pass if this code really runs.
+        # Once rolled out, we can make this the only required check for PRs,
+        # then remove the old conditionals on this job and remove the previous step.
+        context: 'Sentinel'
+        description: 'All required checks passed'
+        state: 'success'
+        # Write to the PR commit SHA if it's available as we don't want the merge commit sha,
+        # otherwise use the current SHA for any other type of build.
+        sha: ${{ github.event.pull_request.head.sha || github.sha }}
     - name: Workflow is a success
       run: echo "🎉🎈🎉🎈🎉"
 
diff --git a/Makefile b/Makefile
index dc2aab28..ff19f342 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,6 @@ install_sdks: install_dotnet_sdk install_python_sdk install_nodejs_sdk install_j
 
 only_build: build
 
-build_dotnet: DOTNET_VERSION := $(shell pulumictl convert-version --language dotnet -v "$(VERSION_GENERIC)")
 build_dotnet: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
 build_dotnet: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
 build_dotnet: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache
@@ -44,7 +43,7 @@ build_dotnet: upstream
 	cd sdk/dotnet/ && \
 		printf "module fake_dotnet_module // Exclude this directory from Go tools\n\ngo 1.17\n" > go.mod && \
 		echo "$(VERSION_GENERIC)" >version.txt && \
-		dotnet build /p:Version=$(DOTNET_VERSION)
+		dotnet build
 
 build_go: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
 build_go: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
@@ -64,7 +63,6 @@ build_java: bin/pulumi-java-gen upstream
 		gradle --console=plain build && \
 		gradle --console=plain javadoc
 
-build_nodejs: NODE_VERSION := $(shell pulumictl convert-version --language javascript -v "$(VERSION_GENERIC)")
 build_nodejs: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
 build_nodejs: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
 build_nodejs: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache
@@ -74,10 +72,8 @@ build_nodejs: upstream
 		printf "module fake_nodejs_module // Exclude this directory from Go tools\n\ngo 1.17\n" > go.mod && \
 		yarn install && \
 		yarn run tsc && \
-		cp ../../README.md ../../LICENSE* package.json yarn.lock ./bin/ && \
-		sed -i.bak -e "s/\$${VERSION}/$(NODE_VERSION)/g" ./bin/package.json
+		cp ../../README.md ../../LICENSE* package.json yarn.lock ./bin/
 
-build_python: PYPI_VERSION := $(shell pulumictl convert-version --language python -v "$(VERSION_GENERIC)")
 build_python: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
 build_python: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
 build_python: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache
@@ -88,8 +84,7 @@ build_python: upstream
 		printf "module fake_python_module // Exclude this directory from Go tools\n\ngo 1.17\n" > go.mod && \
 		cp ../../README.md . && \
 		rm -rf ./bin/ ../python.bin/ && cp -R . ../python.bin && mv ../python.bin ./bin && \
-		sed -i.bak -e 's/^  version = .*/  version = "$(PYPI_VERSION)"/g' ./bin/pyproject.toml && \
-		rm ./bin/pyproject.toml.bak && rm ./bin/go.mod && \
+		rm ./bin/go.mod && \
 		python3 -m venv venv && \
 		./venv/bin/python -m pip install build && \
 		cd ./bin && \
diff --git a/scripts/upstream.sh b/scripts/upstream.sh
index 7d35e3b6..d35932e0 100755
--- a/scripts/upstream.sh
+++ b/scripts/upstream.sh
@@ -79,17 +79,13 @@ start_rebase() {
   rm -rf .git/modules/upstream/rebase-merge
   cd upstream && git fetch
 
-  if [ -z "$TO" ]; then
-     echo "\$TO not set, assuming TO is the upstream SHA currently committed."
-  else
-     git checkout "$TO"
-  fi
-
   git branch -f local
   if [ -n "$FROM" ]; then
-     git checkout -B pulumi-patch "$FROM"
+      echo "Rebasing from $FROM to $(git rev-parse HEAD)"
+      git checkout -B pulumi-patch "$FROM"
   else
-     git checkout -B pulumi-patch
+      echo "Rebasing in place at $(git rev-parse HEAD)"
+      git checkout -B pulumi-patch
   fi
   git branch --set-upstream-to=local pulumi-patch
 
@@ -120,7 +116,7 @@ assert_rebase_in_progress() {
 Didn't detect an upstream rebase in progress.
 To start an upstream rebase, run
 
-    [FROM=vX.Y.Z] [TO=vA.B.C] make upstream.rebase
+    [FROM=vX.Y.Z] make upstream.rebase
 
 If you are absolutly sure you are already in a rebase, run
 
@@ -149,7 +145,7 @@ make "$1"' failed to apply ${patch}. This is because there is a conflict between
 the checked out version of upstream and the patch set. To resolve this conflict
 run:
 
-    FROM=\$LAST_KNOWN_GOOD_COMMIT TO=\$NEW_COMMIT make upstream.rebase
+    FROM=\$LAST_KNOWN_GOOD_COMMIT make upstream.rebase
 
 This will walk you through resolving the conflict and producing a patch set that
 cleanly applies to the current upstream.