diff --git a/.github/actions/setup-tools/action.yml b/.github/actions/setup-tools/action.yml
index ec2dddec..642d1d22 100644
--- a/.github/actions/setup-tools/action.yml
+++ b/.github/actions/setup-tools/action.yml
@@ -9,7 +9,7 @@ inputs:
         pulumicli
         pulumictl
         schema-tools
-        node
+        nodejs
         python
         dotnet
         java
@@ -48,7 +48,7 @@ runs:
         repo: pulumi/schema-tools
 
     - name: Setup Node
-      if: inputs.tools == 'all' || contains(inputs.tools, 'node')
+      if: inputs.tools == 'all' || contains(inputs.tools, 'nodejs')
       uses: actions/setup-node@v4
       with:
         node-version: 20.x
diff --git a/.github/workflows/build_sdk.yml b/.github/workflows/build_sdk.yml
index 34f49db3..493f4496 100644
--- a/.github/workflows/build_sdk.yml
+++ b/.github/workflows/build_sdk.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Setup tools
         uses: ./.github/actions/setup-tools
         with:
-          tools: pulumictl, pulumicli, go, node, dotnet, python, java
+          tools: pulumictl, pulumicli, ${{ matrix.language }}
       - name: Download bin
         uses: ./.github/actions/download-bin
       - name: Install plugins
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 865eec76..edd499b3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -89,7 +89,6 @@ jobs:
     name: License Check
     uses: ./.github/workflows/license.yml
     secrets: inherit
-
   publish:
     name: publish
     needs:
@@ -138,10 +137,11 @@ jobs:
     - name: Setup tools
       uses: ./.github/actions/setup-tools
       with:
-        tools: pulumictl, pulumicli, go, node, dotnet, python, java
+        tools: pulumictl, pulumicli, ${{ matrix.language }}
     - name: Download bin
       uses: ./.github/actions/download-bin
     - run: dotnet nuget add source ${{ github.workspace }}/nuget
+      if: matrix.language == 'dotnet'
     - name: Download SDK
       uses: ./.github/actions/download-sdk
       with:
@@ -149,6 +149,7 @@ jobs:
     - name: Update path
       run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
     - name: Install Python deps
+      if: matrix.language == 'python'
       run: |-
         pip3 install virtualenv==20.0.23
         pip3 install pipenv
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e0d425ee..148f56ec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -88,7 +88,7 @@ jobs:
     - name: Setup tools
       uses: ./.github/actions/setup-tools
       with:
-        tools: pulumictl, pulumicli, go, node, dotnet, python, java
+        tools: pulumictl, pulumicli, ${{ matrix.language }}
     - name: Download bin
       uses: ./.github/actions/download-bin
     - run: dotnet nuget add source ${{ github.workspace }}/nuget
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index 9fca0472..96a298fd 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -124,7 +124,7 @@ jobs:
     - name: Setup tools
       uses: ./.github/actions/setup-tools
       with:
-        tools: pulumictl, pulumicli, go, node, dotnet, python, java
+        tools: pulumictl, pulumicli, ${{ matrix.language }}
     - name: Download bin
       uses: ./.github/actions/download-bin
     - run: dotnet nuget add source ${{ github.workspace }}/nuget
diff --git a/Makefile b/Makefile
index 06c5bdb0..e142872b 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ development: install_plugins provider build_sdks install_sdks
 
 build: install_plugins provider build_sdks install_sdks
 
-build_sdks: build_nodejs build_python build_go build_dotnet build_java
+build_sdks: build_nodejs build_python build_dotnet build_go build_java 
 
 install_go_sdk: