diff --git a/.github/workflows/build_sdk.yml b/.github/workflows/build_sdk.yml
index 864b8855..40d8e132 100644
--- a/.github/workflows/build_sdk.yml
+++ b/.github/workflows/build_sdk.yml
@@ -90,10 +90,3 @@ jobs:
           name: ${{ matrix.language  }}-sdk.tar.gz
           path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz
           retention-days: 30
-      - if: failure() && github.event_name == 'push'
-        name: Notify Slack
-        uses: 8398a7/action-slack@v3
-        with:
-          author_name: Failure in building ${{ matrix.language }} sdk
-          fields: repo,commit,author,action
-          status: ${{ job.status }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 91fc0cc7..2ae4b4f7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -54,10 +54,3 @@ jobs:
       with:
         version: v1.58.0
         working-directory: provider
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in linting provider
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index baccdc6d..8b919af8 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -152,13 +152,7 @@ jobs:
         args: -p 3 -f .goreleaser.prerelease.yml --rm-dist --skip-validate --timeout
           60m0s
         version: latest
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in publishing binaries
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
+
   publish_sdk:
     name: publish_sdk
     needs:
@@ -294,13 +288,6 @@ jobs:
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in running ${{ matrix.language }} tests
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index da115440..442e9ef8 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -99,13 +99,6 @@ jobs:
         args: -p 3 -f .goreleaser.prerelease.yml --rm-dist --skip-validate --timeout
           60m0s
         version: latest
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in publishing binaries
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
   publish_sdk:
     name: publish_sdk
     needs: 
@@ -259,13 +252,6 @@ jobs:
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in running ${{ matrix.language }} tests
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/prerequisites.yml b/.github/workflows/prerequisites.yml
index 7f5608cb..049cee24 100644
--- a/.github/workflows/prerequisites.yml
+++ b/.github/workflows/prerequisites.yml
@@ -105,10 +105,3 @@ jobs:
         name: splunk-provider.tar.gz
         path: ${{ github.workspace }}/bin/provider.tar.gz
         retention-days: 30
-    - if: failure() && inputs.is_pr
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in building provider prerequisites
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 347d65a3..42946246 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -114,13 +114,6 @@ jobs:
       with:
         args: -p 3 release --rm-dist --timeout 60m0s
         version: latest
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in publishing binaries
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
   publish_sdk:
     name: publish_sdk
     needs:
@@ -292,13 +285,6 @@ jobs:
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
-    - if: failure() && github.event_name == 'push'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in running ${{ matrix.language }} tests
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index f8440a19..4ad24cc5 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -158,13 +158,6 @@ jobs:
       if: matrix.testTarget == 'local'
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -skip TestPulumiExamples -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
-    - if: failure() && github.event_name == 'push' && matrix.testTarget == 'local'
-      name: Notify Slack
-      uses: 8398a7/action-slack@v3
-      with:
-        author_name: Failure in running ${{ matrix.language }} tests
-        fields: repo,commit,author,action
-        status: ${{ job.status }}
     - name: Run pulumi/examples tests
       if: matrix.testTarget == 'pulumiExamples'
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
diff --git a/scripts/upstream.sh b/scripts/upstream.sh
index fdbdecbe..d35932e0 100755
--- a/scripts/upstream.sh
+++ b/scripts/upstream.sh
@@ -91,7 +91,7 @@ start_rebase() {
 
   for patch in ../patches/*.patch; do
     echo "Applying $patch"
-    if ! git am --3way "$patch" --allow-empty; then
+    if ! git am --3way "$patch"; then
       echo
       echo "Failed to apply ${patch}. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly"
       echo