diff --git a/apps/desktop-e2e/cucumber.cjs b/apps/desktop-e2e/cucumber.cjs
index f51746fbe..56464cc7a 100644
--- a/apps/desktop-e2e/cucumber.cjs
+++ b/apps/desktop-e2e/cucumber.cjs
@@ -14,7 +14,7 @@ const config = {
     failFast: true,
     paths: ["src/features/*"],
     require: ["src/**/*.ts"],
-    requireModule: ["ts-node/register"],
+    requireModule: ["ts-node/register/transpile-only", "tsconfig-paths/register"],
     format: ["html:test-results/cucumber-report.html", "json:test-results/cucumber-report.json"],
   },
 };
diff --git a/apps/desktop-e2e/package.json b/apps/desktop-e2e/package.json
index d9a81dab2..f4ccdfbc5 100644
--- a/apps/desktop-e2e/package.json
+++ b/apps/desktop-e2e/package.json
@@ -22,7 +22,8 @@
     "eslint": "^8.57.0",
     "madge": "^8.0.0",
     "prettier": "^3.4.2",
-    "rimraf": "^6.0.1"
+    "rimraf": "^6.0.1",
+    "tsconfig-paths": "^4.2.0"
   },
   "dependencies": {
     "@cucumber/cucumber": "^11.1.1",
diff --git a/apps/desktop-e2e/tsconfig.json b/apps/desktop-e2e/tsconfig.json
index 627f12aeb..178a42256 100644
--- a/apps/desktop-e2e/tsconfig.json
+++ b/apps/desktop-e2e/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "extends": "@umami/typescript-config/tsconfig.json",
   "compilerOptions": {
     "target": "esnext",
     "allowJs": true,
@@ -14,10 +15,13 @@
     "noEmit": true,
     "jsx": "react-jsx",
     "customConditions": ["@umami/source"],
-    "preserveSymlinks": true
+    "preserveSymlinks": true,
+    "types": ["node", "jest"]
   },
   "ts-node": {
-    "esm": true
+    "esm": true,
+    "transpileOnly": true,
+    "files": true
   },
-  "include": ["src", ".eslintrc.cjs", "cucumber.cjs"]
+  "include": ["src", ".eslintrc.cjs", "cucumber.cjs", "src/global.d.ts"]
 }
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index c41a28d26..46f73606f 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -162,4 +162,4 @@
     "level-supports": "^6.0.0",
     "level-transcoder": "^1.0.1"
   }
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0cb01d9a3..967d5ea49 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -255,7 +255,7 @@ importers:
         version: 33.2.1
       electron-builder:
         specifier: ^25.1.8
-        version: 25.1.8(electron-builder-squirrel-windows@24.13.3)
+        version: 25.1.8(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.1.8))
       electronmon:
         specifier: ^2.0.3
         version: 2.0.3
@@ -473,6 +473,9 @@ importers:
       rimraf:
         specifier: ^6.0.1
         version: 6.0.1
+      tsconfig-paths:
+        specifier: ^4.2.0
+        version: 4.2.0
 
   apps/embed-iframe:
     dependencies:
@@ -16373,7 +16376,9 @@ snapshots:
     transitivePeerDependencies:
       - '@babel/core'
       - '@babel/preset-env'
+      - bufferutil
       - supports-color
+      - utf-8-validate
 
   '@react-native/normalize-color@2.1.0': {}
 
@@ -19364,7 +19369,7 @@ snapshots:
 
   app-builder-bin@5.0.0-alpha.10: {}
 
-  app-builder-lib@24.13.3(dmg-builder@25.1.8)(electron-builder-squirrel-windows@24.13.3):
+  app-builder-lib@24.13.3(dmg-builder@25.1.8(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.1.8)):
     dependencies:
       '@develar/schema-utils': 2.6.5
       '@electron/notarize': 2.2.1
@@ -19398,7 +19403,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  app-builder-lib@25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@24.13.3):
+  app-builder-lib@25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.1.8)):
     dependencies:
       '@develar/schema-utils': 2.6.5
       '@electron/notarize': 2.5.0
@@ -20812,7 +20817,7 @@ snapshots:
 
   dmg-builder@25.1.8(electron-builder-squirrel-windows@24.13.3):
     dependencies:
-      app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@24.13.3)
+      app-builder-lib: 25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.1.8))
       builder-util: 25.1.7
       builder-util-runtime: 9.2.10
       fs-extra: 10.1.0
@@ -20909,7 +20914,7 @@ snapshots:
 
   electron-builder-squirrel-windows@24.13.3(dmg-builder@25.1.8):
     dependencies:
-      app-builder-lib: 24.13.3(dmg-builder@25.1.8)(electron-builder-squirrel-windows@24.13.3)
+      app-builder-lib: 24.13.3(dmg-builder@25.1.8(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.1.8))
       archiver: 5.3.2
       builder-util: 24.13.1
       fs-extra: 10.1.0
@@ -20917,9 +20922,9 @@ snapshots:
       - dmg-builder
       - supports-color
 
-  electron-builder@25.1.8(electron-builder-squirrel-windows@24.13.3):
+  electron-builder@25.1.8(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.1.8)):
     dependencies:
-      app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@24.13.3)
+      app-builder-lib: 25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.1.8))
       builder-util: 25.1.7
       builder-util-runtime: 9.2.10
       chalk: 4.1.2