diff --git a/apps/web/package.json b/apps/web/package.json
index a9a5011159..08221d3b6e 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -7,19 +7,22 @@
     "analyze:server": "BUNDLE_ANALYZE=server next build",
     "analyze:browser": "BUNDLE_ANALYZE=browser next build",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
-    "dev": "next dev",
-    "dx": "next dev",
-    "test": "jest",
+    "next:dev": "next dev",
+    "dev": "run-p app-store:watch next:dev",
+    "dx": "yarn dev",
+    "test": "yarn app-store:generate && jest",
     "test-e2e": "cd ../.. && yarn playwright test --config=tests/config/playwright.config.ts --project=chromium",
     "playwright-report": "playwright show-report playwright/reports/playwright-html-report",
     "test-codegen": "yarn playwright codegen http://localhost:3000",
-    "type-check": "tsc --pretty --noEmit",
-    "build": "next build",
+    "type-check": "yarn app-store:generate && tsc --pretty --noEmit",
+    "build": "yarn app-store:generate && next build",
     "start": "next start",
     "lint": "next lint",
     "lint:report": "eslint . --format json --output-file ../../lint-results/web.json",
     "lint:fix": "next lint . --ext .ts,.js,.tsx,.jsx --fix",
-    "check-changed-files": "ts-node scripts/ts-check-changed-files.ts"
+    "check-changed-files": "ts-node scripts/ts-check-changed-files.ts",
+    "app-store:watch": "yarn workspace @calcom/app-store-cli watch  --watch",
+    "app-store:generate": "yarn workspace @calcom/app-store-cli generate"
   },
   "engines": {
     "node": ">=14.x <17",
diff --git a/package.json b/package.json
index a56bb4b83d..e9ea59fc2e 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,7 @@
     "docs-dev": "yarn predev && turbo run dev --scope=\"@calcom/docs\"",
     "docs-build": "turbo run build --scope=\"@calcom/docs\" --include-dependencies",
     "docs-start": "turbo run start --scope=\"@calcom/docs\"",
-    "dx:web": "yarn predev && (git submodule update || true) && turbo run dx",
-    "dx": "run-p dx:web app-store:watch",
+    "dx": "yarn predev && (git submodule update || true) && turbo run dx",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "heroku-postbuild": "turbo run @calcom/web#build",
     "lint": "turbo run lint",
@@ -44,8 +43,7 @@
     "test-e2e": "turbo run test-e2e --concurrency=1",
     "type-check": "turbo run type-check",
     "embed-tests-prepare": "yarn workspace @calcom/prisma db-reset && yarn build",
-    "app-store": "yarn workspace @calcom/app-store-cli cli",
-    "app-store:watch": "yarn workspace @calcom/app-store-cli watch  --watch"
+    "app-store": "yarn workspace @calcom/app-store-cli cli"
   },
   "devDependencies": {
     "dotenv-checker": "^1.1.5",
@@ -54,7 +52,6 @@
     "prettier": "^2.5.1"
   },
   "dependencies": {
-    "run-parallel": "^1.2.0",
     "turbo": "1.2.9"
   },
   "resolutions": {
diff --git a/turbo.json b/turbo.json
index f93470731a..48ffaff483 100644
--- a/turbo.json
+++ b/turbo.json
@@ -20,12 +20,8 @@
       "cache": false,
       "dependsOn": ["@calcom/prisma#db-deploy"]
     },
-    "@calcom/app-store-cli#generate": {
-      "cache": false
-    },
     "@calcom/web#build": {
       "dependsOn": [
-        "@calcom/app-store-cli#generate",
         "^build",
         "@calcom/prisma#build",
         "$CALENDSO_ENCRYPTION_KEY",
@@ -160,7 +156,7 @@
       "dependsOn": ["@calcom/prisma#db-reset", "@calcom/web#test", "@calcom/web#build"]
     },
     "type-check": {
-      "dependsOn": ["@calcom/app-store-cli#generate", "@calcom/embed-react#build", "@calcom/embed-core#build", "@calcom/embed-snippet#build"],
+      "dependsOn": ["@calcom/embed-react#build", "@calcom/embed-core#build", "@calcom/embed-snippet#build"],
       "outputs": []
     }
   }
diff --git a/yarn.lock b/yarn.lock
index 354358e858..38ece35d3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12094,7 +12094,7 @@ nanoid@^3.1.23, nanoid@^3.3.1:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
   integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
 
-nanoid@^3.1.30, nanoid@^3.3.4:
+nanoid@^3.1.30, nanoid@^3.3.3, nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
@@ -14547,7 +14547,7 @@ run-async@^2.4.0:
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
-run-parallel@^1.1.9, run-parallel@^1.2.0:
+run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
   integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==