diff --git a/surfsense_desktop/electron-builder.yml b/surfsense_desktop/electron-builder.yml
index ece603767..e4f510718 100644
--- a/surfsense_desktop/electron-builder.yml
+++ b/surfsense_desktop/electron-builder.yml
@@ -13,17 +13,10 @@ files:
   - "!scripts"
   - "!release"
 extraResources:
-  - from: ../surfsense_web/.next/standalone/
+  - from: ../surfsense_web/.next/standalone/surfsense_web/
     to: standalone/
     filter:
       - "**/*"
-      - "!node_modules"
-  - from: ../surfsense_web/.next/standalone/node_modules/
-    to: standalone/node_modules/
-    filter: ["**/*"]
-  - from: ../surfsense_web/.next/standalone/.next/
-    to: standalone/.next/
-    filter: ["**/*"]
   - from: ../surfsense_web/.next/static/
     to: standalone/.next/static/
     filter: ["**/*"]
diff --git a/surfsense_desktop/package.json b/surfsense_desktop/package.json
index e8f926b8c..cba82c9d7 100644
--- a/surfsense_desktop/package.json
+++ b/surfsense_desktop/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "concurrently -k \"pnpm --dir ../surfsense_web dev\" \"wait-on http://localhost:3000 && electron .\"",
     "build": "node scripts/build-electron.mjs",
-    "pack": "pnpm build && electron-builder --dir --config electron-builder.yml",
+    "pack:dir": "pnpm build && electron-builder --dir --config electron-builder.yml",
     "dist": "pnpm build && electron-builder --config electron-builder.yml",
     "dist:mac": "pnpm build && electron-builder --mac --config electron-builder.yml",
     "dist:win": "pnpm build && electron-builder --win --config electron-builder.yml",
diff --git a/surfsense_web/Dockerfile b/surfsense_web/Dockerfile
index 51f65da5e..311c3c784 100644
--- a/surfsense_web/Dockerfile
+++ b/surfsense_web/Dockerfile
@@ -71,7 +71,7 @@ COPY --from=builder /app/public ./public
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone/app/ ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
 # Entrypoint scripts for runtime env var substitution
diff --git a/surfsense_web/next.config.ts b/surfsense_web/next.config.ts
index fe01f8998..0f71a9eaf 100644
--- a/surfsense_web/next.config.ts
+++ b/surfsense_web/next.config.ts
@@ -1,3 +1,4 @@
+import path from "path";
 import { createMDX } from "fumadocs-mdx/next";
 import type { NextConfig } from "next";
 import createNextIntlPlugin from "next-intl/plugin";
@@ -10,6 +11,7 @@ const withNextIntl = createNextIntlPlugin("./i18n/request.ts");
 // ships what desktop users actually need.
 const nextConfig: NextConfig = {
 	output: "standalone",
+	outputFileTracingRoot: path.join(__dirname, ".."),
 	reactStrictMode: false,
 	typescript: {
 		ignoreBuildErrors: true,