diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index 44bee6f57..dffe1ec67 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -558,8 +558,11 @@ public function loadComposeFile($isInit = false, $showToast = true, ?string $res
             $this->dispatch('refreshStorages');
             $this->dispatch('refreshEnvs');
         } catch (\Throwable $e) {
-            $this->application->docker_compose_location = $this->initialDockerComposeLocation;
-            $this->application->save();
+            // Refresh model to get restored values from Application::loadComposeFile
+            $this->application->refresh();
+            // Sync restored values back to component properties for UI update
+
+            $this->syncData();
 
             return handleError($e, $this);
         } finally {
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 5006d0ff8..40e41c2a7 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -1584,6 +1584,11 @@ public function loadComposeFile($isInit = false, ?string $restoreBaseDirectory =
         try {
             $composeFileContent = instant_remote_process($commands, $this->destination->server);
         } catch (\Exception $e) {
+            // Restore original values on failure only
+            $this->docker_compose_location = $initialDockerComposeLocation;
+            $this->base_directory = $initialBaseDirectory;
+            $this->save();
+
             if (str($e->getMessage())->contains('No such file')) {
                 throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
             }
@@ -1595,9 +1600,7 @@ public function loadComposeFile($isInit = false, ?string $restoreBaseDirectory =
             }
             throw new \RuntimeException($e->getMessage());
         } finally {
-            $this->docker_compose_location = $initialDockerComposeLocation;
-            $this->base_directory = $initialBaseDirectory;
-            $this->save();
+            // Cleanup only - restoration happens in catch block
             $commands = collect([
                 "rm -rf /tmp/{$uuid}",
             ]);
@@ -1643,6 +1646,11 @@ public function loadComposeFile($isInit = false, ?string $restoreBaseDirectory =
                 'initialDockerComposeLocation' => $this->docker_compose_location,
             ];
         } else {
+            // Restore original values before throwing
+            $this->docker_compose_location = $initialDockerComposeLocation;
+            $this->base_directory = $initialBaseDirectory;
+            $this->save();
+
             throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
         }
     }
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 254f31ca6..cf9621462 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -46,10 +46,9 @@
 
                     @if ($buildPack === 'dockercompose')
                         @if (
-                                !is_null($parsedServices) &&
+                            !is_null($parsedServices) &&
                                 count($parsedServices) > 0 &&
-                                !$application->settings->is_raw_compose_deployment_enabled
-                            )
+                                !$application->settings->is_raw_compose_deployment_enabled)
                             <h3 class="pt-6">Domains</h3>
                             @foreach (data_get($parsedServices, 'services') as $serviceName => $service)
                                 @if (!isDatabaseImage(data_get($service, 'image')))
@@ -80,11 +79,11 @@
                         buttonTitle="Generate Default Nginx Configuration" buttonFullWidth
                         submitAction="generateNginxConfiguration('{{ $application->settings->is_spa ? 'spa' : 'static' }}')"
                         :actions="[
-                        'This will overwrite your current custom Nginx configuration.',
-                        'The default configuration will be generated based on your application type (' .
-                        ($application->settings->is_spa ? 'SPA' : 'static') .
-                        ').',
-                    ]" />
+                            'This will overwrite your current custom Nginx configuration.',
+                            'The default configuration will be generated based on your application type (' .
+                            ($application->settings->is_spa ? 'SPA' : 'static') .
+                            ').',
+                        ]" />
                 @endcan
             @endif
             <div class="w-96 pb-6">
@@ -166,8 +165,9 @@
                 </div>
                 @if ($application->destination->server->isSwarm())
                     @if ($application->build_pack !== 'dockerimage')
-                        <div>Docker Swarm requires the image to be available in a registry. More info <a class="underline"
-                                href="https://coolify.io/docs/knowledge-base/docker/registry" target="_blank">here</a>.</div>
+                        <div>Docker Swarm requires the image to be available in a registry. More info <a
+                                class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
+                                target="_blank">here</a>.</div>
                     @endif
                 @endif
                 <div class="flex flex-col gap-2 xl:flex-row">
@@ -179,19 +179,19 @@
                                 helper="Enter a tag (e.g., 'latest', 'v1.2.3') or SHA256 hash (e.g., 'sha256-59e02939b1bf39f16c93138a28727aec520bb916da021180ae502c61626b3cf0')"
                                 x-bind:disabled="!canUpdate" />
                         @else
-                            <x-forms.input id="dockerRegistryImageName" label="Docker Image" x-bind:disabled="!canUpdate" />
+                            <x-forms.input id="dockerRegistryImageName" label="Docker Image"
+                                x-bind:disabled="!canUpdate" />
                             <x-forms.input id="dockerRegistryImageTag" label="Docker Image Tag or Hash"
                                 helper="Enter a tag (e.g., 'latest', 'v1.2.3') or SHA256 hash (e.g., 'sha256-59e02939b1bf39f16c93138a28727aec520bb916da021180ae502c61626b3cf0')"
                                 x-bind:disabled="!canUpdate" />
                         @endif
                     @else
                         @if (
-                                $application->destination->server->isSwarm() ||
+                            $application->destination->server->isSwarm() ||
                                 $application->additional_servers->count() > 0 ||
-                                $application->settings->is_build_server_enabled
-                            )
-                            <x-forms.input id="dockerRegistryImageName" required label="Docker Image" placeholder="Required!"
-                                x-bind:disabled="!canUpdate" />
+                                $application->settings->is_build_server_enabled)
+                            <x-forms.input id="dockerRegistryImageName" required label="Docker Image"
+                                placeholder="Required!" x-bind:disabled="!canUpdate" />
                             <x-forms.input id="dockerRegistryImageTag"
                                 helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
                                 placeholder="Empty means latest will be used." label="Docker Image Tag"
@@ -199,9 +199,10 @@
                         @else
                             <x-forms.input id="dockerRegistryImageName"
                                 helper="Empty means it won't push the image to a docker registry. Pre-tag the image with your registry url if you want to push it to a private registry (default: Dockerhub). <br><br>Example: ghcr.io/myimage"
-                                placeholder="Empty means it won't push the image to a docker registry." label="Docker Image"
-                                x-bind:disabled="!canUpdate" />
-                            <x-forms.input id="dockerRegistryImageTag" placeholder="Empty means only push commit sha tag."
+                                placeholder="Empty means it won't push the image to a docker registry."
+                                label="Docker Image" x-bind:disabled="!canUpdate" />
+                            <x-forms.input id="dockerRegistryImageTag"
+                                placeholder="Empty means only push commit sha tag."
                                 helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
                                 label="Docker Image Tag" x-bind:disabled="!canUpdate" />
                         @endif
@@ -236,82 +237,11 @@
                     @endif
                     <div class="flex flex-col gap-2 pt-6 pb-10">
                         @if ($buildPack === 'dockercompose')
-                                <div class="flex flex-col gap-2" @can('update', $application) x-init="$wire.dispatch('loadCompose', true)" @endcan>
-                                    <div x-data="{
-                                        baseDir: '{{ $application->base_directory }}',
-                                        composeLocation: '{{ $application->docker_compose_location }}',
-                                        normalizePath(path) {
-                                            if (!path || path.trim() === '') return '/';
-                                            path = path.trim();
-                                            path = path.replace(/\/+$/, '');
-                                            if (!path.startsWith('/')) {
-                                                path = '/' + path;
-                                            }
-                                            return path;
-                                        },
-                                        normalizeBaseDir() {
-                                            this.baseDir = this.normalizePath(this.baseDir);
-                                        },
-                                        normalizeComposeLocation() {
-                                            this.composeLocation = this.normalizePath(this.composeLocation);
-                                        }
-                                    }" class="flex gap-2">
-                                        <x-forms.input x-bind:disabled="shouldDisable()" placeholder="/" wire:model.defer="baseDirectory"
-                                            label="Base Directory" helper="Directory to use as root. Useful for monorepos."
-                                            x-model="baseDir" @blur="normalizeBaseDir()" />
-                                        <x-forms.input x-bind:disabled="shouldDisable()" placeholder="/docker-compose.yaml"
-                                            wire:model.defer="dockerComposeLocation" label="Docker Compose Location"
-                                            helper="It is calculated together with the Base Directory:<br><span class='dark:text-warning'>{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }}</span>"
-                                            x-model="composeLocation" @blur="normalizeComposeLocation()" />
-                                    </div>
-                                    <div class="w-96">
-                                        <x-forms.checkbox instantSave id="isPreserveRepositoryEnabled"
-                                            label="Preserve Repository During Deployment"
-                                            helper="Git repository (based on the base directory settings) will be copied to the deployment directory."
-                                            x-bind:disabled="shouldDisable()" />
-                                    </div>
-                                    <div class="pt-4">The following commands are for advanced use cases.
-                                        Only
-                                        modify them if you
-                                        know what are
-                                        you doing.</div>
-                                    <div class="flex gap-2">
-                                        <x-forms.input x-bind:disabled="shouldDisable()" placeholder="docker compose build"
-                                            id="dockerComposeCustomBuildCommand"
-                                            helper="The compose file path (<span class='dark:text-warning'>-f</span> flag) and environment variables (<span class='dark:text-warning'>--env-file</span> flag) are automatically injected based on your Base Directory and Docker Compose Location settings. You can override by providing your own <span class='dark:text-warning'>-f</span> or <span class='dark:text-warning'>--env-file</span> flags.<br><br>If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>Example usage: <span class='dark:text-warning'>docker compose build</span>"
-                                            label="Custom Build Command" />
-                                        <x-forms.input x-bind:disabled="shouldDisable()" placeholder="docker compose up -d"
-                                            id="dockerComposeCustomStartCommand"
-                                            helper="The compose file path (<span class='dark:text-warning'>-f</span> flag) and environment variables (<span class='dark:text-warning'>--env-file</span> flag) are automatically injected based on your Base Directory and Docker Compose Location settings. You can override by providing your own <span class='dark:text-warning'>-f</span> or <span class='dark:text-warning'>--env-file</span> flags.<br><br>If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>Example usage: <span class='dark:text-warning'>docker compose up -d</span>"
-                                            label="Custom Start Command" />
-                                    </div>
-                                    @if ($this->dockerComposeCustomBuildCommand)
-                                        <div wire:key="docker-compose-build-preview">
-                                            <x-forms.input readonly value="{{ $this->dockerComposeBuildCommandPreview }}"
-                                                label="Final Build Command (Preview)"
-                                                helper="This shows the actual command that will be executed with auto-injected flags." />
-                                        </div>
-                                    @endif
-                                    @if ($this->dockerComposeCustomStartCommand)
-                                        <div wire:key="docker-compose-start-preview">
-                                            <x-forms.input readonly value="{{ $this->dockerComposeStartCommandPreview }}"
-                                                label="Final Start Command (Preview)"
-                                                helper="This shows the actual command that will be executed with auto-injected flags." />
-                                        </div>
-                                    @endif
-                                    @if ($this->application->is_github_based() && !$this->application->is_public_repository())
-                                        <div class="pt-4">
-                                            <x-forms.textarea
-                                                helper="Order-based pattern matching to filter Git webhook deployments. Supports wildcards (*, **, ?) and negation (!). Last matching pattern wins."
-                                                placeholder="services/api/**" id="watchPaths" label="Watch Paths"
-                                                x-bind:disabled="shouldDisable()" />
-                                        </div>
-                                    @endif
-                                </div>
-                        @else
+                            <div class="flex flex-col gap-2"
+                                @can('update', $application) x-init="$wire.dispatch('loadCompose', true)" @endcan>
                                 <div x-data="{
