diff --git a/apps/api/src/jobs/deployApplication.ts b/apps/api/src/jobs/deployApplication.ts
index c8fea7548..6f79b94e8 100644
--- a/apps/api/src/jobs/deployApplication.ts
+++ b/apps/api/src/jobs/deployApplication.ts
@@ -141,9 +141,12 @@ import * as buildpacks from '../lib/buildPacks';
 										} catch (error) {
 											//
 										}
-										let envs = ['NODE_ENV=production', `PORT=${port}`];
+										let envs = [];
 										if (secrets.length > 0) {
-											envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId)];
+											envs = [
+												...envs,
+												...generateSecrets(secrets, pullmergeRequestId, false, port)
+											];
 										}
 										await fs.writeFile(`${workdir}/Dockerfile`, simpleDockerfile);
 										if (dockerRegistry) {
@@ -676,9 +679,12 @@ import * as buildpacks from '../lib/buildPacks';
 										} catch (error) {
 											//
 										}
-										let envs = ['NODE_ENV=production', `PORT=${port}`];
+										let envs = [];
 										if (secrets.length > 0) {
-											envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId)];
+											envs = [
+												...envs,
+												...generateSecrets(secrets, pullmergeRequestId, false, port)
+											];
 										}
 										if (dockerRegistry) {
 											const { url, username, password } = dockerRegistry;
diff --git a/apps/api/src/lib/buildPacks/compose.ts b/apps/api/src/lib/buildPacks/compose.ts
index d4adb796a..3f2bd5878 100644
--- a/apps/api/src/lib/buildPacks/compose.ts
+++ b/apps/api/src/lib/buildPacks/compose.ts
@@ -25,9 +25,9 @@ export default async function (data) {
 	if (!dockerComposeYaml.services) {
 		throw 'No Services found in docker-compose file.';
 	}
-	let envs = ['NODE_ENV=production'];
+	let envs = [];
 	if (secrets.length > 0) {
-		envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId)];
+		envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId, false, null)];
 	}
 
 	const composeVolumes = [];
diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index bef297488..5087d4dcc 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -19,7 +19,7 @@ import { saveBuildLog, saveDockerRegistryCredentials } from './buildPacks/common
 import { scheduler } from './scheduler';
 import type { ExecaChildProcess } from 'execa';
 
-export const version = '3.12.3';
+export const version = '3.12.4';
 export const isDev = process.env.NODE_ENV === 'development';
 export const sentryDSN =
 	'https://409f09bcb7af47928d3e0f46b78987f3@o1082494.ingest.sentry.io/4504236622217216';
@@ -1879,7 +1879,8 @@ export async function pushToRegistry(
 export function generateSecrets(
 	secrets: Array<any>,
 	pullmergeRequestId: string,
-	isBuild = false
+	isBuild = false,
+	port = null
 ): Array<string> {
 	const envs = [];
 	const isPRMRSecret = secrets.filter((s) => s.isPRMRSecret);
@@ -1918,6 +1919,13 @@ export function generateSecrets(
 			}
 		});
 	}
+	const portFound = envs.filter((env) => env.startsWith('PORT'));
+	if (portFound.length === 0 && port && !isBuild) {
+		envs.push(`PORT=${port}`);
+	}
+	const nodeEnv = envs.filter((env) => env.startsWith('NODE_ENV'));
+	if (nodeEnv.length === 0 && !isBuild) {
+		envs.push(`NODE_ENV=production`);
+	}
 	return envs;
 }
-
diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts
index ebc70e713..ecbe67c6c 100644
--- a/apps/api/src/routes/api/v1/applications/handlers.ts
+++ b/apps/api/src/routes/api/v1/applications/handlers.ts
@@ -569,10 +569,12 @@ export async function restartApplication(
 			} = application;
 			let location = null;
 
-			let envs = ['NODE_ENV=production', `PORT=${port}`];
+			let envs = [];
 			if (secrets.length > 0) {
-				envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId)];
+				envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId, false, port)];
 			}
+			console.log(envs);
+
 			const { workdir } = await createDirectories({ repository, buildId });
 			const labels = [];
 			let image = null;
@@ -659,6 +661,7 @@ export async function restartApplication(
 				},
 				volumes: Object.assign({}, ...composeVolumes)
 			};
+			console.log(yaml.dump(composeFile));
 			await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
 			try {
 				await executeCommand({ dockerId, command: `docker stop -t 0 ${id}` });
@@ -1370,9 +1373,9 @@ export async function restartPreview(
 				exposePort
 			} = application;
 
-			let envs = ['NODE_ENV=production', `PORT=${port}`];
+			let envs = [];
 			if (secrets.length > 0) {
-				envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId)];
+				envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId, false, port)];
 			}
 			const { workdir } = await createDirectories({ repository, buildId });
 			const labels = [];
diff --git a/package.json b/package.json
index 0b6546855..4a4edc8a6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.12.3",
+  "version": "3.12.4",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {