diff --git a/packages/analytics/Dockerfile b/packages/analytics/Dockerfile
index ac95f83..ba32932 100644
--- a/packages/analytics/Dockerfile
+++ b/packages/analytics/Dockerfile
@@ -8,13 +8,19 @@ RUN yarn install --frozen-lockfile
 COPY tsconfig.json ./tsconfig.json
 COPY packages ./packages
 
+RUN yarn workspace analytics build
+
+# Production stage
+FROM node:20-alpine as prod
+
+WORKDIR /app
+COPY --from=build /app/node_modules ./node_modules
+COPY --from=build /app/packages/analytics ./packages/analytics
+
+ENV NODE_ENV=production
 ENV HOST=0.0.0.0
 ENV PORT=3001
 EXPOSE 3001
 
-# Production stage
-FROM node:20-alpine as prod
-COPY --from=build /app/packages/analytics ./packages/analytics
-ENV NODE_ENV=production
 WORKDIR /app/packages/analytics
 CMD [ "yarn", "start" ]
\ No newline at end of file
diff --git a/server/package.json b/server/package.json
index e7ce8c6..03681f5 100644
--- a/server/package.json
+++ b/server/package.json
@@ -4,12 +4,12 @@
   "description": "Linux Odyssey Server",
   "scripts": {
     "start": "node dist/server/src/index.js",
-    "setup": "tsx src/cli/setup.js",
-    "clean": "tsx src/cli/clean.js",
+    "setup": "tsx src/cli/setup.ts",
+    "clean": "tsx src/cli/clean.ts",
     "build": "tsc",
     "type-check": "tsc --noEmit",
     "dev": "tsx watch --include \"../quests/**/*.yml\" src/index.ts",
-    "build:quests": "tsx src/cli/build.js"
+    "build:quests": "tsx src/cli/build.ts"
   },
   "dependencies": {
     "@trpc/server": "^11.1.0",