-                                    baseDir: '{{ $application->base_directory }}',
-                                    dockerfileLocation: '{{ $application->dockerfile_location }}',
+                                    baseDir: @entangle('baseDirectory'),
+                                    composeLocation: @entangle('dockerComposeLocation'),
                                     normalizePath(path) {
                                         if (!path || path.trim() === '') return '/';
                                         path = path.trim();
@@ -324,65 +254,145 @@
                                     normalizeBaseDir() {
                                         this.baseDir = this.normalizePath(this.baseDir);
                                     },
-                                    normalizeDockerfileLocation() {
-                                        this.dockerfileLocation = this.normalizePath(this.dockerfileLocation);
+                                    normalizeComposeLocation() {
+                                        this.composeLocation = this.normalizePath(this.composeLocation);
                                     }
-                                }" class="flex flex-col gap-2 xl:flex-row">
-                                    <x-forms.input placeholder="/" wire:model.defer="baseDirectory" label="Base Directory"
-                                        helper="Directory to use as root. Useful for monorepos." x-bind:disabled="!canUpdate"
-                                        x-model="baseDir" @blur="normalizeBaseDir()" />
-                                    @if ($buildPack === 'dockerfile' && !$application->dockerfile)
-                                        <x-forms.input placeholder="/Dockerfile" wire:model.defer="dockerfileLocation" label="Dockerfile Location"
-                                            helper="It is calculated together with the Base Directory:<br><span class='dark:text-warning'>{{ Str::start($application->base_directory . $application->dockerfile_location, '/') }}</span>"
-                                            x-bind:disabled="!canUpdate" x-model="dockerfileLocation" @blur="normalizeDockerfileLocation()" />
-                                    @endif
-
-                                    @if ($buildPack === 'dockerfile')
-                                        <x-forms.input id="dockerfileTargetBuild" label="Docker Build Stage Target"
-                                            helper="Useful if you have multi-staged dockerfile." x-bind:disabled="!canUpdate" />
-                                    @endif
-                                    @if ($application->could_set_build_commands())
-                                        @if ($application->settings->is_static)
-                                            <x-forms.input placeholder="/dist" id="publishDirectory" label="Publish Directory" required
-                                                x-bind:disabled="!canUpdate" />
-                                        @else
-                                            <x-forms.input placeholder="/" id="publishDirectory" label="Publish Directory"
-                                                x-bind:disabled="!canUpdate" />
-                                        @endif
-                                    @endif
-
+                                }" class="flex gap-2">
+                                    <x-forms.input x-bind:disabled="shouldDisable()" placeholder="/"
+                                        label="Base Directory"
+                                        helper="Directory to use as root. Useful for monorepos." x-model="baseDir"
+                                        @blur="normalizeBaseDir()" />
+                                    <x-forms.input x-bind:disabled="shouldDisable()"
+                                        placeholder="/docker-compose.yaml"
+                                        label="Docker Compose Location"
+                                        helper="It is calculated together with the Base Directory:<br><span class='dark:text-warning'>{{ Str::start($baseDirectory . $dockerComposeLocation, '/') }}</span>"
+                                        x-model="composeLocation" @blur="normalizeComposeLocation()" />
                                 </div>
+                                <div class="w-96">
+                                    <x-forms.checkbox instantSave id="isPreserveRepositoryEnabled"
+                                        label="Preserve Repository During Deployment"
+                                        helper="Git repository (based on the base directory settings) will be copied to the deployment directory."
+                                        x-bind:disabled="shouldDisable()" />
+                                </div>
+                                <div class="pt-4">The following commands are for advanced use cases.
+                                    Only
+                                    modify them if you
+                                    know what are
+                                    you doing.</div>
+                                <div class="flex gap-2">
+                                    <x-forms.input x-bind:disabled="shouldDisable()"
+                                        placeholder="docker compose build" id="dockerComposeCustomBuildCommand"
+                                        helper="The compose file path (<span class='dark:text-warning'>-f</span> flag) and environment variables (<span class='dark:text-warning'>--env-file</span> flag) are automatically injected based on your Base Directory and Docker Compose Location settings. You can override by providing your own <span class='dark:text-warning'>-f</span> or <span class='dark:text-warning'>--env-file</span> flags.<br><br>If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>Example usage: <span class='dark:text-warning'>docker compose build</span>"
+                                        label="Custom Build Command" />
+                                    <x-forms.input x-bind:disabled="shouldDisable()"
+                                        placeholder="docker compose up -d" id="dockerComposeCustomStartCommand"
+                                        helper="The compose file path (<span class='dark:text-warning'>-f</span> flag) and environment variables (<span class='dark:text-warning'>--env-file</span> flag) are automatically injected based on your Base Directory and Docker Compose Location settings. You can override by providing your own <span class='dark:text-warning'>-f</span> or <span class='dark:text-warning'>--env-file</span> flags.<br><br>If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>Example usage: <span class='dark:text-warning'>docker compose up -d</span>"
+                                        label="Custom Start Command" />
+                                </div>
+                                @if ($this->dockerComposeCustomBuildCommand)
+                                    <div wire:key="docker-compose-build-preview">
+                                        <x-forms.input readonly value="{{ $this->dockerComposeBuildCommandPreview }}"
+                                            label="Final Build Command (Preview)"
+                                            helper="This shows the actual command that will be executed with auto-injected flags." />
+                                    </div>
+                                @endif
+                                @if ($this->dockerComposeCustomStartCommand)
+                                    <div wire:key="docker-compose-start-preview">
+                                        <x-forms.input readonly value="{{ $this->dockerComposeStartCommandPreview }}"
+                                            label="Final Start Command (Preview)"
+                                            helper="This shows the actual command that will be executed with auto-injected flags." />
+                                    </div>
+                                @endif
                                 @if ($this->application->is_github_based() && !$this->application->is_public_repository())
-                                    <div class="pb-4">
+                                    <div class="pt-4">
                                         <x-forms.textarea
                                             helper="Order-based pattern matching to filter Git webhook deployments. Supports wildcards (*, **, ?) and negation (!). Last matching pattern wins."
-                                            placeholder="src/pages/**" id="watchPaths" label="Watch Paths"
-                                            x-bind:disabled="!canUpdate" />
+                                            placeholder="services/api/**" id="watchPaths" label="Watch Paths"
+                                            x-bind:disabled="shouldDisable()" />
                                     </div>
                                 @endif
-                                <x-forms.input
-                                    helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"
-                                    placeholder="--cap-add SYS_ADMIN --device=/dev/fuse --security-opt apparmor:unconfined --ulimit nofile=1024:1024 --tmpfs /run:rw,noexec,nosuid,size=65536k --hostname=myapp"
-                                    id="customDockerRunOptions" label="Custom Docker Options" x-bind:disabled="!canUpdate" />
+                            </div>
+                        @else
+                            <div x-data="{
+                                baseDir: '{{ $application->base_directory }}',
+                                dockerfileLocation: '{{ $application->dockerfile_location }}',
+                                normalizePath(path) {
+                                    if (!path || path.trim() === '') return '/';
+                                    path = path.trim();
+                                    path = path.replace(/\/+$/, '');
+                                    if (!path.startsWith('/')) {
+                                        path = '/' + path;
+                                    }
+                                    return path;
+                                },
+                                normalizeBaseDir() {
+                                    this.baseDir = this.normalizePath(this.baseDir);
+                                },
+                                normalizeDockerfileLocation() {
+                                    this.dockerfileLocation = this.normalizePath(this.dockerfileLocation);
+                                }
+                            }" class="flex flex-col gap-2 xl:flex-row">
+                                <x-forms.input placeholder="/" wire:model.defer="baseDirectory"
+                                    label="Base Directory" helper="Directory to use as root. Useful for monorepos."
+                                    x-bind:disabled="!canUpdate" x-model="baseDir" @blur="normalizeBaseDir()" />
+                                @if ($buildPack === 'dockerfile' && !$application->dockerfile)
+                                    <x-forms.input placeholder="/Dockerfile" wire:model.defer="dockerfileLocation"
+                                        label="Dockerfile Location"
+                                        helper="It is calculated together with the Base Directory:<br><span class='dark:text-warning'>{{ Str::start($application->base_directory . $application->dockerfile_location, '/') }}</span>"
+                                        x-bind:disabled="!canUpdate" x-model="dockerfileLocation"
+                                        @blur="normalizeDockerfileLocation()" />
+                                @endif
 
-                                @if ($buildPack !== 'dockercompose')
-                                    <div class="pt-2 w-96">
-                                        <x-forms.checkbox
-                                            helper="Use a build server to build your application. You can configure your build server in the Server settings. For more info, check the <a href='https://coolify.io/docs/knowledge-base/server/build-server' class='underline' target='_blank'>documentation</a>."
-                                            instantSave id="isBuildServerEnabled" label="Use a Build Server?"
-                                            x-bind:disabled="!canUpdate" />
-                                    </div>
+                                @if ($buildPack === 'dockerfile')
+                                    <x-forms.input id="dockerfileTargetBuild" label="Docker Build Stage Target"
+                                        helper="Useful if you have multi-staged dockerfile."
+                                        x-bind:disabled="!canUpdate" />
                                 @endif
