diff --git a/.github/workflows/build_provider.yml b/.github/workflows/build_provider.yml
index 16893f665..c233fbfaf 100644
--- a/.github/workflows/build_provider.yml
+++ b/.github/workflows/build_provider.yml
@@ -38,7 +38,10 @@ jobs:
       - name: Download schema-embed.json
         uses: actions/download-artifact@v4
         with:
-          name: schema-embed.json
+          # Use a pattern to avoid failing if the artifact doesn't exist
+          pattern: schema-embed.*
+          # Avoid creating directories for each artifact
+          merge-multiple: true
           path: provider/cmd/pulumi-resource-datadog/schema-embed.json
       - name: Prepare for build
         # This installs plugins and prepares upstream
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index bc7aa02a1..ab5f7dca9 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -74,6 +74,7 @@ jobs:
       github.event.pull_request.head.repo.full_name == github.repository
     needs:
     - test
+    - build_provider
     - license_check
     runs-on: ubuntu-latest
     steps:
diff --git a/Makefile b/Makefile
index daa422946..b93efe185 100644
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ bin/linux-arm64/$(PROVIDER): TARGET := linux-arm64
 bin/darwin-amd64/$(PROVIDER): TARGET := darwin-amd64
 bin/darwin-arm64/$(PROVIDER): TARGET := darwin-arm64
 bin/windows-amd64/$(PROVIDER).exe: TARGET := windows-amd64
-bin/%/$(PROVIDER) bin/%/$(PROVIDER).exe: provider/cmd/$(PROVIDER)/schema-embed.json
+bin/%/$(PROVIDER) bin/%/$(PROVIDER).exe:
 	@# check the TARGET is set
 	test $(TARGET)
 	cd provider && \