diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f3d8ddcc9..fad0db015 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 env:
   GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
 
-name: Pull Request & Downstream Testing
+name: Pull Request
 
 on: [pull_request]
 
@@ -52,51 +52,3 @@ jobs:
         uses: codecov/codecov-action@v3
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-  downstream-test:
-    name: Test ${{ matrix.provider }} Downstream
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        provider: [ "azuread", "random", ]
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: '14.x'
-      - name: Install Python
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.9.x
-      - name: Install Pulumi CLI
-        uses: pulumi/action-install-pulumi-cli@v1.0.1
-      - name: Install pulumictl
-        uses: jaxxstorm/action-install-gh-release@v1.1.0
-        with:
-          repo: pulumi/pulumictl
-
-      - name: Check out source code
-        uses: actions/checkout@master
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.21.x
-          cache-dependency-path: |
-            **/go.sum
-      # Required to pin Gradle < 8.0 until downstram tests upgrade to compatible pulumi-java release.
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: "7.6"
-      - name: Test Downstream
-        uses: pulumi/action-test-provider-downstream@releases/v7
-        env:
-          GOPROXY: "https://proxy.golang.org"
-        with:
-          downstream-name: pulumi-${{ matrix.provider }}
-          downstream-url: https://github.com/pulumi/pulumi-${{ matrix.provider }}
-          pulumi-bot-token: ${{ secrets.PULUMI_BOT_TOKEN }}
-          github-actions-token: ${{ secrets.GITHUB_TOKEN }}
-          use-provider-dir: true
-          replacements: github.com/pulumi/pulumi-terraform-bridge/v3=pulumi-terraform-bridge,github.com/pulumi/pulumi-terraform-bridge/x/muxer=pulumi-terraform-bridge/x/muxer,github.com/pulumi/pulumi-terraform-bridge/pf=pulumi-terraform-bridge/pf
diff --git a/.github/workflows/update-providers-test.yml b/.github/workflows/update-providers-test.yml
new file mode 100644
index 000000000..a69b42d90
--- /dev/null
+++ b/.github/workflows/update-providers-test.yml
@@ -0,0 +1,58 @@
+name: Test the bridge by previewing provider bridge upgrades
+
+on:
+
+  # These checks can be triggerred manually from the Actions tab, which already lets you specify
+  # which branch of the bridge to use for testing.
+  workflow_dispatch:
+    inputs: {}
+
+  # # Alternatively, they can be triggered by opening a feature-* branch. Not having these enabled on
+  # # normal branches and PRs is intentional as the checks consume a lot of resources.
+  # push:
+  #   branches:
+  #   - feature-**
+  #   paths-ignore:
+  #   - CHANGELOG.md
+  #   tags-ignore:
+  #   - "*"
+  #   - "**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Test upgrading ${{ matrix.provider }} to pulumi-terraform-bridge ${{ github.sha }}
+    steps:
+      - name: Trigger upgrade
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.PULUMI_BOT_TOKEN }}
+          repository: pulumi/${{ matrix.provider }}
+          event-type: upgrade-bridge
+          client-payload: |-
+            {
+               "target-bridge-version": ${{ toJSON(github.sha) }},
+               "pr-reviewers": ${{ toJSON( github.triggering_actor || 't0yv0' ) }},
+               "pr-description": "This PR was created to test a pulumi/pulumi-terraform-bridge feature.\n\n- pulumi/pulumi-terraform-bridge#${{ github.event.number }}\n\n- https://github.com/pulumi/pulumi-terraform-bridge/${{github.sha}}\n\nDO NOT MERGE.",
+               "automerge": false
+            }
+    strategy:
+      fail-fast: false
+      matrix:
+        provider:
+          - pulumi-aiven
+          - pulumi-auth0
+          - pulumi-aws
+          - pulumi-azure
+          - pulumi-azuread
+          - pulumi-cloudflare
+          - pulumi-datadog
+          - pulumi-digitalocean
+          - pulumi-docker
+          - pulumi-fastly
+          - pulumi-gcp
+          - pulumi-github
+          - pulumi-hcloud
+          - pulumi-okta
+          - pulumi-random
+          - pulumi-tls