diff --git a/app/tauri.conf.json b/app/tauri.conf.json
index 0b255c5d..6534fc85 100644
--- a/app/tauri.conf.json
+++ b/app/tauri.conf.json
@@ -3,9 +3,10 @@
 	"version": "0.1.0",
 	"identifier": "xyz.learnanything.desktop",
 	"build": {
-		"frontendDist": "https://dev.learn-anything.xyz",
+		"frontendDist": "../web/.output/public",
 		"devUrl": "http://localhost:3000",
-		"beforeDevCommand": "bun dev"
+		"beforeDevCommand": "bun dev",
+		"beforeBuildCommand": "bun web:build"
 	},
 	"app": {
 		"windows": [
@@ -24,6 +25,12 @@
 	"bundle": {
 		"active": true,
 		"targets": "all",
-		"icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"]
+		"icon": [
+			"icons/32x32.png",
+			"icons/128x128.png",
+			"icons/128x128@2x.png",
+			"icons/icon.icns",
+			"icons/icon.ico"
+		]
 	}
 }
diff --git a/bun.lockb b/bun.lockb
index 0ff79246..e7a5e78b 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/web/.gitignore b/web/.gitignore
index 6cac3e14..5cd19fbb 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -21,4 +21,6 @@ yarn.lock
 /blob-report/
 /playwright/.cache/
 
-.ronin
\ No newline at end of file
+.ronin
+
+app.config.timestamp_*.js
diff --git a/web/app.config.ts b/web/app.config.ts
index 6067f716..4e197727 100644
--- a/web/app.config.ts
+++ b/web/app.config.ts
@@ -1,7 +1,29 @@
 import { defineConfig } from "@tanstack/start/config"
 import tsConfigPaths from "vite-tsconfig-paths"
 
-export default defineConfig({
+const is_tauri = process.env.TAURI_ENV_TARGET_TRIPLE !== undefined;
+
+let config = is_tauri ? defineConfig({
+  vite: {
+    envPrefix: ['VITE_', 'TAURI_ENV_*'],
+    build: {
+      target:
+        process.env.TAURI_ENV_PLATFORM == 'windows'
+          ? 'chrome105'
+          : 'safari13',
+      minify: !process.env.TAURI_ENV_DEBUG ? 'esbuild' : false,
+      sourcemap: !!process.env.TAURI_ENV_DEBUG,
+    },
+    plugins: [
+      tsConfigPaths({
+        projects: ["./tsconfig.json"],
+      }),
+    ],
+  },
+  server: {
+    preset: "static"
+  }
+}) : defineConfig({
   vite: {
     plugins: [
       tsConfigPaths({
@@ -10,3 +32,5 @@ export default defineConfig({
     ],
   },
 })
+
+export default config;