diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml
index 8ede5c4773e..1b275320928 100644
--- a/.ci-mgmt.yaml
+++ b/.ci-mgmt.yaml
@@ -70,6 +70,11 @@ extraTests:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
+    - name: Free Disk Space (Ubuntu)
+      uses: jlumbroso/free-disk-space@main
+      with:
+        swap-storage: false
+        tool-cache: false
     - name: Checkout Repo
       uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index d3f08447ce7..44a0b6381e0 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -205,6 +205,11 @@ jobs:
       name: Run test of provider shim
       runs-on: ubuntu-latest
       steps:
+          - name: Free Disk Space (Ubuntu)
+            uses: jlumbroso/free-disk-space@main
+            with:
+              swap-storage: false
+              tool-cache: false
           - name: Checkout Repo
             uses: actions/checkout@v4
             with:
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 7424d9548c8..06986070877 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -146,6 +146,11 @@ jobs:
       name: Run test of provider shim
       runs-on: ubuntu-latest
       steps:
+          - name: Free Disk Space (Ubuntu)
+            uses: jlumbroso/free-disk-space@main
+            with:
+              swap-storage: false
+              tool-cache: false
           - name: Checkout Repo
             uses: actions/checkout@v4
             with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cc70217d1a0..a7b411dd800 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -152,6 +152,11 @@ jobs:
       name: Run test of provider shim
       runs-on: ubuntu-latest
       steps:
+          - name: Free Disk Space (Ubuntu)
+            uses: jlumbroso/free-disk-space@main
+            with:
+              swap-storage: false
+              tool-cache: false
           - name: Checkout Repo
             uses: actions/checkout@v4
             with:
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index 83274ffc7d3..dfa83d00aa5 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -207,6 +207,11 @@ jobs:
       name: Run test of provider shim
       runs-on: ubuntu-latest
       steps:
+          - name: Free Disk Space (Ubuntu)
+            uses: jlumbroso/free-disk-space@main
+            with:
+              swap-storage: false
+              tool-cache: false
           - name: Checkout Repo
             uses: actions/checkout@v4
             with:
diff --git a/Makefile b/Makefile
index 0251378c7c6..4da47c1610e 100644
--- a/Makefile
+++ b/Makefile
@@ -189,11 +189,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version
 # - Run make ci-mgmt to apply the change locally.
 #
 ci-mgmt: .ci-mgmt.yaml
-	go run github.com/pulumi/ci-mgmt/provider-ci@master generate \
-		--name $(ORG)/pulumi-$(PACK) \
-		--out . \
-		--template bridged-provider \
-		--config $<
+	go run github.com/pulumi/ci-mgmt/provider-ci@master generate
 
 # Because some codegen depends on the version of the CLI used, we install a local CLI
 # version pinned to the same version as `provider/go.mod`.
diff --git a/provider/test-programs/imds-auth/imds-v2/Pulumi.yaml b/provider/test-programs/imds-auth/imds-v2/Pulumi.yaml
index bc119d7277f..8e9984ed681 100644
--- a/provider/test-programs/imds-auth/imds-v2/Pulumi.yaml
+++ b/provider/test-programs/imds-auth/imds-v2/Pulumi.yaml
@@ -118,6 +118,8 @@ resources:
         httpPutResponseHopLimit: 1
       vpcSecurityGroupIds:
         - ${segroup}
+      rootBlockDevice:
+        volumeSize: 20
       userData: |
         #!/bin/bash
         # Reconfigure SSHD - workaround for pulumi Command issues