diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php
index b9ba8c3a9..9d6ba6fd8 100644
--- a/resources/views/components/layout.blade.php
+++ b/resources/views/components/layout.blade.php
@@ -20,7 +20,7 @@
     @livewireStyles
 </head>
 
-<body x-data="confirmModal">
+<body>
     @auth
         <x-navbar />
     @endauth
@@ -28,7 +28,6 @@
         {{ $slot }}
     </main>
 
-    <x-confirm-modal />
     @livewireScripts
     @auth
         <script>
diff --git a/resources/views/livewire/destination/form.blade.php b/resources/views/livewire/destination/form.blade.php
index e7445722d..0dbf68aa0 100644
--- a/resources/views/livewire/destination/form.blade.php
+++ b/resources/views/livewire/destination/form.blade.php
@@ -1,4 +1,5 @@
-<div>
+<div x-data="{ deleteDestination: false }">
+    <x-naked-modal show="deleteDestination" message='Are you sure you would like to delete this destination?' />
     <form class="flex flex-col gap-4" wire:submit.prevent='submit'>
         <x-inputs.input id="destination.name" label="Name" />
         <x-inputs.input id="destination.server.ip" label="Server IP" readonly />
@@ -9,7 +10,7 @@
             <x-inputs.button>
                 Submit
             </x-inputs.button>
-            <x-inputs.button confirm='Are you sure you would like to delete this private key?' confirmAction="delete">
+            <x-inputs.button isWarning x-on:click="deleteDestination = true">
                 Delete
             </x-inputs.button>
         </div>
diff --git a/resources/views/livewire/private-key/change.blade.php b/resources/views/livewire/private-key/change.blade.php
index c3bb38142..cec141247 100644
--- a/resources/views/livewire/private-key/change.blade.php
+++ b/resources/views/livewire/private-key/change.blade.php
@@ -1,4 +1,5 @@
-<div>
+<div x-data="{ deletePrivateKey: false }">
+    <x-naked-modal show="deletePrivateKey" message='Are you sure you would like to delete this private key?' />
     <form class="flex flex-col gap-2 w-96" wire:submit.prevent='changePrivateKey'>
         <x-inputs.input id="private_key.name" label="Name" required />
         <x-inputs.input id="private_key.description" label="Description" />
@@ -6,7 +7,7 @@
         <x-inputs.button type="submit">
             Submit
         </x-inputs.button>
-        <x-inputs.button confirm='Are you sure you would like to delete this private key?' confirmAction="delete">
+        <x-inputs.button isWarning x-on:click="deletePrivateKey = true">
             Delete
         </x-inputs.button>
     </form>
diff --git a/resources/views/livewire/project/application/deploy.blade.php b/resources/views/livewire/project/application/deploy.blade.php
index 093779d66..03be4d2db 100644
--- a/resources/views/livewire/project/application/deploy.blade.php
+++ b/resources/views/livewire/project/application/deploy.blade.php
@@ -1,5 +1,5 @@
-<div>
-
+<div x-data="{ deleteApplication: false }">
+    <x-naked-modal show="deleteApplication" />
     @if ($application->status === 'running')
         <x-inputs.button wire:click='start'>Restart</x-inputs.button>
         <x-inputs.button wire:click='forceRebuild'>Force Rebuild</x-inputs.button>
@@ -8,7 +8,7 @@
         <x-inputs.button wire:click='start'>Start</x-inputs.button>
         <x-inputs.button wire:click='forceRebuild'>Start (no cache)</x-inputs.button>
     @endif
-    <x-inputs.button confirmAction="delete" confirm='Are you sure you would like to delete this application?'>
+    <x-inputs.button isWarning x-on:click="deleteApplication = true">
         Delete</x-inputs.button>
     <span wire:poll.5000ms='pollingStatus'>
         @if ($application->status === 'running')
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index f6f7ed0fa..520a259b7 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -1,4 +1,5 @@
-<div>
+<div x-data="{ deleteServer: false }">
+    <x-naked-modal show="deleteServer" message='Are you sure you would like to delete this server?' />
     <form wire:submit.prevent='submit' class="flex flex-col">
         <div class="flex flex-col gap-2 xl:flex-row">
             <div class="flex flex-col w-96">
@@ -21,7 +22,7 @@
             <x-inputs.button type="submit">Submit</x-inputs.button>
             <x-inputs.button wire:click.prevent='checkServer'>Check Server</x-inputs.button>
             <x-inputs.button wire:click.prevent='installDocker'>Install Docker</x-inputs.button>
-            <x-inputs.button confirm="Are you sure you would like to delete this application?" confirmAction="delete">
+            <x-inputs.button isWarning x-on:click="deleteServer = true">
                 Delete
             </x-inputs.button>
         </div>
