diff --git a/resources/views/livewire/server/docker-cleanup.blade.php b/resources/views/livewire/server/docker-cleanup.blade.php
index cdf48c6aa..8151b5358 100644
--- a/resources/views/livewire/server/docker-cleanup.blade.php
+++ b/resources/views/livewire/server/docker-cleanup.blade.php
@@ -6,72 +6,75 @@
     <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">
         <x-server.sidebar :server="$server" activeMenu="docker-cleanup" />
         <div class="w-full">
-            <div>
-                <div class="flex items-center gap-2">
-                    <h2>Docker Cleanup</h2>
+            <form wire:submit='submit'>
+                <div>
+                    <div class="flex items-center gap-2">
+                        <h2>Docker Cleanup</h2>
+                        <x-forms.button type="submit">Save</x-forms.button>
+                    </div>
+                    <div class="mt-3 mb-4">Configure Docker cleanup settings for your server.</div>
                 </div>
-                <div class="mt-3 mb-4">Configure Docker cleanup settings for your server.</div>
-            </div>
 
-            <div class="flex flex-col gap-2">
-                <div class="flex gap-4">
-                    <h3>Docker Cleanup</h3>
-                    <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
-                        isHighlightedButton submitAction="manualCleanup" :actions="[
-                            'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
-                            'Permanently deletes all unused images',
-                            'Clears build cache',
-                            'Removes old versions of the Coolify helper image',
-                            'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
-                            'Optionally permanently deletes all unused networks (if enabled in advanced options).',
-                        ]" :confirmWithText="false"
-                        :confirmWithPassword="false" step2ButtonText="Trigger Docker Cleanup" />
-                </div>
-                <div class="flex flex-wrap items-center gap-4">
-                    <x-forms.input placeholder="*/10 * * * *" id="dockerCleanupFrequency"
-                        label="Docker cleanup frequency" required
-                        helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
-                    @if (!$forceDockerCleanup)
-                    <x-forms.input id="dockerCleanupThreshold" label="Docker cleanup threshold (%)" required
-                        helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
-                    @endif
+                <div class="flex flex-col gap-2">
+                    <div class="flex gap-4">
+                        <h3>Docker Cleanup</h3>
+                        <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
+                            isHighlightedButton submitAction="manualCleanup" :actions="[
+                                'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
+                                'Permanently deletes all unused images',
+                                'Clears build cache',
+                                'Removes old versions of the Coolify helper image',
+                                'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
+                                'Optionally permanently deletes all unused networks (if enabled in advanced options).',
+                            ]" :confirmWithText="false"
+                            :confirmWithPassword="false" step2ButtonText="Trigger Docker Cleanup" />
+                    </div>
+                    <div class="flex flex-wrap items-center gap-4">
+                        <x-forms.input placeholder="*/10 * * * *" id="dockerCleanupFrequency"
+                            label="Docker cleanup frequency" required
+                            helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
+                        @if (!$forceDockerCleanup)
+                        <x-forms.input id="dockerCleanupThreshold" label="Docker cleanup threshold (%)" required
+                            helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
+                        @endif
+                        <div class="w-96">
+                            <x-forms.checkbox
+                                helper="Enabling Force Docker Cleanup or manually triggering a cleanup will perform the following actions:
+                        <ul class='list-disc pl-4 mt-2'>
+                            <li>Removes stopped containers managed by Coolify (as containers are none persistent, no data will be lost).</li>
+                            <li>Deletes unused images.</li>
+                            <li>Clears build cache.</li>
+                            <li>Removes old versions of the Coolify helper image.</li>
+                            <li>Optionally delete unused volumes (if enabled in advanced options).</li>
+                            <li>Optionally remove unused networks (if enabled in advanced options).</li>
+                        </ul>"
+                                instantSave id="forceDockerCleanup" label="Force Docker Cleanup" />
+                        </div>
+                    </div>
+                    <p class="text-sm text-gray-600 dark:text-gray-400 mb-2">
+                        <span class="dark:text-warning font-bold">Warning: Enable these
+                            options only if you fully understand their implications and
+                            consequences!</span><br>Improper use will result in data loss and could cause
+                        functional issues.
+                    </p>
                     <div class="w-96">
