diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts
index fd36a2ea6..32e498845 100644
--- a/apps/api/src/lib/buildPacks/common.ts
+++ b/apps/api/src/lib/buildPacks/common.ts
@@ -480,7 +480,6 @@ export const saveBuildLog = async ({
 			}
 		})
 	} catch (error) {
-		if (isDev) return
 		return await prisma.buildLog.create({
 			data: {
 				line: addTimestamp, buildId, time: Number(day().valueOf()), applicationId
diff --git a/apps/api/src/lib/buildPacks/heroku.ts b/apps/api/src/lib/buildPacks/heroku.ts
index c9608aba2..c108f3203 100644
--- a/apps/api/src/lib/buildPacks/heroku.ts
+++ b/apps/api/src/lib/buildPacks/heroku.ts
@@ -2,13 +2,14 @@ import { executeDockerCmd, prisma } from "../common"
 import { saveBuildLog } from "./common";
 
 export default async function (data: any): Promise<void> {
-    const { buildId, applicationId, tag, dockerId, debug, workdir, baseDirectory } = data
+    const { buildId, applicationId, tag, dockerId, debug, workdir, baseDirectory, baseImage } = data
     try {
         await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
         await executeDockerCmd({
+            buildId,
             debug,
             dockerId,
-            command: `pack build -p ${workdir}${baseDirectory} ${applicationId}:${tag} --builder heroku/buildpacks:20`
+            command: `pack build -p ${workdir}${baseDirectory} ${applicationId}:${tag} --builder ${baseImage}`
         })
         await saveBuildLog({ line: `Building image successful.`, buildId, applicationId });
     } catch (error) {
diff --git a/apps/api/src/routes/webhooks/traefik/handlers.ts b/apps/api/src/routes/webhooks/traefik/handlers.ts
index 6be99ac25..79488e2bc 100644
--- a/apps/api/src/routes/webhooks/traefik/handlers.ts
+++ b/apps/api/src/routes/webhooks/traefik/handlers.ts
@@ -523,9 +523,7 @@ export async function traefikConfiguration(request, reply) {
 				}
 			}
 		}
-		return {
-			...traefik
-		}
+		
 		const { fqdn, dualCerts } = await prisma.setting.findFirst();
 		if (fqdn) {
 			const domain = getDomain(fqdn);
@@ -546,30 +544,30 @@ export async function traefikConfiguration(request, reply) {
 		for (const application of data.applications) {
 			configureMiddleware(application, traefik);
 		}
-		for (const service of data.services) {
-			const { id, scriptName } = service;
+		// for (const service of data.services) {
+		// 	const { id, scriptName } = service;
 
-			configureMiddleware(service, traefik);
-			if (service.type === 'minio') {
-				service.id = id + '-minio';
-				service.container = id;
-				service.domain = service.otherDomain;
-				service.nakedDomain = service.otherNakedDomain;
-				service.isHttps = service.otherIsHttps;
-				service.isWWW = service.otherIsWWW;
-				service.port = 9000;
-				configureMiddleware(service, traefik);
-			}
+		// 	configureMiddleware(service, traefik);
+		// 	if (service.type === 'minio') {
+		// 		service.id = id + '-minio';
+		// 		service.container = id;
+		// 		service.domain = service.otherDomain;
+		// 		service.nakedDomain = service.otherNakedDomain;
+		// 		service.isHttps = service.otherIsHttps;
+		// 		service.isWWW = service.otherIsWWW;
+		// 		service.port = 9000;
+		// 		configureMiddleware(service, traefik);
+		// 	}
 
-			if (scriptName) {
-				traefik.http.middlewares[`${id}-redir`] = {
-					replacepathregex: {
-						regex: `/js/${scriptName}`,
-						replacement: '/js/plausible.js'
-					}
-				};
-			}
-		}
+		// 	if (scriptName) {
+		// 		traefik.http.middlewares[`${id}-redir`] = {
+		// 			replacepathregex: {
+		// 				regex: `/js/${scriptName}`,
+		// 				replacement: '/js/plausible.js'
+		// 			}
+		// 		};
+		// 	}
+		// }
 		for (const coolify of data.coolify) {
 			configureMiddleware(coolify, traefik);
 		}
diff --git a/apps/ui/src/routes/applications/[id]/_Menu.svelte b/apps/ui/src/routes/applications/[id]/_Menu.svelte
index 9fb95bc6f..4ba711bc0 100644
--- a/apps/ui/src/routes/applications/[id]/_Menu.svelte
+++ b/apps/ui/src/routes/applications/[id]/_Menu.svelte
@@ -86,7 +86,7 @@
 				<path
 					d="M7 10h3v-3l-3.5 -3.5a6 6 0 0 1 8 8l6 6a2 2 0 0 1 -3 3l-6 -6a6 6 0 0 1 -8 -8l3.5 3.5"
 				/>
-			</svg>Build & Deploy</a
+			</svg>Configuration</a
 		>
 	</li>
 	<li
diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte
index a9bb458c2..029735d0c 100644
--- a/apps/ui/src/routes/applications/[id]/__layout.svelte
+++ b/apps/ui/src/routes/applications/[id]/__layout.svelte
@@ -415,15 +415,14 @@
 				</button>
 			{/if}
 			<button
-				class="btn btn-sm btn-ghost gap-2"
-				class:btn-primary={$status.application.overallStatus !== 'degraded'}
+				class="btn btn-sm gap-2"
 				disabled={!$isDeploymentEnabled}
 				on:click={() => handleDeploySubmit(false)}
 			>
 				{#if $status.application.overallStatus !== 'degraded'}
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
-						class="w-6 h-6"
+						class="w-6 h-6 text-pink-500"
 						viewBox="0 0 24 24"
 						stroke-width="1.5"
 						stroke="currentColor"
diff --git a/apps/ui/src/routes/applications/[id]/configuration/source.svelte b/apps/ui/src/routes/applications/[id]/configuration/source.svelte
index bf1bd0978..4da394538 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/source.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/source.svelte
@@ -68,7 +68,9 @@
 </script>
 
 <div class="max-w-screen-2xl mx-auto px-9">
-	<div class="title pb-8">Git App</div>
+	{#if !filteredSources}
+		<div class="title pb-8">Git App</div>
+	{/if}
 	<div class="flex flex-wrap justify-center">
 		{#if !filteredSources}
 			<div class="flex-col">
diff --git a/apps/ui/src/routes/applications/[id]/index.svelte b/apps/ui/src/routes/applications/[id]/index.svelte
index 2ad0fe468..ca838cb92 100644
--- a/apps/ui/src/routes/applications/[id]/index.svelte
+++ b/apps/ui/src/routes/applications/[id]/index.svelte
@@ -644,7 +644,7 @@
 			</div>
 			{#if application.buildPack !== 'compose'}
 				<div class="title font-bold pb-3 pt-10 border-b border-coolgray-500 mb-6">
-					Build & Deploy
+					Configuration
 				</div>
 				<div class="grid grid-flow-row gap-2 px-4 pr-5">
 					{#if application.buildCommand || application.buildPack === 'rust' || application.buildPack === 'laravel'}