+                                @if ($application->could_set_build_commands())
+                                    @if ($application->settings->is_static)
+                                        <x-forms.input placeholder="/dist" id="publishDirectory"
+                                            label="Publish Directory" required x-bind:disabled="!canUpdate" />
+                                    @else
+                                        <x-forms.input placeholder="/" id="publishDirectory"
+                                            label="Publish Directory" x-bind:disabled="!canUpdate" />
+                                    @endif
+                                @endif
+
+                            </div>
+                            @if ($this->application->is_github_based() && !$this->application->is_public_repository())
+                                <div class="pb-4">
+                                    <x-forms.textarea
+                                        helper="Order-based pattern matching to filter Git webhook deployments. Supports wildcards (*, **, ?) and negation (!). Last matching pattern wins."
+                                        placeholder="src/pages/**" id="watchPaths" label="Watch Paths"
+                                        x-bind:disabled="!canUpdate" />
+                                </div>
                             @endif
-                        </div>
+                            <x-forms.input
+                                helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"
+                                placeholder="--cap-add SYS_ADMIN --device=/dev/fuse --security-opt apparmor:unconfined --ulimit nofile=1024:1024 --tmpfs /run:rw,noexec,nosuid,size=65536k --hostname=myapp"
+                                id="customDockerRunOptions" label="Custom Docker Options"
+                                x-bind:disabled="!canUpdate" />
+
+                            @if ($buildPack !== 'dockercompose')
+                                <div class="pt-2 w-96">
+                                    <x-forms.checkbox
+                                        helper="Use a build server to build your application. You can configure your build server in the Server settings. For more info, check the <a href='https://coolify.io/docs/knowledge-base/server/build-server' class='underline' target='_blank'>documentation</a>."
+                                        instantSave id="isBuildServerEnabled" label="Use a Build Server?"
+                                        x-bind:disabled="!canUpdate" />
+                                </div>
+                            @endif
+                        @endif
+                    </div>
                 @endif
-                </div>
-                @if ($buildPack === 'dockercompose')
-                    <div x-data="{ showRaw: true }">
-                        <div class="flex items-center gap-2">
-                            <h3>Docker Compose</h3>
-                            <x-forms.button x-show="!($application->settings->is_raw_compose_deployment_enabled)" @click.prevent="showRaw = !showRaw" x-text="showRaw ? 'Show Deployable Compose' : 'Show Raw Compose'"></x-forms.button>
-                        </div>
+            </div>
+            @if ($buildPack === 'dockercompose')
+                <div x-data="{ showRaw: true }">
+                    <div class="flex items-center gap-2">
+                        <h3>Docker Compose</h3>
+                        <x-forms.button x-show="!($application->settings->is_raw_compose_deployment_enabled)"
+                            @click.prevent="showRaw = !showRaw"
+                            x-text="showRaw ? 'Show Deployable Compose' : 'Show Raw Compose'"></x-forms.button>
+                    </div>
                     @if ($application->settings->is_raw_compose_deployment_enabled)
                         <x-forms.textarea rows="10" readonly id="dockerComposeRaw"
                             label="Docker Compose Content (applicationId: {{ $application->id }})"
@@ -391,13 +401,15 @@
                     @else
                         @if ((int) $application->compose_parsing_version >= 3)
                             <div x-show="showRaw">
-                                <x-forms.textarea rows="10" readonly id="dockerComposeRaw" label="Docker Compose Content (raw)"
+                                <x-forms.textarea rows="10" readonly id="dockerComposeRaw"
+                                    label="Docker Compose Content (raw)"
                                     helper="You need to modify the docker compose file in the git repository."
                                     monacoEditorLanguage="yaml" useMonacoEditor />
                             </div>
                         @endif
                         <div x-show="showRaw === false">
-                            <x-forms.textarea rows="10" readonly id="dockerCompose" label="Docker Compose Content"
+                            <x-forms.textarea rows="10" readonly id="dockerCompose"
+                                label="Docker Compose Content"
                                 helper="You need to modify the docker compose file in the git repository."
                                 monacoEditorLanguage="yaml" useMonacoEditor />
                         </div>
@@ -405,172 +417,179 @@
                     <div class="w-96">
                         <x-forms.checkbox label="Escape special characters in labels?"
                             helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
-                            id="isContainerLabelEscapeEnabled" instantSave x-bind:disabled="!canUpdate"></x-forms.checkbox>
+                            id="isContainerLabelEscapeEnabled" instantSave
+                            x-bind:disabled="!canUpdate"></x-forms.checkbox>
                         {{-- <x-forms.checkbox label="Readonly labels"
                             helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenerate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenerate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
                             id="isContainerLabelReadonlyEnabled" instantSave></x-forms.checkbox> --}}
                     </div>
-                    </div>
-                @endif
-                @if ($application->dockerfile)
-                    <x-forms.textarea label="Dockerfile" id="dockerfile" monacoEditorLanguage="dockerfile" useMonacoEditor
-                        rows="6" x-bind:disabled="!canUpdate"> </x-forms.textarea>
-                @endif
-                @if ($buildPack !== 'dockercompose')
-                    <h3 class="pt-8">Network</h3>
-                    @if ($this->detectedPortInfo)
-                        @if ($this->detectedPortInfo['isEmpty'])
-                            <div
-                                class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-warning-50 dark:bg-warning-900/20 text-warning-800 dark:text-warning-300 border border-warning-200 dark:border-warning-800">
-                                <svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd"
-                                        d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z"
-                                        clip-rule="evenodd" />
-                                </svg>
-                                <div>
-                                    <span class="font-semibold">PORT environment variable detected
-                                        ({{ $this->detectedPortInfo['port'] }})</span>
-                                    <p class="mt-1">Your Ports Exposes field is empty. Consider setting it to
-                                        <strong>{{ $this->detectedPortInfo['port'] }}</strong> to ensure the proxy routes traffic
-                                        correctly.</p>
-                                </div>
+                </div>
+            @endif
+            @if ($application->dockerfile)
+                <x-forms.textarea label="Dockerfile" id="dockerfile" monacoEditorLanguage="dockerfile"
+                    useMonacoEditor rows="6" x-bind:disabled="!canUpdate"> </x-forms.textarea>
+            @endif
+            @if ($buildPack !== 'dockercompose')
+                <h3 class="pt-8">Network</h3>
+                @if ($this->detectedPortInfo)
+                    @if ($this->detectedPortInfo['isEmpty'])
+                        <div
+                            class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-warning-50 dark:bg-warning-900/20 text-warning-800 dark:text-warning-300 border border-warning-200 dark:border-warning-800">
+                            <svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
+                                <path fill-rule="evenodd"
+                                    d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z"
+                                    clip-rule="evenodd" />
+                            </svg>
+                            <div>
+                                <span class="font-semibold">PORT environment variable detected
+                                    ({{ $this->detectedPortInfo['port'] }})</span>
+                                <p class="mt-1">Your Ports Exposes field is empty. Consider setting it to
+                                    <strong>{{ $this->detectedPortInfo['port'] }}</strong> to ensure the proxy routes
+                                    traffic
+                                    correctly.
+                                </p>
                             </div>
-                        @elseif (!$this->detectedPortInfo['matches'])
-                            <div
-                                class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-warning-50 dark:bg-warning-900/20 text-warning-800 dark:text-warning-300 border border-warning-200 dark:border-warning-800">
-                                <svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd"
-                                        d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z"
-                                        clip-rule="evenodd" />
-                                </svg>
-                                <div>
-                                    <span class="font-semibold">PORT mismatch detected</span>
-                                    <p class="mt-1">Your PORT environment variable is set to
-                                        <strong>{{ $this->detectedPortInfo['port'] }}</strong>, but it's not in your Ports Exposes
-                                        configuration. Ensure they match for proper proxy routing.</p>
-                                </div>
+                        </div>
+                    @elseif (!$this->detectedPortInfo['matches'])
+                        <div
+                            class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-warning-50 dark:bg-warning-900/20 text-warning-800 dark:text-warning-300 border border-warning-200 dark:border-warning-800">
+                            <svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
+                                <path fill-rule="evenodd"
+                                    d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z"
+                                    clip-rule="evenodd" />
+                            </svg>
+                            <div>
+                                <span class="font-semibold">PORT mismatch detected</span>
+                                <p class="mt-1">Your PORT environment variable is set to
+                                    <strong>{{ $this->detectedPortInfo['port'] }}</strong>, but it's not in your Ports
+                                    Exposes
+                                    configuration. Ensure they match for proper proxy routing.
+                                </p>
                             </div>
-                        @else
-                            <div
-                                class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-blue-50 dark:bg-blue-900/20 text-blue-800 dark:text-blue-300 border border-blue-200 dark:border-blue-800">
-                                <svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd"
-                                        d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a.75.75 0 000 1.5h.253a.25.25 0 01.244.304l-.459 2.066A1.75 1.75 0 0010.747 15H11a.75.75 0 000-1.5h-.253a.25.25 0 01-.244-.304l.459-2.066A1.75 1.75 0 009.253 9H9z"
-                                        clip-rule="evenodd" />
-                                </svg>
-                                <div>
-                                    <span class="font-semibold">PORT environment variable configured</span>
-                                    <p class="mt-1">Your PORT environment variable ({{ $this->detectedPortInfo['port'] }}) matches
-                                        your Ports Exposes configuration.</p>
-                                </div>
+                        </div>
+                    @else
+                        <div
+                            class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-blue-50 dark:bg-blue-900/20 text-blue-800 dark:text-blue-300 border border-blue-200 dark:border-blue-800">
+                            <svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
+                                <path fill-rule="evenodd"
+                                    d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a.75.75 0 000 1.5h.253a.25.25 0 01.244.304l-.459 2.066A1.75 1.75 0 0010.747 15H11a.75.75 0 000-1.5h-.253a.25.25 0 01-.244-.304l.459-2.066A1.75 1.75 0 009.253 9H9z"
+                                    clip-rule="evenodd" />
+                            </svg>
+                            <div>
+                                <span class="font-semibold">PORT environment variable configured</span>
+                                <p class="mt-1">Your PORT environment variable
+                                    ({{ $this->detectedPortInfo['port'] }}) matches
+                                    your Ports Exposes configuration.</p>
                             </div>
-                        @endif
+                        </div>
                     @endif
-                    <div class="flex flex-col gap-2 xl:flex-row">
-                        @if ($isStatic || $buildPack === 'static')
-                            <x-forms.input id="portsExposes" label="Ports Exposes" readonly x-bind:disabled="!canUpdate" />
+                @endif
+                <div class="flex flex-col gap-2 xl:flex-row">
+                    @if ($isStatic || $buildPack === 'static')
+                        <x-forms.input id="portsExposes" label="Ports Exposes" readonly
+                            x-bind:disabled="!canUpdate" />
+                    @else
+                        @if ($application->settings->is_container_label_readonly_enabled === false)
+                            <x-forms.input placeholder="3000,3001" id="portsExposes" label="Ports Exposes" readonly
+                                helper="Readonly labels are disabled. You can set the ports manually in the labels section."
+                                x-bind:disabled="!canUpdate" />
                         @else
-                            @if ($application->settings->is_container_label_readonly_enabled === false)
-                                <x-forms.input placeholder="3000,3001" id="portsExposes" label="Ports Exposes" readonly
-                                    helper="Readonly labels are disabled. You can set the ports manually in the labels section."
-                                    x-bind:disabled="!canUpdate" />
-                            @else
-                                <x-forms.input placeholder="3000,3001" id="portsExposes" label="Ports Exposes" required
-                                    helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly."
-                                    x-bind:disabled="!canUpdate" />
-                            @endif
-                        @endif
-                        @if (!$application->destination->server->isSwarm())
-                            <x-forms.input placeholder="3000:3000" id="portsMappings" label="Ports Mappings"
-                                helper="A comma separated list of ports you would like to map to the host system. Useful when you do not want to use domains.<br><br><span class='inline-block font-bold dark:text-warning'>Example:</span><br>3000:3000,3002:3002<br><br>Rolling update is not supported if you have a port mapped to the host."
+                            <x-forms.input placeholder="3000,3001" id="portsExposes" label="Ports Exposes" required
+                                helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly."
                                 x-bind:disabled="!canUpdate" />
                         @endif
-                        @if (!$application->destination->server->isSwarm())
-                            <x-forms.input id="customNetworkAliases" label="Network Aliases"
-                                helper="A comma separated list of custom network aliases you would like to add for container in Docker network.<br><br><span class='inline-block font-bold dark:text-warning'>Example:</span><br>api.internal,api.local"
-                                wire:model="customNetworkAliases" x-bind:disabled="!canUpdate" />
-                        @endif
-                    </div>
-
-                    <h3 class="pt-8">HTTP Basic Authentication</h3>
-                    <div>
-                        <div class="w-96">
-                            <x-forms.checkbox helper="This will add the proper proxy labels to the container." instantSave
-                                label="Enable" id="isHttpBasicAuthEnabled" x-bind:disabled="!canUpdate" />
-                        </div>
-                        @if ($application->is_http_basic_auth_enabled)
-                            <div class="flex gap-2 py-2">
-                                <x-forms.input id="httpBasicAuthUsername" label="Username" required
-                                    x-bind:disabled="!canUpdate" />
-                                <x-forms.input id="httpBasicAuthPassword" type="password" label="Password" required
-                                    x-bind:disabled="!canUpdate" />
-                            </div>
-                        @endif
-                    </div>
-
-                    @if ($application->settings->is_container_label_readonly_enabled)
-                        <x-forms.textarea readonly disabled label="Container Labels" rows="15" id="customLabels"
-                            monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>
-                    @else
-                        <x-forms.textarea label="Container Labels" rows="15" id="customLabels" monacoEditorLanguage="ini"
-                            useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>
                     @endif
+                    @if (!$application->destination->server->isSwarm())
+                        <x-forms.input placeholder="3000:3000" id="portsMappings" label="Ports Mappings"
+                            helper="A comma separated list of ports you would like to map to the host system. Useful when you do not want to use domains.<br><br><span class='inline-block font-bold dark:text-warning'>Example:</span><br>3000:3000,3002:3002<br><br>Rolling update is not supported if you have a port mapped to the host."
+                            x-bind:disabled="!canUpdate" />
+                    @endif
+                    @if (!$application->destination->server->isSwarm())
+                        <x-forms.input id="customNetworkAliases" label="Network Aliases"
+                            helper="A comma separated list of custom network aliases you would like to add for container in Docker network.<br><br><span class='inline-block font-bold dark:text-warning'>Example:</span><br>api.internal,api.local"
+                            wire:model="customNetworkAliases" x-bind:disabled="!canUpdate" />
+                    @endif
+                </div>
+
+                <h3 class="pt-8">HTTP Basic Authentication</h3>
+                <div>
                     <div class="w-96">
-                        <x-forms.checkbox label="Readonly labels"
-                            helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenerate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenerate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
-                            id="isContainerLabelReadonlyEnabled" instantSave
-                            x-bind:disabled="!canUpdate"></x-forms.checkbox>
-                        <x-forms.checkbox label="Escape special characters in labels?"
-                            helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
-                            id="isContainerLabelEscapeEnabled" instantSave x-bind:disabled="!canUpdate"></x-forms.checkbox>
+                        <x-forms.checkbox helper="This will add the proper proxy labels to the container." instantSave
+                            label="Enable" id="isHttpBasicAuthEnabled" x-bind:disabled="!canUpdate" />
                     </div>
