diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts
index b13f66784..97e15ef85 100644
--- a/apps/api/src/lib/buildPacks/common.ts
+++ b/apps/api/src/lib/buildPacks/common.ts
@@ -58,8 +58,8 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 			label: 'nginx:alpine'
 		},
 		{
-			value: 'apache:alpine',
-			label: 'apache:alpine'
+			value: 'httpd:alpine',
+			label: 'httpd:alpine (Apache)'
 		}
 	];
 	const rustVersions = [
@@ -592,6 +592,7 @@ export async function copyBaseConfigurationFiles(
             `
 			);
 		}
+		// TODO: Add more configuration files for other buildpacks, like apache2, etc.
 	} catch (error) {
 		throw new Error(error);
 	}
diff --git a/apps/api/src/lib/buildPacks/static.ts b/apps/api/src/lib/buildPacks/static.ts
index c727985ca..160098654 100644
--- a/apps/api/src/lib/buildPacks/static.ts
+++ b/apps/api/src/lib/buildPacks/static.ts
@@ -18,7 +18,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /app');
+	if (baseImage?.includes('httpd')) {
+		Dockerfile.push('WORKDIR /usr/local/apache2/htdocs/');
+	} else {
+		Dockerfile.push('WORKDIR /app');
+	}
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {