diff --git a/app/Livewire/Project/Shared/HealthChecks.php b/app/Livewire/Project/Shared/HealthChecks.php
index ae94f7cf2..ee11c496d 100644
--- a/app/Livewire/Project/Shared/HealthChecks.php
+++ b/app/Livewire/Project/Shared/HealthChecks.php
@@ -47,6 +47,24 @@ public function submit()
         }
     }
 
+    public function toggleHealthcheck()
+    {
+        try {
+            $this->authorize('update', $this->resource);
+            $wasEnabled = $this->resource->health_check_enabled;
+            $this->resource->health_check_enabled = !$this->resource->health_check_enabled;
+            $this->resource->save();
+
+            if ($this->resource->health_check_enabled && !$wasEnabled && $this->resource->isRunning()) {
+                $this->dispatch('info', 'Health check has been enabled. A restart is required to apply the new settings.');
+            } else {
+                $this->dispatch('success', 'Health check ' . ($this->resource->health_check_enabled ? 'enabled' : 'disabled') . '.');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
     public function render()
     {
         return view('livewire.project.shared.health-checks');
diff --git a/resources/views/livewire/project/shared/health-checks.blade.php b/resources/views/livewire/project/shared/health-checks.blade.php
index fb9f7f3bc..ed64ff28e 100644
--- a/resources/views/livewire/project/shared/health-checks.blade.php
+++ b/resources/views/livewire/project/shared/health-checks.blade.php
@@ -2,19 +2,33 @@
     <div class="flex items-center gap-2">
         <h2>Healthchecks</h2>
         <x-forms.button canGate="update" :canResource="$resource" type="submit">Save</x-forms.button>
+        @if (!$resource->health_check_enabled)
+            <x-modal-confirmation title="Confirm Healthcheck Enable?" buttonTitle="Enable Healthcheck"
+                submitAction="toggleHealthcheck" :actions="['Enable healthcheck for this resource.']"
+                warningMessage="If the health check fails, your application will become inaccessible. Please review the <a href='https://coolify.io/docs/knowledge-base/health-checks' target='_blank' class='underline text-white'>Health Checks</a> guide before proceeding!"
+                step2ButtonText="Enable Healthcheck" :confirmWithText="false" :confirmWithPassword="false"
+                isHighlightedButton>
+            </x-modal-confirmation>
+        @else
+            <x-forms.button canGate="update" :canResource="$resource" wire:click="toggleHealthcheck">Disable Healthcheck</x-forms.button>
+        @endif
     </div>
-    <div class="pb-4">Define how your resource's health should be checked.</div>
+    <div class="mt-1 pb-4">Define how your resource's health should be checked.</div>
     <div class="flex flex-col gap-4">
         @if ($resource->custom_healthcheck_found)
-            <div class="dark:text-warning">A custom health check has been found and will be used until you enable this.
-            </div>
+            <x-callout type="warning" title="Caution">
+                <p>A custom health check has been detected. If you enable this health check, it will disable the custom one and use this instead.</p>
+            </x-callout>
         @endif
-        <div class="w-32">
-            <x-forms.checkbox canGate="update" :canResource="$resource" instantSave id="resource.health_check_enabled" label="Enabled" />
-        </div>
         <div class="flex gap-2">
-            <x-forms.input canGate="update" :canResource="$resource" id="resource.health_check_method" placeholder="GET" label="Method" required />
-            <x-forms.input canGate="update" :canResource="$resource" id="resource.health_check_scheme" placeholder="http" label="Scheme" required />
+            <x-forms.select canGate="update" :canResource="$resource" id="resource.health_check_method" label="Method" required>
+                <option value="GET">GET</option>
+                <option value="POST">POST</option>
+            </x-forms.select>
+            <x-forms.select canGate="update" :canResource="$resource" id="resource.health_check_scheme" label="Scheme" required>
+                <option value="http">http</option>
+                <option value="https">https</option>
+            </x-forms.select>
             <x-forms.input canGate="update" :canResource="$resource" id="resource.health_check_host" placeholder="localhost" label="Host" required />
             <x-forms.input canGate="update" :canResource="$resource" type="number" id="resource.health_check_port"
                 helper="If no port is defined, the first exposed port will be used." placeholder="80" label="Port" />