diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/upgrade-provider.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/upgrade-provider.yml
index e43b235b7..e296a4daf 100644
--- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/upgrade-provider.yml
+++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/upgrade-provider.yml
@@ -18,19 +18,27 @@ jobs:
           swap-storage: false
           dotnet: false
       #{{- end }}#
+      - name: Checkout Repo
+        uses: #{{ .Config.actionVersions.checkout }}#
+        #{{- if .Config.checkoutSubmodules }}#
+        with:
+          submodules: #{{ .Config.checkoutSubmodules }}#
+        #{{- end }}#
       - name: Setup tools
         uses: ./.github/actions/setup-tools
         with:
           tools: pulumictl, pulumicli, go, nodejs, dotnet, python, java
-      - name: Call upgrade provider action
-        uses: #{{ .Config.actionVersions.upgradeProviderAction }}#
-        with:
-          kind: all
-          #{{- if .Config.javaGenVersion }}#
-          target-java-version: #{{ .Config.javaGenVersion }}#
-          #{{- end }}#
-          email: bot@pulumi.com
-          username: pulumi-bot
+      - name: Install upgrade-provider
+        run: go install github.com/pulumi/upgrade-provider@main
+        shell: bash
+      - name: "Set up git identity: name"
+        run: |
+          git config --global user.name 'bot@pulumi.com'
+          git config --global user.email 'bot@pulumi.com'
+        shell: bash
+      - name: Run upgrade-provider
+        run: upgrade-provider "${{ github.repository }}" --kind="all" #{{ if .Config.javaGenVersion }}#--java-version="#{{ .Config.javaGenVersion }}#"#{{ end }}#
+        shell: bash
 name: Upgrade provider
 on:
   issues:
diff --git a/provider-ci/test-providers/acme/.github/workflows/upgrade-provider.yml b/provider-ci/test-providers/acme/.github/workflows/upgrade-provider.yml
index b0f32ca48..29115ec16 100644
--- a/provider-ci/test-providers/acme/.github/workflows/upgrade-provider.yml
+++ b/provider-ci/test-providers/acme/.github/workflows/upgrade-provider.yml
@@ -9,16 +9,23 @@ jobs:
     name: upgrade-provider
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
       - name: Setup tools
         uses: ./.github/actions/setup-tools
         with:
           tools: pulumictl, pulumicli, go, nodejs, dotnet, python, java
-      - name: Call upgrade provider action
-        uses: pulumi/pulumi-upgrade-provider-action@v0.0.12
-        with:
-          kind: all
-          email: bot@pulumi.com
-          username: pulumi-bot
+      - name: Install upgrade-provider
+        run: go install github.com/pulumi/upgrade-provider@main
+        shell: bash
+      - name: "Set up git identity: name"
+        run: |
+          git config --global user.name 'bot@pulumi.com'
+          git config --global user.email 'bot@pulumi.com'
+        shell: bash
+      - name: Run upgrade-provider
+        run: upgrade-provider "${{ github.repository }}" --kind="all" 
+        shell: bash
 name: Upgrade provider
 on:
   issues:
diff --git a/provider-ci/test-providers/aws/.github/workflows/upgrade-provider.yml b/provider-ci/test-providers/aws/.github/workflows/upgrade-provider.yml
index 45b42ae06..cc067e44b 100644
--- a/provider-ci/test-providers/aws/.github/workflows/upgrade-provider.yml
+++ b/provider-ci/test-providers/aws/.github/workflows/upgrade-provider.yml
@@ -16,16 +16,25 @@ jobs:
           tool-cache: false
           swap-storage: false
           dotnet: false
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Setup tools
         uses: ./.github/actions/setup-tools
         with:
           tools: pulumictl, pulumicli, go, nodejs, dotnet, python, java
-      - name: Call upgrade provider action
-        uses: pulumi/pulumi-upgrade-provider-action@v0.0.12
-        with:
-          kind: all
-          email: bot@pulumi.com
-          username: pulumi-bot
+      - name: Install upgrade-provider
+        run: go install github.com/pulumi/upgrade-provider@main
+        shell: bash
+      - name: "Set up git identity: name"
+        run: |
+          git config --global user.name 'bot@pulumi.com'
+          git config --global user.email 'bot@pulumi.com'
+        shell: bash
+      - name: Run upgrade-provider
+        run: upgrade-provider "${{ github.repository }}" --kind="all" 
+        shell: bash
 name: Upgrade provider
 on:
   issues:
diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/upgrade-provider.yml b/provider-ci/test-providers/cloudflare/.github/workflows/upgrade-provider.yml
index b0f32ca48..29115ec16 100644
--- a/provider-ci/test-providers/cloudflare/.github/workflows/upgrade-provider.yml
+++ b/provider-ci/test-providers/cloudflare/.github/workflows/upgrade-provider.yml
@@ -9,16 +9,23 @@ jobs:
     name: upgrade-provider
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
       - name: Setup tools
         uses: ./.github/actions/setup-tools
         with:
           tools: pulumictl, pulumicli, go, nodejs, dotnet, python, java
-      - name: Call upgrade provider action
-        uses: pulumi/pulumi-upgrade-provider-action@v0.0.12
-        with:
-          kind: all
-          email: bot@pulumi.com
-          username: pulumi-bot
+      - name: Install upgrade-provider
+        run: go install github.com/pulumi/upgrade-provider@main
+        shell: bash
+      - name: "Set up git identity: name"
+        run: |
+          git config --global user.name 'bot@pulumi.com'
+          git config --global user.email 'bot@pulumi.com'
+        shell: bash
+      - name: Run upgrade-provider
+        run: upgrade-provider "${{ github.repository }}" --kind="all" 
+        shell: bash
 name: Upgrade provider
 on:
   issues:
diff --git a/provider-ci/test-providers/docker/.github/workflows/upgrade-provider.yml b/provider-ci/test-providers/docker/.github/workflows/upgrade-provider.yml
index b0f32ca48..29115ec16 100644
--- a/provider-ci/test-providers/docker/.github/workflows/upgrade-provider.yml
+++ b/provider-ci/test-providers/docker/.github/workflows/upgrade-provider.yml
@@ -9,16 +9,23 @@ jobs:
     name: upgrade-provider
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
       - name: Setup tools
         uses: ./.github/actions/setup-tools
         with:
           tools: pulumictl, pulumicli, go, nodejs, dotnet, python, java
-      - name: Call upgrade provider action
-        uses: pulumi/pulumi-upgrade-provider-action@v0.0.12
-        with:
-          kind: all
-          email: bot@pulumi.com
-          username: pulumi-bot
+      - name: Install upgrade-provider
+        run: go install github.com/pulumi/upgrade-provider@main
+        shell: bash
+      - name: "Set up git identity: name"
+        run: |
+          git config --global user.name 'bot@pulumi.com'
+          git config --global user.email 'bot@pulumi.com'
+        shell: bash
+      - name: Run upgrade-provider
+        run: upgrade-provider "${{ github.repository }}" --kind="all" 
+        shell: bash
 name: Upgrade provider
 on:
   issues: