diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 28d983173..b488cce7c 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -27,8 +27,16 @@ jobs:
       - name: Docker setup
         uses: docker/setup-buildx-action@v3
 
+      - name: Download Wasp build artifacts from linked PR
+        uses: wasp-lang/wasp/.github/actions/fetch-nightly-cli@main
+        with:
+          output-dir: ${{ runner.temp }}/wasp-cli
+          branch: main
+
       - name: Install Wasp
-        run: curl -sSL https://get.wasp.sh/installer.sh | sh -s -- -v ${{ env.WASP_VERSION }}
+        run: >
+          curl -sSL https://get.wasp.sh/installer.sh
+          | sh -s -- -f ${{ runner.temp }}/wasp-cli/wasp-*.tar.gz
 
       - name: Cache global node modules
         uses: actions/cache@v4
diff --git a/opensaas-sh/app_diff/package.json.diff b/opensaas-sh/app_diff/package.json.diff
index f11bedd5b..9be444e95 100644
--- a/opensaas-sh/app_diff/package.json.diff
+++ b/opensaas-sh/app_diff/package.json.diff
@@ -9,10 +9,10 @@
 +    "env:pull": "npx dotenv-vault@latest pull development .env.server",
 +    "env:push": "npx dotenv-vault@latest push development .env.server"
 +  },
-   "dependencies": {
-     "@aws-sdk/client-s3": "^3.523.0",
-     "@aws-sdk/s3-presigned-post": "^3.750.0",
-@@ -36,6 +41,7 @@
+   "workspaces": [
+     ".wasp/build/*",
+     ".wasp/out/*"
+@@ -40,6 +45,7 @@
      "react-apexcharts": "1.4.1",
      "react-dom": "^18.2.0",
      "react-hook-form": "^7.60.0",
diff --git a/template/app/package.json b/template/app/package.json
index 31132e367..a30fe3f35 100644
--- a/template/app/package.json
+++ b/template/app/package.json
@@ -1,6 +1,10 @@
 {
   "name": "opensaas",
   "type": "module",
+  "workspaces": [
+    ".wasp/build/*",
+    ".wasp/out/*"
+  ],
   "dependencies": {
     "@aws-sdk/client-s3": "^3.523.0",
     "@aws-sdk/s3-presigned-post": "^3.750.0",