diff --git a/package.json b/package.json
index 931c225..ed7c0f2 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "license": "AGPL-3.0-or-later",
   "version": "1.2",
   "scripts": {
-    "dev": "docker compose up --build",
-    "dev:watch": "yarn dev:docker & yarn payload:types",
+    "dev": "yarn dev:docker & yarn payload:types",
+    "dev:docker": "docker compose up --build",
     "payload:types": "yarn --cwd ./payload run generate:types:listen",
     "stop": "docker compose down",
     "dev:nobuild": "docker compose up"
diff --git a/payload/types/payload-types.ts b/payload-types.ts
similarity index 100%
rename from payload/types/payload-types.ts
rename to payload-types.ts
diff --git a/payload/package.json b/payload/package.json
index e1bdfbd..1d3dad1 100644
--- a/payload/package.json
+++ b/payload/package.json
@@ -8,7 +8,7 @@
     "dev": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts nodemon",
     "build:payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts node -r tsconfig-paths/register node_modules/payload/dist/bin/index.js build ",
     "build:server": "tsc",
-    "build": "yarn build:payload && yarn build:server",
+    "build": "yarn generate:types && build:payload && yarn build:server",
     "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js node -r tsconfig-paths/register dist/server.js",
     "generate:types": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts node -r tsconfig-paths/register node_modules/payload/dist/bin/index.js generate:types",
     "generate:types:listen": "nodemon --watch src --ext ts --exec 'npm run generate:types'"
diff --git a/payload/tsconfig.json b/payload/tsconfig.json
index 03043e9..c34f284 100644
--- a/payload/tsconfig.json
+++ b/payload/tsconfig.json
@@ -8,7 +8,7 @@
     "outDir": "./dist",
     "paths": {
       "@/*": ["./src/*", "./dist/*", "./dist/src/*"],
-      "@/types/*": ["./types/*"]
+      "@/types/*": ["../*"]
     },
     "jsx": "react"
   },