diff --git a/apps/api/src/lib/buildPacks/compose.ts b/apps/api/src/lib/buildPacks/compose.ts
index c73ddb9bd..f180630dc 100644
--- a/apps/api/src/lib/buildPacks/compose.ts
+++ b/apps/api/src/lib/buildPacks/compose.ts
@@ -1,115 +1,126 @@
 import { promises as fs } from 'fs';
 import { defaultComposeConfiguration, executeCommand } from '../common';
-import { buildImage, saveBuildLog } from './common';
+import { saveBuildLog } from './common';
 import yaml from 'js-yaml';
 
 export default async function (data) {
-    let {
-        applicationId,
-        debug,
-        buildId,
-        dockerId,
-        network,
-        volumes,
-        labels,
-        workdir,
-        baseDirectory,
-        secrets,
-        pullmergeRequestId,
-        port,
-        dockerComposeConfiguration,
-        dockerComposeFileLocation
-    } = data
-    const fileYaml = `${workdir}${baseDirectory}${dockerComposeFileLocation}`
-    const dockerComposeRaw = await fs.readFile(fileYaml, 'utf8');
-    const dockerComposeYaml = yaml.load(dockerComposeRaw)
-    if (!dockerComposeYaml.services) {
-        throw 'No Services found in docker-compose file.'
-    }
-    const envs = [];
-    if (Object.entries(dockerComposeYaml.services).length === 1) {
-        envs.push(`PORT=${port}`)
-    }
-    if (secrets.length > 0) {
-        secrets.forEach((secret) => {
-            if (pullmergeRequestId) {
-                const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-                if (isSecretFound.length > 0) {
-                    envs.push(`${secret.name}=${isSecretFound[0].value}`);
-                } else {
-                    envs.push(`${secret.name}=${secret.value}`);
-                }
-            } else {
-                if (!secret.isPRMRSecret) {
-                    envs.push(`${secret.name}=${secret.value}`);
-                }
-            }
-        });
-    }
-    await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
-    let envFound = false;
-    try {
-        envFound = !!(await fs.stat(`${workdir}/.env`));
-    } catch (error) {
-        //
-    }
-    const composeVolumes = [];
-    if (volumes.length > 0) {
-        for (const volume of volumes) {
-            let [v, path] = volume.split(':');
-            composeVolumes[v] = {
-                name: v,
-            }
-        }
-    }
+	let {
+		applicationId,
+		debug,
+		buildId,
+		dockerId,
+		network,
+		volumes,
+		labels,
+		workdir,
+		baseDirectory,
+		secrets,
+		pullmergeRequestId,
+		dockerComposeConfiguration,
+		dockerComposeFileLocation
+	} = data;
+	const fileYaml = `${workdir}${baseDirectory}${dockerComposeFileLocation}`;
+	const dockerComposeRaw = await fs.readFile(fileYaml, 'utf8');
+	const dockerComposeYaml = yaml.load(dockerComposeRaw);
+	if (!dockerComposeYaml.services) {
+		throw 'No Services found in docker-compose file.';
+	}
+	const envs = [];
+	if (secrets.length > 0) {
+		secrets.forEach((secret) => {
+			if (pullmergeRequestId) {
+				const isSecretFound = secrets.filter((s) => s.name === secret.name && s.isPRMRSecret);
+				if (isSecretFound.length > 0) {
+					envs.push(`${secret.name}=${isSecretFound[0].value}`);
+				} else {
+					envs.push(`${secret.name}=${secret.value}`);
+				}
+			} else {
+				if (!secret.isPRMRSecret) {
+					envs.push(`${secret.name}=${secret.value}`);
+				}
+			}
+		});
+	}
+	await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
+	let envFound = false;
+	try {
+		envFound = !!(await fs.stat(`${workdir}/.env`));
+	} catch (error) {
+		//
+	}
+	const composeVolumes = [];
+	if (volumes.length > 0) {
+		for (const volume of volumes) {
+			let [v, path] = volume.split(':');
+			composeVolumes[v] = {
+				name: v
+			};
+		}
+	}
 
-    let networks = {}
-    for (let [key, value] of Object.entries(dockerComposeYaml.services)) {
-        value['container_name'] = `${applicationId}-${key}`
-        value['env_file'] = envFound ? [`${workdir}/.env`] : []
-        value['labels'] = labels
-        // TODO: If we support separated volume for each service, we need to add it here
-        if (value['volumes']?.length > 0) {
-            value['volumes'] = value['volumes'].map((volume) => {
-                let [v, path, permission] = volume.split(':');
-                if (!path) {
-                    path = v;
-                    v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`
-                } else {
-                    v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`
-                }
-                composeVolumes[v] = {
-                    name: v
-                }
-                return `${v}:${path}${permission ? ':' + permission : ''}`
-            })
-        }
-        if (volumes.length > 0) {
-            for (const volume of volumes) {
-                value['volumes'].push(volume)
-            }
-        }
-        if (dockerComposeConfiguration[key].port) {
-            value['expose'] = [dockerComposeConfiguration[key].port]
-        }
-        if (value['networks']?.length > 0) {
-            value['networks'].forEach((network) => {
-                networks[network] = {
-                    name: network
-                }
-            })
-        }
-        value['networks'] = [...value['networks'] || '', network]
-        dockerComposeYaml.services[key] = { ...dockerComposeYaml.services[key], restart: defaultComposeConfiguration(network).restart, deploy: defaultComposeConfiguration(network).deploy }
-
-    }
-    if (Object.keys(composeVolumes).length > 0) {
-        dockerComposeYaml['volumes'] = { ...composeVolumes }
-    }
-    dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } })
-    await fs.writeFile(fileYaml, yaml.dump(dockerComposeYaml));
-    await executeCommand({ debug, buildId, applicationId, dockerId, command: `docker compose --project-directory ${workdir} pull` })
-    await saveBuildLog({ line: 'Pulling images from Compose file...', buildId, applicationId });
-    await executeCommand({ debug, buildId, applicationId, dockerId, command: `docker compose --project-directory ${workdir} build --progress plain` })
-    await saveBuildLog({ line: 'Building images from Compose file...', buildId, applicationId });
+	let networks = {};
+	for (let [key, value] of Object.entries(dockerComposeYaml.services)) {
+		value['container_name'] = `${applicationId}-${key}`;
+		value['env_file'] = envFound ? [`${workdir}/.env`] : [];
+		value['labels'] = labels;
+		// TODO: If we support separated volume for each service, we need to add it here
+		if (value['volumes']?.length > 0) {
+			value['volumes'] = value['volumes'].map((volume) => {
+				let [v, path, permission] = volume.split(':');
+				if (!path) {
+					path = v;
+					v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`;
+				} else {
+					v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`;
+				}
+				composeVolumes[v] = {
+					name: v
+				};
+				return `${v}:${path}${permission ? ':' + permission : ''}`;
+			});
+		}
+		if (volumes.length > 0) {
+			for (const volume of volumes) {
+				value['volumes'].push(volume);
+			}
+		}
+		if (dockerComposeConfiguration[key].port) {
+			value['expose'] = [dockerComposeConfiguration[key].port];
+		}
+		if (value['networks']?.length > 0) {
+			value['networks'].forEach((network) => {
+				networks[network] = {
+					name: network
+				};
+			});
+		}
+		value['networks'] = [...(value['networks'] || ''), network];
+		dockerComposeYaml.services[key] = {
+			...dockerComposeYaml.services[key],
+			restart: defaultComposeConfiguration(network).restart,
+			deploy: defaultComposeConfiguration(network).deploy
+		};
+	}
+	if (Object.keys(composeVolumes).length > 0) {
+		dockerComposeYaml['volumes'] = { ...composeVolumes };
+	}
+	dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } });
+	await fs.writeFile(fileYaml, yaml.dump(dockerComposeYaml));
+	await executeCommand({
+		debug,
+		buildId,
+		applicationId,
+		dockerId,
+		command: `docker compose --project-directory ${workdir} pull`
+	});
+	await saveBuildLog({ line: 'Pulling images from Compose file...', buildId, applicationId });
+	await executeCommand({
+		debug,
+		buildId,
+		applicationId,
+		dockerId,
+		command: `docker compose --project-directory ${workdir} build --progress plain`
+	});
+	await saveBuildLog({ line: 'Building images from Compose file...', buildId, applicationId });
 }