diff --git a/epicshop/generate-app-artifacts.js b/epicshop/generate-app-artifacts.js
index 8f92ff6..b59758e 100644
--- a/epicshop/generate-app-artifacts.js
+++ b/epicshop/generate-app-artifacts.js
@@ -1,11 +1,15 @@
 import path from 'node:path'
-import { getApps } from '@epic-web/workshop-utils/apps.server'
+import {
+	getApps,
+	isSolutionApp,
+} from '@epic-web/workshop-utils/apps.server'
 import { execa } from 'execa'
 import fsExtra from 'fs-extra'
 
 const allApps = await getApps()
+const solutionApps = allApps.filter(isSolutionApp)
 
-for (const app of allApps) {
+for (const app of solutionApps) {
 	const reactRouterConfig = path.join(app.fullPath, 'react-router.config.ts')
 	if (await fsExtra.pathExists(reactRouterConfig)) {
 		console.log(`Generating React Router types for ${app.relativePath}`)
diff --git a/package.json b/package.json
index 158d3a9..d601968 100644
--- a/package.json
+++ b/package.json
@@ -36,9 +36,9 @@
     "setup": "pkgmgrx epicshop setup",
     "setup:custom": "node ./epicshop/setup-custom.js",
     "generate": "node ./epicshop/generate-app-artifacts.js",
-    "lint": "eslint .",
+    "lint": "eslint epicshop",
     "format": "prettier --write .",
-    "typecheck": "tsc -b",
+    "typecheck": "npm run generate",
     "validate:all": "npm-run-all --parallel --print-label --print-name --continue-on-error test:all lint typecheck"
   },
   "keywords": [],