-                        <x-forms.checkbox
-                            helper="Enabling Force Docker Cleanup or manually triggering a cleanup will perform the following actions:
+                        <x-forms.checkbox instantSave id="deleteUnusedVolumes" label="Delete Unused Volumes"
+                            helper="This option will remove all unused Docker volumes during cleanup.<br><br><strong>Warning: Data form stopped containers will be lost!</strong><br><br>Consequences include:<br>
                     <ul class='list-disc pl-4 mt-2'>
-                        <li>Removes stopped containers managed by Coolify (as containers are none persistent, no data will be lost).</li>
-                        <li>Deletes unused images.</li>
-                        <li>Clears build cache.</li>
-                        <li>Removes old versions of the Coolify helper image.</li>
-                        <li>Optionally delete unused volumes (if enabled in advanced options).</li>
-                        <li>Optionally remove unused networks (if enabled in advanced options).</li>
-                    </ul>"
-                            instantSave id="forceDockerCleanup" label="Force Docker Cleanup" />
+                    <li>Volumes not attached to running containers will be deleted and data will be permanently lost (stopped containers are affected).</li>
+                    <li>Data from stopped containers volumes will be permanently lost.</li>
+                    <li>No way to recover deleted volume data.</li>
+                    </ul>" />
+                        <x-forms.checkbox instantSave id="deleteUnusedNetworks" label="Delete Unused Networks"
+                            helper="This option will remove all unused Docker networks during cleanup.<br><br><strong>Warning: Functionality may be lost and containers may not be able to communicate with each other!</strong><br><br>Consequences include:<br>
+                    <ul class='list-disc pl-4 mt-2'>
+                    <li>Networks not attached to running containers will be permanently deleted (stopped containers are affected).</li>
+                    <li>Custom networks for stopped containers will be permanently deleted.</li>
+                    <li>Functionality may be lost and containers may not be able to communicate with each other.</li>
+                    </ul>" />
                     </div>
                 </div>
-                <p class="text-sm text-gray-600 dark:text-gray-400 mb-2">
-                    <span class="dark:text-warning font-bold">Warning: Enable these
-                        options only if you fully understand their implications and
-                        consequences!</span><br>Improper use will result in data loss and could cause
-                    functional issues.
-                </p>
-                <div class="w-96">
-                    <x-forms.checkbox instantSave id="deleteUnusedVolumes" label="Delete Unused Volumes"
-                        helper="This option will remove all unused Docker volumes during cleanup.<br><br><strong>Warning: Data form stopped containers will be lost!</strong><br><br>Consequences include:<br>
-            <ul class='list-disc pl-4 mt-2'>
-            <li>Volumes not attached to running containers will be deleted and data will be permanently lost (stopped containers are affected).</li>
-            <li>Data from stopped containers volumes will be permanently lost.</li>
-            <li>No way to recover deleted volume data.</li>
-            </ul>" />
-                    <x-forms.checkbox instantSave id="deleteUnusedNetworks" label="Delete Unused Networks"
-                        helper="This option will remove all unused Docker networks during cleanup.<br><br><strong>Warning: Functionality may be lost and containers may not be able to communicate with each other!</strong><br><br>Consequences include:<br>
-            <ul class='list-disc pl-4 mt-2'>
-            <li>Networks not attached to running containers will be permanently deleted (stopped containers are affected).</li>
-            <li>Custom networks for stopped containers will be permanently deleted.</li>
-            <li>Functionality may be lost and containers may not be able to communicate with each other.</li>
-            </ul>" />
-                </div>
-            </div>
+            </form>
 
             <div class="mt-8">
                 <h3 class="mb-4">Recent executions <span class="text-xs text-neutral-500">(click to check output)</span></h3>