diff --git a/Dockerfile b/Dockerfile
index bb5310f2..74b70db0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,6 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 # Deploy only the dokploy app
 
 ENV NODE_ENV=production
-RUN pnpm --filter=@dokploy/server switch:prod
 RUN pnpm --filter=@dokploy/server build
 RUN pnpm --filter=./apps/dokploy run build
 
diff --git a/Dockerfile.cloud b/Dockerfile.cloud
index 664180f7..8d80fb64 100644
--- a/Dockerfile.cloud
+++ b/Dockerfile.cloud
@@ -17,7 +17,6 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server
 ARG NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
 ENV NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=$NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
 ENV NODE_ENV=production
-RUN pnpm --filter=@dokploy/server switch:prod
 RUN pnpm --filter=@dokploy/server build
 RUN pnpm --filter=./apps/dokploy run build
 
diff --git a/Dockerfile.schedule b/Dockerfile.schedule
index 36f06aef..5eca3420 100644
--- a/Dockerfile.schedule
+++ b/Dockerfile.schedule
@@ -15,7 +15,6 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server
 # Deploy only the dokploy app
 
 ENV NODE_ENV=production
-RUN pnpm --filter=@dokploy/server switch:prod
 RUN pnpm --filter=@dokploy/server build
 RUN pnpm --filter=./apps/schedules run build
 
diff --git a/Dockerfile.server b/Dockerfile.server
index 9cf04b21..a25b22e5 100644
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -15,7 +15,6 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server
 # Deploy only the dokploy app
 
 ENV NODE_ENV=production
-RUN pnpm --filter=@dokploy/server switch:prod
 RUN pnpm --filter=@dokploy/server build
 RUN pnpm --filter=./apps/api run build
 
diff --git a/packages/server/package.json b/packages/server/package.json
index e9064582..4ebee48c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -19,7 +19,7 @@
 		}
 	},
 	"scripts": {
-		"build": "rm -rf ./dist && tsc --project tsconfig.server.json && tsc-alias -p tsconfig.server.json",
+		"build": "npm run switch:prod && rm -rf ./dist && tsc --project tsconfig.server.json && tsc-alias -p tsconfig.server.json",
 		"build:types": "tsc --emitDeclarationOnly --experimenta-dts",
 		"switch:dev": "node scripts/switchToSrc.js",
 		"switch:prod": "node scripts/switchToDist.js",