diff --git a/lib/docker.ts b/lib/docker.ts
index 570c693b..0a87953b 100644
--- a/lib/docker.ts
+++ b/lib/docker.ts
@@ -140,15 +140,12 @@ export async function startNextcloud(branch = 'master', mountApp: boolean | stri
 		console.log('\nStarting Nextcloud container… 🚀')
 		console.log(`├─ Using branch '${branch}'`)
 
-		const mountedAppsFolder = !!Object.keys(options.mounts ?? {}).find((folder) => folder === 'apps')
-		const appsFolder = mountedAppsFolder ? 'apps_writable' : 'apps'
-
 		const mounts: string[] = []
 		Object.entries(options.mounts ?? {})
 			.forEach(([server, local]) => mounts.push(`${local}:/var/www/html/${server}:ro`))
 
 		if (appPath !== false) {
-			mounts.push(`${appPath}:/var/www/html/${appsFolder}/${appId}:ro`)
+			mounts.push(`${appPath}:/var/www/html/apps-writable/${appId}:ro`)
 		}
 
 		const PortBindings = !options.exposePort
@@ -167,14 +164,12 @@ export async function startNextcloud(branch = 'master', mountApp: boolean | stri
 			Image: SERVER_IMAGE,
 			name: getContainerName(),
 			Env: [`BRANCH=${branch}`, 'APCU=1'],
-			Volumes: mountedAppsFolder
-				? {
-						apps_writable: {
-							Mountpoint: '/var/www/html/apps_writable',
-							Readonly: false,
-						},
-					}
-				: undefined,
+			Volumes: {
+				apps_writable: {
+					Mountpoint: '/var/www/html/apps-writable',
+					Readonly: false,
+				},
+			},
 			HostConfig: {
 				Binds: mounts.length > 0 ? mounts : undefined,
 				PortBindings,
@@ -271,11 +266,10 @@ export async function configureNextcloud(apps = ['viewer'], vendoredBranch?: str
 	const { stdout: json } = await runOcc(['app:list', '--output', 'json'], { container })
 	const applist = JSON.parse(json)
 
-	const mountedAppsFolder = (await container.inspect()).Config.Volumes?.apps_writable !== undefined
-	const appsFolder = mountedAppsFolder ? 'apps_writable' : 'apps'
-	if (mountedAppsFolder) {
-		console.log(`├─ Using ${appsFolder} folder for mounted apps`)
-		const appsConfig = `<?php
+	console.log('├─ Using "apps-writable" folder for mounted apps')
+	await runExec(['mkdir', '-p', '/var/www/html/apps-writable'], { container })
+	await runExec(['chown', 'www-data:www-data', '/var/www/html/apps-writable'], { container })
+	const appsConfig = `<?php
 	$CONFIG = [
 		'apps_paths' => [
 			[
@@ -284,17 +278,16 @@ export async function configureNextcloud(apps = ['viewer'], vendoredBranch?: str
 					'writable' => false,
 			],
 			[
-					'path' => '/var/www/html/${appsFolder}',
-					'url' => '/${appsFolder}',
+					'path' => '/var/www/html/apps-writable',
+					'url' => '/apps-writable',
 					'writable' => true,
 			],
 	],
 ];`
-		const stream = tarStreamer.pack()
-		stream.entry({ name: 'apps.config.php' }, appsConfig)
-		stream.finalize()
-		await container.putArchive(stream, { path: '/var/www/html/config' })
-	}
+	const stream = tarStreamer.pack()
+	stream.entry({ name: 'apps.config.php' }, appsConfig)
+	stream.finalize()
+	await container.putArchive(stream, { path: '/var/www/html/config' })
 
 	// Enable apps and give status
 	for (const app of apps) {
@@ -309,7 +302,7 @@ export async function configureNextcloud(apps = ['viewer'], vendoredBranch?: str
 			if (shippedApps.includes(app)) {
 				const branchOption = ['main', 'master'].includes(vendoredBranch) ? [] : [`--branch=${vendoredBranch}`]
 				await runExec(
-					['git', 'clone', '--depth=1', ...branchOption, `https://github.com/nextcloud/${encodeURIComponent(app)}.git`, `${appsFolder}/${app}`],
+					['git', 'clone', '--depth=1', ...branchOption, `https://github.com/nextcloud/${encodeURIComponent(app)}.git`, `apps-writable/${app}`],
 					{ container, verbose: true },
 				)
 				await runOcc(['app:enable', '--force', app], { container, verbose: true })
diff --git a/tests/docker.spec.ts b/tests/docker.spec.ts
index ffe8b297..936d7655 100644
--- a/tests/docker.spec.ts
+++ b/tests/docker.spec.ts
@@ -19,13 +19,13 @@ describe('Docker: Pre-installation of apps', async () => {
 	await test('Additional apps: Default mapping works', async () => {
 		const container = getContainer()
 		// this must not throw
-		await runExec(['file', '-f', 'apps/viewer/appinfo/info.xml'], { container, failOnError: true })
+		await runExec(['file', '-f', 'apps-writable/viewer/appinfo/info.xml'], { container, failOnError: true })
 	})
 
 	await test('Additional apps: Mapping "main" branches', async () => {
 		const container = getContainer()
 		// this must not throw
-		await runExec(['file', '-f', 'apps/text/appinfo/info.xml'], { container })
+		await runExec(['file', '-f', 'apps-writable/text/appinfo/info.xml'], { container })
 		const { enabled } = await getAppsList()
 		expect.equal('text' in enabled, true, 'Text app should be enabled')
 	})
@@ -33,7 +33,7 @@ describe('Docker: Pre-installation of apps', async () => {
 	await test('Additional apps: fetching from appstore works', async () => {
 		const container = getContainer()
 		// this must not throw
-		await runExec(['file', '-f', 'apps/forms/appinfo/info.xml'], { container })
+		await runExec(['file', '-f', 'apps-writable/forms/appinfo/info.xml'], { container })
 		const { enabled } = await getAppsList()
 		expect.equal('forms' in enabled, true, 'Forms app should be enabled')
 	})