diff --git a/packages/server/src/utils/builders/docker-file.ts b/packages/server/src/utils/builders/docker-file.ts
index 4636cb22c..a0acf5e6c 100644
--- a/packages/server/src/utils/builders/docker-file.ts
+++ b/packages/server/src/utils/builders/docker-file.ts
@@ -1,4 +1,3 @@
-import type { WriteStream } from "node:fs";
 import {
 	getEnviromentVariablesObject,
 	prepareEnvironmentVariables,
@@ -7,98 +6,8 @@ import {
 	getBuildAppDirectory,
 	getDockerContextPath,
 } from "../filesystem/directory";
-import { spawnAsync } from "../process/spawnAsync";
 import type { ApplicationNested } from ".";
-import { createEnvFile, createEnvFileCommand } from "./utils";
-
-export const buildCustomDocker = async (
-	application: ApplicationNested,
-	writeStream: WriteStream,
-) => {
-	const {
-		appName,
-		env,
-		publishDirectory,
-		buildArgs,
-		buildSecrets,
-		dockerBuildStage,
-		cleanCache,
-	} = application;
-	const dockerFilePath = getBuildAppDirectory(application);
-	try {
-		const image = `${appName}`;
-
-		const defaultContextPath =
-			dockerFilePath.substring(0, dockerFilePath.lastIndexOf("/") + 1) || ".";
-
-		const dockerContextPath = getDockerContextPath(application);
-
-		const commandArgs = ["build", "-t", image, "-f", dockerFilePath, "."];
-
-		if (cleanCache) {
-			commandArgs.push("--no-cache");
-		}
-
-		if (dockerBuildStage) {
-			commandArgs.push("--target", dockerBuildStage);
-		}
-
-		const args = prepareEnvironmentVariables(
-			buildArgs,
-			application.environment.project.env,
-			application.environment.env,
-		);
-
-		for (const arg of args) {
-			commandArgs.push("--build-arg", arg);
-		}
-
-		const secrets = getEnviromentVariablesObject(
-			buildSecrets,
-			application.environment.project.env,
-			application.environment.env,
-		);
-
-		for (const key in secrets) {
-			// Although buildx is smart enough to know we may be referring to an environment variable name,
-			// we still make sure it doesn't fall back to type=file.
-			// See: https://docs.docker.com/reference/cli/docker/buildx/build/#secret
-			commandArgs.push("--secret", `type=env,id=${key}`);
-		}
-
-		/*
-			Do not generate an environment file when publishDirectory is specified,
-			as it could be publicly exposed.
-		*/
-		if (!publishDirectory) {
-			createEnvFile(
-				dockerFilePath,
-				env,
-				application.environment.project.env,
-				application.environment.env,
-			);
-		}
-
-		await spawnAsync(
-			"docker",
-			commandArgs,
-			(data) => {
-				if (writeStream.writable) {
-					writeStream.write(data);
-				}
-			},
-			{
-				cwd: dockerContextPath || defaultContextPath,
-				env: {
-					...process.env,
-					...secrets,
-				},
-			},
-		);
-	} catch (error) {
-		throw error;
-	}
-};
+import { createEnvFileCommand } from "./utils";
 
 export const getDockerCommand = (application: ApplicationNested) => {
 	const {
diff --git a/packages/server/src/utils/builders/heroku.ts b/packages/server/src/utils/builders/heroku.ts
index a0a8da153..e1ab4dff4 100644
--- a/packages/server/src/utils/builders/heroku.ts
+++ b/packages/server/src/utils/builders/heroku.ts
@@ -1,50 +1,7 @@
-import type { WriteStream } from "node:fs";
 import { prepareEnvironmentVariables } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
-import { spawnAsync } from "../process/spawnAsync";
 import type { ApplicationNested } from ".";
 
-// TODO: integrate in the vps sudo chown -R $(whoami) ~/.docker
-export const buildHeroku = async (
-	application: ApplicationNested,
-	writeStream: WriteStream,
-) => {
-	const { env, appName, cleanCache } = application;
-	const buildAppDirectory = getBuildAppDirectory(application);
-	const envVariables = prepareEnvironmentVariables(
-		env,
-		application.environment.project.env,
-		application.environment.env,
-	);
-	try {
-		const args = [
-			"build",
-			appName,
-			"--path",
-			buildAppDirectory,
-			"--builder",
-			`heroku/builder:${application.herokuVersion || "24"}`,
-		];
-
-		for (const env of envVariables) {
-			args.push("--env", env);
-		}
-
-		if (cleanCache) {
-			args.push("--clear-cache");
-		}
-
-		await spawnAsync("pack", args, (data) => {
-			if (writeStream.writable) {
-				writeStream.write(data);
-			}
-		});
-		return true;
-	} catch (e) {
-		throw e;
-	}
-};
-
 export const getHerokuCommand = (application: ApplicationNested) => {
 	const { env, appName, cleanCache } = application;
 
diff --git a/packages/server/src/utils/builders/nixpacks.ts b/packages/server/src/utils/builders/nixpacks.ts
index 705539f06..37f1953a4 100644
--- a/packages/server/src/utils/builders/nixpacks.ts
+++ b/packages/server/src/utils/builders/nixpacks.ts
@@ -1,97 +1,10 @@
-import { existsSync, mkdirSync, type WriteStream } from "node:fs";
 import path from "node:path";
-import {
-	buildStatic,
-	getStaticCommand,
-} from "@dokploy/server/utils/builders/static";
+import { getStaticCommand } from "@dokploy/server/utils/builders/static";
 import { nanoid } from "nanoid";
 import { prepareEnvironmentVariables } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
-import { spawnAsync } from "../process/spawnAsync";
 import type { ApplicationNested } from ".";
 
-export const buildNixpacks = async (
-	application: ApplicationNested,
-	writeStream: WriteStream,
-) => {
-	const { env, appName, publishDirectory, cleanCache } = application;
-
-	const buildAppDirectory = getBuildAppDirectory(application);
-	const buildContainerId = `${appName}-${nanoid(10)}`;
-	const envVariables = prepareEnvironmentVariables(
-		env,
-		application.environment.project.env,
-		application.environment.env,
-	);
-
-	const writeToStream = (data: string) => {
-		if (writeStream.writable) {
-			writeStream.write(data);
-		}
-	};
-
-	try {
-		const args = ["build", buildAppDirectory, "--name", appName];
-
-		if (cleanCache) {
-			args.push("--no-cache");
-		}
-
-		for (const env of envVariables) {
-			args.push("--env", env);
-		}
-
-		if (publishDirectory) {
-			/* No need for any start command, since we'll use nginx later on */
-			args.push("--no-error-without-start");
-		}
-
-		await spawnAsync("nixpacks", args, writeToStream);
-
-		/*
-			Run the container with the image created by nixpacks,
-			and copy the artifacts on the host filesystem.
-			Then, remove the container and create a static build.
-		*/
-		if (publishDirectory) {
-			await spawnAsync(
-				"docker",
-				["create", "--name", buildContainerId, appName],
-				writeToStream,
-			);
-
-			const localPath = path.join(buildAppDirectory, publishDirectory);
-
-			if (!existsSync(path.dirname(localPath))) {
-				mkdirSync(path.dirname(localPath), { recursive: true });
-			}
-
-			// https://docs.docker.com/reference/cli/docker/container/cp/
-			const isDirectory =
-				publishDirectory.endsWith("/") || !path.extname(publishDirectory);
-
-			await spawnAsync(
-				"docker",
-				[
-					"cp",
-					`${buildContainerId}:/app/${publishDirectory}${isDirectory ? "/." : ""}`,
-					localPath,
-				],
-				writeToStream,
-			);
-
-			await spawnAsync("docker", ["rm", buildContainerId], writeToStream);
-
-			await buildStatic(application, writeStream);
-		}
-		return true;
-	} catch (e) {
-		await spawnAsync("docker", ["rm", buildContainerId], writeToStream);
-
-		throw e;
-	}
-};
-
 export const getNixpacksCommand = (application: ApplicationNested) => {
 	const { env, appName, publishDirectory, cleanCache } = application;
 
@@ -118,7 +31,7 @@ export const getNixpacksCommand = (application: ApplicationNested) => {
 		args.push("--no-error-without-start");
 	}
 	const command = `nixpacks ${args.join(" ")}`;
-	const bashCommand = `
+	let bashCommand = `
 		echo "Starting nixpacks build..." ;
 		${command} || {
 			echo "❌ Nixpacks build failed" ;
@@ -132,23 +45,23 @@ export const getNixpacksCommand = (application: ApplicationNested) => {
 		and copy the artifacts on the host filesystem.
 		Then, remove the container and create a static build.
 	 */
-	// 	if (publishDirectory) {
-	// 		const localPath = path.join(buildAppDirectory, publishDirectory);
-	// 		const isDirectory =
-	// 			publishDirectory.endsWith("/") || !path.extname(publishDirectory);
+	if (publishDirectory) {
+		const localPath = path.join(buildAppDirectory, publishDirectory);
+		const isDirectory =
+			publishDirectory.endsWith("/") || !path.extname(publishDirectory);
 
-	// 		bashCommand += `
-	// docker create --name ${buildContainerId} ${appName}
-	// mkdir -p ${localPath}
-	// docker cp ${buildContainerId}:/app/${publishDirectory}${isDirectory ? "/." : ""} ${path.join(buildAppDirectory, publishDirectory)} || {
-	// 	docker rm ${buildContainerId}
-	// 	echo "❌ Copying ${publishDirectory} to ${path.join(buildAppDirectory, publishDirectory)} failed" ;
-	// 	exit 1;
-	// }
-	// docker rm ${buildContainerId}
-	// ${getStaticCommand(application)}
-	// 			`;
-	// 	}
+		bashCommand += `
+	docker create --name ${buildContainerId} ${appName}
+	mkdir -p ${localPath}
+	docker cp ${buildContainerId}:/app/${publishDirectory}${isDirectory ? "/." : ""} ${path.join(buildAppDirectory, publishDirectory)} || {
+		docker rm ${buildContainerId}
+		echo "❌ Copying ${publishDirectory} to ${path.join(buildAppDirectory, publishDirectory)} failed" ;
+		exit 1;
+	}
+	docker rm ${buildContainerId}
+	${getStaticCommand(application)}
+				`;
+	}
 
 	return bashCommand;
 };
diff --git a/packages/server/src/utils/builders/paketo.ts b/packages/server/src/utils/builders/paketo.ts
index 51e2301f9..eb9767e7f 100644
--- a/packages/server/src/utils/builders/paketo.ts
+++ b/packages/server/src/utils/builders/paketo.ts
@@ -1,49 +1,7 @@
-import type { WriteStream } from "node:fs";
 import { prepareEnvironmentVariables } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
-import { spawnAsync } from "../process/spawnAsync";
 import type { ApplicationNested } from ".";
 
-export const buildPaketo = async (
-	application: ApplicationNested,
-	writeStream: WriteStream,
-) => {
-	const { env, appName, cleanCache } = application;
-	const buildAppDirectory = getBuildAppDirectory(application);
-	const envVariables = prepareEnvironmentVariables(
-		env,
-		application.environment.project.env,
-		application.environment.env,
-	);
-	try {
-		const args = [
-			"build",
-			appName,
-			"--path",
-			buildAppDirectory,
-			"--builder",
-			"paketobuildpacks/builder-jammy-full",
-		];
-
-		if (cleanCache) {
-			args.push("--clear-cache");
-		}
-
-		for (const env of envVariables) {
-			args.push("--env", env);
-		}
-
-		await spawnAsync("pack", args, (data) => {
-			if (writeStream.writable) {
-				writeStream.write(data);
-			}
-		});
-		return true;
-	} catch (e) {
-		throw e;
-	}
-};
-
 export const getPaketoCommand = (application: ApplicationNested) => {
 	const { env, appName, cleanCache } = application;
 
diff --git a/packages/server/src/utils/builders/railpack.ts b/packages/server/src/utils/builders/railpack.ts
index 822257773..cb188fd09 100644
--- a/packages/server/src/utils/builders/railpack.ts
+++ b/packages/server/src/utils/builders/railpack.ts
@@ -1,13 +1,10 @@
 import { createHash } from "node:crypto";
-import type { WriteStream } from "node:fs";
 import { nanoid } from "nanoid";
 import {
 	parseEnvironmentKeyValuePair,
 	prepareEnvironmentVariables,
 } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
-import { execAsync } from "../process/execAsync";
-import { spawnAsync } from "../process/spawnAsync";
 import type { ApplicationNested } from ".";
 
 const calculateSecretsHash = (envVariables: string[]): string => {
@@ -18,104 +15,6 @@ const calculateSecretsHash = (envVariables: string[]): string => {
 	return hash.digest("hex");
 };
 
-export const buildRailpack = async (
-	application: ApplicationNested,
-	writeStream: WriteStream,
-) => {
-	const { env, appName, cleanCache } = application;
-	const buildAppDirectory = getBuildAppDirectory(application);
-	const envVariables = prepareEnvironmentVariables(
-		env,
-		application.environment.project.env,
-		application.environment.env,
-	);
-
-	try {
-		await execAsync(
-			"docker buildx create --use --name builder-containerd --driver docker-container || true",
-		);
-
-		await execAsync("docker buildx use builder-containerd");
-
-		// First prepare the build plan and info
-		const prepareArgs = [
-			"prepare",
-			buildAppDirectory,
-			"--plan-out",
-			`${buildAppDirectory}/railpack-plan.json`,
-			"--info-out",
-			`${buildAppDirectory}/railpack-info.json`,
-		];
-
-		// Add environment variables to prepare command
-		for (const env of envVariables) {
-			prepareArgs.push("--env", env);
-		}
-
-		// Run prepare command
-		await spawnAsync("railpack", prepareArgs, (data) => {
-			if (writeStream.writable) {
-				writeStream.write(data);
-			}
-		});
-
-		// Calculate secrets hash for layer invalidation
-		const secretsHash = calculateSecretsHash(envVariables);
-
-		// Build with BuildKit using the Railpack frontend
-		const cacheKey = cleanCache ? nanoid(10) : undefined;
-		const buildArgs = [
-			"buildx",
-			"build",
-			...(cacheKey
-				? [
-						"--build-arg",
-						`secrets-hash=${secretsHash}`,
-						"--build-arg",
-						`cache-key=${cacheKey}`,
-					]
-				: []),
-			"--build-arg",
-			`BUILDKIT_SYNTAX=ghcr.io/railwayapp/railpack-frontend:v${application.railpackVersion}`,
-			"-f",
-			`${buildAppDirectory}/railpack-plan.json`,
-			"--output",
-			`type=docker,name=${appName}`,
-		];
-
-		// Add secrets properly formatted
-		const env: { [key: string]: string } = {};
-		for (const pair of envVariables) {
-			const [key, value] = parseEnvironmentKeyValuePair(pair);
-			if (key && value) {
-				buildArgs.push("--secret", `id=${key},env=${key}`);
-				env[key] = value;
-			}
-		}
-
-		buildArgs.push(buildAppDirectory);
-
-		await spawnAsync(
-			"docker",
-			buildArgs,
-			(data) => {
-				if (writeStream.writable) {
-					writeStream.write(data);
-				}
-			},
-			{
-				env: { ...process.env, ...env },
-			},
-		);
-
-		return true;
-	} catch (e) {
-		throw e;
-	} finally {
-		await execAsync("docker buildx rm builder-containerd");
-	}
-};
-
 export const getRailpackCommand = (application: ApplicationNested) => {
 	const { env, appName, cleanCache } = application;
 	const buildAppDirectory = getBuildAppDirectory(application);
diff --git a/packages/server/src/utils/builders/static.ts b/packages/server/src/utils/builders/static.ts
index 5e1f10cc3..4ddb290be 100644
--- a/packages/server/src/utils/builders/static.ts
+++ b/packages/server/src/utils/builders/static.ts
@@ -1,9 +1,5 @@
-import type { WriteStream } from "node:fs";
-import {
-	buildCustomDocker,
-	getDockerCommand,
-} from "@dokploy/server/utils/builders/docker-file";
-import { createFile, getCreateFileCommand } from "../docker/utils";
+import { getDockerCommand } from "@dokploy/server/utils/builders/docker-file";
+import { getCreateFileCommand } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
 import type { ApplicationNested } from ".";
 
@@ -32,57 +28,6 @@ http {
 }
 `;
 
-export const buildStatic = async (
-	application: ApplicationNested,
-	writeStream: WriteStream,
-) => {
-	const { publishDirectory, isStaticSpa } = application;
-	const buildAppDirectory = getBuildAppDirectory(application);
-
-	try {
-		if (isStaticSpa) {
-			createFile(buildAppDirectory, "nginx.conf", nginxSpaConfig);
-		}
-
-		createFile(
-			buildAppDirectory,
-			".dockerignore",
-			[".git", ".env", "Dockerfile", ".dockerignore"].join("\n"),
-		);
-
-		createFile(
-			buildAppDirectory,
-			"Dockerfile",
-			[
-				"FROM nginx:alpine",
-				"WORKDIR /usr/share/nginx/html/",
-				isStaticSpa ? "COPY nginx.conf /etc/nginx/nginx.conf" : "",
-				`COPY ${publishDirectory || "."} .`,
-				'CMD ["nginx", "-g", "daemon off;"]',
-			].join("\n"),
-		);
-
-		createFile(
-			buildAppDirectory,
-			".dockerignore",
-			[".git", ".env", "Dockerfile", ".dockerignore"].join("\n"),
-		);
-
-		await buildCustomDocker(
-			{
-				...application,
-				buildType: "dockerfile",
-				dockerfile: "Dockerfile",
-			},
-			writeStream,
-		);
-
-		return true;
-	} catch (e) {
-		throw e;
-	}
-};
-
 export const getStaticCommand = (application: ApplicationNested) => {
 	const { publishDirectory } = application;
 	const buildAppDirectory = getBuildAppDirectory(application);