diff --git a/apps/dokploy/server/wss/listen-deployment.ts b/apps/dokploy/server/wss/listen-deployment.ts
index 4a25c6f0e..581c04d7b 100644
--- a/apps/dokploy/server/wss/listen-deployment.ts
+++ b/apps/dokploy/server/wss/listen-deployment.ts
@@ -61,7 +61,6 @@ export const setupDeploymentLogsWebSocketServer = (
 							}
 							stream
 								.on("close", () => {
-									console.log("Connection closed ✅");
 									client.end();
 									ws.close();
 								})
@@ -86,7 +85,6 @@ export const setupDeploymentLogsWebSocketServer = (
 					});
 
 				ws.on("close", () => {
-					console.log("Connection closed ✅, From WS");
 					client.end();
 				});
 			} else {
diff --git a/packages/server/src/services/compose.ts b/packages/server/src/services/compose.ts
index a3ebc26ce..54aa5f1e0 100644
--- a/packages/server/src/services/compose.ts
+++ b/packages/server/src/services/compose.ts
@@ -289,11 +289,11 @@ export const rebuildCompose = async ({
 		// if (admin.cleanupCacheOnCompose) {
 		// 	await cleanupFullDocker(compose?.serverId);
 		// }
-		if (compose.serverId) {
-			await getBuildComposeCommand(compose, deployment.logPath);
-		} else {
-			await buildCompose(compose, deployment.logPath);
+
+		if (compose.sourceType === "raw") {
+			await createComposeFile(compose, deployment.logPath);
 		}
+		await buildCompose(compose, deployment.logPath);
 
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 		await updateCompose(composeId, {
@@ -433,6 +433,10 @@ export const rebuildRemoteCompose = async ({
 		// if (admin.cleanupCacheOnCompose) {
 		// 	await cleanupFullDocker(compose?.serverId);
 		// }
+		if (compose.sourceType === "raw") {
+			const command = getCreateComposeFileCommand(compose, deployment.logPath);
+			await execAsyncRemote(compose.serverId, command);
+		}
 		if (compose.serverId) {
 			await getBuildComposeCommand(compose, deployment.logPath);
 		}