diff --git a/packages/js-core/tsconfig.json b/packages/js-core/tsconfig.json
index 3245874074..198706728d 100644
--- a/packages/js-core/tsconfig.json
+++ b/packages/js-core/tsconfig.json
@@ -11,5 +11,5 @@
     "strict": true
   },
   "extends": "@formbricks/config-typescript/js-library.json",
-  "include": [".", "src", "package.json", "../types/surveys.d.ts", "../database/src/index.ts"]
+  "include": ["src", "vitest.setup.ts", "package.json", "../types/surveys.d.ts", "../database/src/index.ts"]
 }
diff --git a/packages/js-core/vite.config.ts b/packages/js-core/vite.config.ts
index 434c466c34..df46cdecd2 100644
--- a/packages/js-core/vite.config.ts
+++ b/packages/js-core/vite.config.ts
@@ -32,7 +32,8 @@ export default defineConfig({
   },
   plugins: [
     dts({
-      rollupTypes: true,
+      rollupTypes: false,
+      insertTypesEntry: true,
     }) as VitestPluginOption,
     copyCompiledAssetsPlugin({
       filename: "formbricks",
diff --git a/packages/surveys/package.json b/packages/surveys/package.json
index e63343a299..eb76e28991 100644
--- a/packages/surveys/package.json
+++ b/packages/surveys/package.json
@@ -31,9 +31,9 @@
   },
   "scripts": {
     "dev": "concurrently -n \"ESM,UMD\" \"vite build --watch --mode dev\" \"BUILD_UMD=true vite build --watch --mode dev\"",
-    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 tsc && cross-env NODE_OPTIONS=--max-old-space-size=8192 vite build && cross-env NODE_OPTIONS=--max-old-space-size=8192 BUILD_UMD=true vite build",
-    "build:analyze": "cross-env NODE_OPTIONS=--max-old-space-size=8192 tsc && cross-env NODE_OPTIONS=--max-old-space-size=8192 ANALYZE=true vite build",
-    "build:dev": "cross-env NODE_OPTIONS=--max-old-space-size=8192 tsc && cross-env NODE_OPTIONS=--max-old-space-size=8192 vite build --mode dev",
+    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 tsc --noEmit && cross-env NODE_OPTIONS=--max-old-space-size=8192 vite build && cross-env NODE_OPTIONS=--max-old-space-size=8192 BUILD_UMD=true vite build",
+    "build:analyze": "cross-env NODE_OPTIONS=--max-old-space-size=8192 tsc --noEmit && cross-env NODE_OPTIONS=--max-old-space-size=8192 ANALYZE=true vite build",
+    "build:dev": "cross-env NODE_OPTIONS=--max-old-space-size=8192 tsc --noEmit && cross-env NODE_OPTIONS=--max-old-space-size=8192 vite build --mode dev",
     "go": "concurrently -n \"ESM,UMD\" \"vite build --watch --mode dev\" \"BUILD_UMD=true vite build --watch --mode dev\"",
     "lint": "eslint src --fix --ext .ts,.js,.tsx,.jsx",
     "preview": "vite preview",
diff --git a/packages/surveys/src/validation.ts b/packages/surveys/src/validation.ts
new file mode 100644
index 0000000000..33a7ebb385
--- /dev/null
+++ b/packages/surveys/src/validation.ts
@@ -0,0 +1 @@
+export * from "./lib/validation/index";
diff --git a/packages/surveys/vite.config.mts b/packages/surveys/vite.config.mts
index b7f4a16644..e34a3d9375 100644
--- a/packages/surveys/vite.config.mts
+++ b/packages/surveys/vite.config.mts
@@ -86,7 +86,7 @@ const config = ({ mode }) => {
       lib: {
         entry: {
           index: resolve(__dirname, "src/index.ts"),
-          validation: resolve(__dirname, "src/lib/validation/index.ts"),
+          validation: resolve(__dirname, "src/validation.ts"),
         },
         formats: ["es"],
       },
@@ -104,7 +104,7 @@ const config = ({ mode }) => {
     plugins: [
       ...sharedConfig.plugins,
       dts({
-        rollupTypes: true,
+        rollupTypes: false,
         // Generate separate .d.ts files for each entry point
         entryRoot: "src",
       }),
diff --git a/turbo.json b/turbo.json
index 7c160c19b2..ad6efa01de 100644
--- a/turbo.json
+++ b/turbo.json
@@ -2,7 +2,8 @@
   "$schema": "https://turborepo.org/schema.json",
   "tasks": {
     "@formbricks/cache#build": {
-      "dependsOn": ["@formbricks/logger#build"]
+      "dependsOn": ["@formbricks/logger#build"],
+      "outputs": ["dist/**"]
     },
     "@formbricks/cache#go": {
       "dependsOn": ["@formbricks/logger#build"]
@@ -26,9 +27,13 @@
     "@formbricks/database#setup": {
       "dependsOn": ["db:up"]
     },
+    "@formbricks/email#build": {
+      "dependsOn": ["^build"],
+      "outputs": []
+    },
     "@formbricks/i18n-utils#build": {
       "dependsOn": ["^build"],
-      "outputs": ["packages/i18n-utils/dist/**"]
+      "outputs": ["dist/**"]
     },
     "@formbricks/i18n-utils#lint": {
       "dependsOn": ["^lint"]
@@ -48,6 +53,10 @@
     "@formbricks/js-core#lint": {
       "dependsOn": ["@formbricks/database#build"]
     },
+    "@formbricks/logger#build": {
+      "dependsOn": ["^build"],
+      "outputs": ["dist/**"]
+    },
     "@formbricks/react-native#build": {
       "dependsOn": ["^build", "@formbricks/database#build"],
       "outputs": ["dist/**"]
@@ -58,7 +67,8 @@
       "persistent": true
     },
     "@formbricks/storage#build": {
-      "dependsOn": ["@formbricks/logger#build"]
+      "dependsOn": ["@formbricks/logger#build"],
+      "outputs": ["dist/**"]
     },
     "@formbricks/storage#go": {
       "cache": false,