diff --git a/.github/workflows/cloud-runner-integrity.yml b/.github/workflows/cloud-runner-integrity.yml
index 65a997d1..adcb141a 100644
--- a/.github/workflows/cloud-runner-integrity.yml
+++ b/.github/workflows/cloud-runner-integrity.yml
@@ -58,9 +58,8 @@ jobs:
           echo "Initial disk space cleanup..."
           echo "Current disk usage:"
           df -h
-          # Clean up any leftover k3d clusters/images from previous runs
+          # Clean up any leftover k3d clusters from previous runs
           k3d cluster delete unity-builder || true
-          k3d image delete --all || true
           # Stop any existing LocalStack container
           docker stop localstack-main 2>/dev/null || true
           docker rm localstack-main 2>/dev/null || true
@@ -549,7 +548,6 @@ jobs:
         run: |
           echo "Deleting k3d cluster to free disk space..."
           k3d cluster delete unity-builder || true
-          k3d image delete --all || true
           docker system prune -af --volumes || true
           echo "Disk usage after k3d deletion:"
           df -h
diff --git a/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts b/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts
index 101198b8..f851999b 100644
--- a/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts
+++ b/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts
@@ -36,11 +36,16 @@ describe('Cloud Runner Caching', () => {
 
       // For AWS LocalStack tests, explicitly set provider strategy to 'aws'
       // This ensures we use AWS LocalStack instead of defaulting to local-docker
-      if (process.env.AWS_S3_ENDPOINT && process.env.AWS_S3_ENDPOINT.includes('localhost')) {
+      // But don't override if k8s provider is already set
+      if (
+        process.env.AWS_S3_ENDPOINT &&
+        process.env.AWS_S3_ENDPOINT.includes('localhost') &&
+        CloudRunnerOptions.providerStrategy !== 'k8s'
+      ) {
         overrides.providerStrategy = 'aws';
         overrides.containerHookFiles += `,aws-s3-pull-cache,aws-s3-upload-cache`;
       }
-      if (CloudRunnerOptions.providerStrategy === `k8s` || overrides.providerStrategy === `k8s`) {
+      if (CloudRunnerOptions.providerStrategy === `k8s`) {
         overrides.containerHookFiles += `,aws-s3-pull-cache,aws-s3-upload-cache`;
       }
       const buildParameter = await CreateParameters(overrides);