-                    @can('update', $application)
-                            <x-modal-confirmation title="Confirm Labels Reset to Coolify Defaults?"
-                                buttonTitle="Reset Labels to Defaults" buttonFullWidth submitAction="resetDefaultLabels(true)"
-                                :actions="[
+                    @if ($application->is_http_basic_auth_enabled)
+                        <div class="flex gap-2 py-2">
+                            <x-forms.input id="httpBasicAuthUsername" label="Username" required
+                                x-bind:disabled="!canUpdate" />
+                            <x-forms.input id="httpBasicAuthPassword" type="password" label="Password" required
+                                x-bind:disabled="!canUpdate" />
+                        </div>
+                    @endif
+                </div>
+
+                @if ($application->settings->is_container_label_readonly_enabled)
+                    <x-forms.textarea readonly disabled label="Container Labels" rows="15" id="customLabels"
+                        monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>
+                @else
+                    <x-forms.textarea label="Container Labels" rows="15" id="customLabels"
+                        monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>
+                @endif
+                <div class="w-96">
+                    <x-forms.checkbox label="Readonly labels"
+                        helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenerate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenerate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
+                        id="isContainerLabelReadonlyEnabled" instantSave
+                        x-bind:disabled="!canUpdate"></x-forms.checkbox>
+                    <x-forms.checkbox label="Escape special characters in labels?"
+                        helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
+                        id="isContainerLabelEscapeEnabled" instantSave
+                        x-bind:disabled="!canUpdate"></x-forms.checkbox>
+                </div>
+                @can('update', $application)
+                    <x-modal-confirmation title="Confirm Labels Reset to Coolify Defaults?"
+                        buttonTitle="Reset Labels to Defaults" buttonFullWidth submitAction="resetDefaultLabels(true)"
+                        :actions="[
                             'All your custom proxy labels will be lost.',
                             'Proxy labels (traefik, caddy, etc) will be reset to the coolify defaults.',
                         ]" confirmationText="{{ $application->fqdn . '/' }}"
-                                confirmationLabel="Please confirm the execution of the actions by entering the Application URL below"
-                                shortConfirmationLabel="Application URL" :confirmWithPassword="false"
-                                step2ButtonText="Permanently Reset Labels" />
-                    @endcan
-                @endif
+                        confirmationLabel="Please confirm the execution of the actions by entering the Application URL below"
+                        shortConfirmationLabel="Application URL" :confirmWithPassword="false"
+                        step2ButtonText="Permanently Reset Labels" />
+                @endcan
+            @endif
 
-                <h3 class="pt-8">Pre/Post Deployment Commands</h3>
-                <div class="flex flex-col gap-2 xl:flex-row">
-                    <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"
-                        id="preDeploymentCommand" label="Pre-deployment "
-                        helper="An optional script or command to execute in the existing container before the deployment begins.<br>It is always executed with 'sh -c', so you do not need add it manually." />
-                    @if ($buildPack === 'dockercompose')
-                        <x-forms.input x-bind:disabled="shouldDisable()" id="preDeploymentCommandContainer"
-                            label="Container Name"
-                            helper="The name of the container to execute within. You can leave it blank if your application only has one container." />
-                    @endif
-                </div>
-                <div class="flex flex-col gap-2 xl:flex-row">
-                    <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"
-                        id="postDeploymentCommand" label="Post-deployment "
-                        helper="An optional script or command to execute in the newly built container after the deployment completes.<br>It is always executed with 'sh -c', so you do not need add it manually." />
-                    @if ($buildPack === 'dockercompose')
-                        <x-forms.input x-bind:disabled="shouldDisable()" id="postDeploymentCommandContainer"
-                            label="Container Name"
-                            helper="The name of the container to execute within. You can leave it blank if your application only has one container." />
-                    @endif
-                </div>
+            <h3 class="pt-8">Pre/Post Deployment Commands</h3>
+            <div class="flex flex-col gap-2 xl:flex-row">
+                <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"
+                    id="preDeploymentCommand" label="Pre-deployment "
+                    helper="An optional script or command to execute in the existing container before the deployment begins.<br>It is always executed with 'sh -c', so you do not need add it manually." />
+                @if ($buildPack === 'dockercompose')
+                    <x-forms.input x-bind:disabled="shouldDisable()" id="preDeploymentCommandContainer"
+                        label="Container Name"
+                        helper="The name of the container to execute within. You can leave it blank if your application only has one container." />
+                @endif
             </div>
+            <div class="flex flex-col gap-2 xl:flex-row">
+                <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"
+                    id="postDeploymentCommand" label="Post-deployment "
+                    helper="An optional script or command to execute in the newly built container after the deployment completes.<br>It is always executed with 'sh -c', so you do not need add it manually." />
+                @if ($buildPack === 'dockercompose')
+                    <x-forms.input x-bind:disabled="shouldDisable()" id="postDeploymentCommandContainer"
+                        label="Container Name"
+                        helper="The name of the container to execute within. You can leave it blank if your application only has one container." />
+                @endif
+            </div>
+        </div>
     </form>
 
-    <x-domain-conflict-modal :conflicts="$domainConflicts" :showModal="$showDomainConflictModal"
-        confirmAction="confirmDomainUsage" />
+    <x-domain-conflict-modal :conflicts="$domainConflicts" :showModal="$showDomainConflictModal" confirmAction="confirmDomainUsage" />
 
     @script
-    <script>
-        $wire.$on('loadCompose', (isInit = true) => {
-            // Only load compose file if user has permission (this event should only be dispatched when authorized)
-            $wire.initLoadingCompose = true;
-            $wire.loadComposeFile(isInit);
-        });
-    </script>
+        <script>
+            $wire.$on('loadCompose', (isInit = true) => {
+                // Only load compose file if user has permission (this event should only be dispatched when authorized)
+                $wire.initLoadingCompose = true;
+                $wire.loadComposeFile(isInit);
+            });
+        </script>
     @endscript
-</div>
\ No newline at end of file
+</div>