diff --git a/resources/views/components/applications/advanced.blade.php b/resources/views/components/applications/advanced.blade.php
index 780a727e1..9be15d3b2 100644
--- a/resources/views/components/applications/advanced.blade.php
+++ b/resources/views/components/applications/advanced.blade.php
@@ -4,28 +4,20 @@
     </x-slot>
     @if ($application->status === 'running')
         @can('deploy', $application)
-            <x-modal-confirmation title="Confirm Application Force Deployment?" buttonTitle="Force deploy"
-                submitAction="force_deploy_without_cache" :actions="[
-                    'This application will be force deployed without build cache.',
-                ]" :confirmWithText="false" :confirmWithPassword="false"
-                step2ButtonText="Confirm">
-                <x-slot:content>
-                    <div class="dropdown-iteme">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24" stroke-width="1.5"
-                            stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                            <path
-                                d="M12.983 8.978c3.955 -.182 7.017 -1.446 7.017 -2.978c0 -1.657 -3.582 -3 -8 -3c-1.661 0 -3.204 .19 -4.483 .515m-2.783 1.228c-.471 .382 -.734 .808 -.734 1.257c0 1.22 1.944 2.271 4.734 2.74" />
-                            <path
-                                d="M4 6v6c0 1.657 3.582 3 8 3c.986 0 1.93 -.067 2.802 -.19m3.187 -.82c1.251 -.53 2.011 -1.228 2.011 -1.99v-6" />
-                            <path d="M4 12v6c0 1.657 3.582 3 8 3c3.217 0 5.991 -.712 7.261 -1.74m.739 -3.26v-4" />
-                            <path d="M3 3l18 18" />
-                        </svg>
-                        Force deploy (without
-                        cache)
-                    </div>
-                </x-slot:content>
-            </x-modal-confirmation>
+            <div class="dropdown-iteme" wire:click="force_deploy_without_cache">
+                <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24" stroke-width="1.5"
+                    stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                    <path
+                        d="M12.983 8.978c3.955 -.182 7.017 -1.446 7.017 -2.978c0 -1.657 -3.582 -3 -8 -3c-1.661 0 -3.204 .19 -4.483 .515m-2.783 1.228c-.471 .382 -.734 .808 -.734 1.257c0 1.22 1.944 2.271 4.734 2.74" />
+                    <path
+                        d="M4 6v6c0 1.657 3.582 3 8 3c.986 0 1.93 -.067 2.802 -.19m3.187 -.82c1.251 -.53 2.011 -1.228 2.011 -1.99v-6" />
+                    <path d="M4 12v6c0 1.657 3.582 3 8 3c3.217 0 5.991 -.712 7.261 -1.74m.739 -3.26v-4" />
+                    <path d="M3 3l18 18" />
+                </svg>
+                Force deploy (without
+                cache)
+            </div>
         @else
             <div class="dropdown-iteme" data-disabled>
                 <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24" stroke-width="1.5"
@@ -44,28 +36,20 @@
         @endcan
     @else
         @can('deploy', $application)
-            <x-modal-confirmation title="Confirm Application Force Deployment?" buttonTitle="Force deploy"
-                submitAction="deploy(true)" :actions="[
-                    'This application will be force deployed without build cache.',
-                ]" :confirmWithText="false" :confirmWithPassword="false"
-                step2ButtonText="Confirm">
-                <x-slot:content>
-                    <div class="dropdown-item">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" viewBox="0 0 24 24" stroke-width="1.5"
-                            stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                            <path
-                                d="M12.983 8.978c3.955 -.182 7.017 -1.446 7.017 -2.978c0 -1.657 -3.582 -3 -8 -3c-1.661 0 -3.204 .19 -4.483 .515m-2.783 1.228c-.471 .382 -.734 .808 -.734 1.257c0 1.22 1.944 2.271 4.734 2.74" />
-                            <path
-                                d="M4 6v6c0 1.657 3.582 3 8 3c.986 0 1.93 -.067 2.802 -.19m3.187 -.82c1.251 -.53 2.011 -1.228 2.011 -1.99v-6" />
-                            <path d="M4 12v6c0 1.657 3.582 3 8 3c3.217 0 5.991 -.712 7.261 -1.74m.739 -3.26v-4" />
-                            <path d="M3 3l18 18" />
-                        </svg>
-                        Force deploy (without
-                        cache)
-                    </div>
-                </x-slot:content>
-            </x-modal-confirmation>
+            <div class="dropdown-item" wire:click="deploy(true)">
+                <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" viewBox="0 0 24 24" stroke-width="1.5"
+                    stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                    <path
+                        d="M12.983 8.978c3.955 -.182 7.017 -1.446 7.017 -2.978c0 -1.657 -3.582 -3 -8 -3c-1.661 0 -3.204 .19 -4.483 .515m-2.783 1.228c-.471 .382 -.734 .808 -.734 1.257c0 1.22 1.944 2.271 4.734 2.74" />
+                    <path
+                        d="M4 6v6c0 1.657 3.582 3 8 3c.986 0 1.93 -.067 2.802 -.19m3.187 -.82c1.251 -.53 2.011 -1.228 2.011 -1.99v-6" />
+                    <path d="M4 12v6c0 1.657 3.582 3 8 3c3.217 0 5.991 -.712 7.261 -1.74m.739 -3.26v-4" />
+                    <path d="M3 3l18 18" />
+                </svg>
+                Force deploy (without
+                cache)
+            </div>
         @else
             <div class="dropdown-item" data-disabled>
                 <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" viewBox="0 0 24 24" stroke-width="1.5"
diff --git a/resources/views/components/services/advanced.blade.php b/resources/views/components/services/advanced.blade.php
index 1974bf221..6307f3a18 100644
--- a/resources/views/components/services/advanced.blade.php
+++ b/resources/views/components/services/advanced.blade.php
@@ -17,7 +17,7 @@
             Pull Latest Images & Restart
         </div>
     @elseif (str($service->status)->contains('degraded'))
-        <div class="dropdown-item" @if(!auth()->user()->can('deploy', $service)) data-disabled @endif @click="document.getElementById('service-forceDeploy-trigger')?.click()">
+        <div class="dropdown-item" @if(!auth()->user()->can('deploy', $service)) data-disabled @endif @click="$wire.dispatch('forceDeployEvent')">
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor"
                 stroke-linecap="round" stroke-linejoin="round" data-darkreader-inline-stroke=""
                 style="--darkreader-inline-stroke: currentColor;" class="w-6 h-6" stroke-width="2">
@@ -27,7 +27,7 @@
             Force Restart
         </div>
     @else
-        <div class="dropdown-item" @if(!auth()->user()->can('deploy', $service)) data-disabled @endif @click="document.getElementById('service-forceDeploy-trigger')?.click()">
+        <div class="dropdown-item" @if(!auth()->user()->can('deploy', $service)) data-disabled @endif @click="$wire.dispatch('forceDeployEvent')">
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor"
                 stroke-linecap="round" stroke-linejoin="round" data-darkreader-inline-stroke=""
                 style="--darkreader-inline-stroke: currentColor;" class="w-4 h-4" stroke-width="2">
diff --git a/resources/views/livewire/project/application/heading.blade.php b/resources/views/livewire/project/application/heading.blade.php
index 3d9f23cbb..d4398322c 100644
--- a/resources/views/livewire/project/application/heading.blade.php
+++ b/resources/views/livewire/project/application/heading.blade.php
@@ -177,8 +177,7 @@
                     <div class="flex flex-nowrap items-center gap-2 overflow-x-auto">
                     @if (!str($application->status)->startsWith('exited'))
                         @if (!$application->destination->server->isSwarm())
-                            <button type="button" class="button shrink-0"
-                                @click="document.getElementById('application-mobile-deploy-trigger')?.click()">
+                            <button type="button" class="button shrink-0" wire:click="deploy">
                                 <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-orange-400"
                                     viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
                                     stroke-linecap="round" stroke-linejoin="round">
@@ -193,8 +192,7 @@
                         @endif
                         @if ($application->build_pack !== 'dockercompose')
                             @if ($application->destination->server->isSwarm())
-                                <button type="button" class="button shrink-0"
-                                    @click="document.getElementById('application-mobile-deploy-trigger')?.click()">
+                                <button type="button" class="button shrink-0" wire:click="deploy">
                                     <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                         xmlns="http://www.w3.org/2000/svg">
                                         <g fill="none" stroke="currentColor" stroke-linecap="round"
@@ -238,8 +236,7 @@
                             Stop
                         </x-forms.button>
                     @else
-                        <button type="button" class="button shrink-0"
-                            @click="document.getElementById('application-mobile-deploy-trigger')?.click()">
+                        <button type="button" class="button shrink-0" wire:click="deploy">
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
                                 viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
                                 stroke-linecap="round" stroke-linejoin="round">
@@ -251,8 +248,7 @@
                     @endif
                     @if (!$application->destination->server->isSwarm())
                         @if ($application->status === 'running')
-                            <button type="button" class="button shrink-0"
-                                @click="document.getElementById('application-mobile-force-deploy-trigger')?.click()">
+                            <button type="button" class="button shrink-0" wire:click="force_deploy_without_cache">
                                 <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
                                     viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
                                     stroke-linecap="round" stroke-linejoin="round">
@@ -262,8 +258,7 @@
                                 Force deploy (without cache)
                             </button>
                         @else
-                            <button type="button" class="button shrink-0"
-                                @click="document.getElementById('application-mobile-deploy-force-trigger')?.click()">
+                            <button type="button" class="button shrink-0" wire:click="deploy(true)">
                                 <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
                                     viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
                                     stroke-linecap="round" stroke-linejoin="round">
@@ -404,15 +399,6 @@
                     <button id="application-mobile-stop-trigger" type="button" class="hidden">Stop</button>
                 </x-slot:trigger>
             </x-modal-confirmation>
-            <x-modal-confirmation title="Confirm Application Deployment?" buttonTitle="Deploy"
-                submitAction="deploy" :actions="[
-                    'This application will be deployed.',
-                ]" :confirmWithText="false" :confirmWithPassword="false"
-                step2ButtonText="Confirm">
-                <x-slot:trigger>
-                    <button id="application-mobile-deploy-trigger" type="button" class="hidden">Deploy</button>
-                </x-slot:trigger>
-            </x-modal-confirmation>
             <x-modal-confirmation title="Confirm Application Restart?" buttonTitle="Restart"
                 submitAction="restart" :actions="[
                     'This application will be restarted without rebuilding.',
@@ -422,24 +408,6 @@
                     <button id="application-mobile-restart-trigger" type="button" class="hidden">Restart</button>
                 </x-slot:trigger>
             </x-modal-confirmation>
-            <x-modal-confirmation title="Confirm Application Force Deployment?" buttonTitle="Force deploy"
-                submitAction="force_deploy_without_cache" :actions="[
-                    'This application will be force deployed without build cache.',
-                ]" :confirmWithText="false" :confirmWithPassword="false"
-                step2ButtonText="Confirm">
-                <x-slot:trigger>
-                    <button id="application-mobile-force-deploy-trigger" type="button" class="hidden">Force deploy</button>
-                </x-slot:trigger>
-            </x-modal-confirmation>
-            <x-modal-confirmation title="Confirm Application Force Deployment?" buttonTitle="Force deploy"
-                submitAction="deploy(true)" :actions="[
-                    'This application will be force deployed without build cache.',
-                ]" :confirmWithText="false" :confirmWithPassword="false"
-                step2ButtonText="Confirm">
-                <x-slot:trigger>
-                    <button id="application-mobile-deploy-force-trigger" type="button" class="hidden">Force deploy</button>
-                </x-slot:trigger>
-            </x-modal-confirmation>
         </div>
 
         <nav
@@ -492,50 +460,33 @@ class="scrollbar hidden min-h-10 w-full flex-nowrap items-center gap-6 overflow-
                     <div class="flex flex-wrap gap-2">
                         @if (!str($application->status)->startsWith('exited'))
                             @if (!$application->destination->server->isSwarm())
-
-                                <x-modal-confirmation title="Confirm Application Deployment?" buttonTitle="Redeploy"
-                                    submitAction="deploy" :actions="[
-                                        'This application will be redeployed.',
-                                    ]" :confirmWithText="false" :confirmWithPassword="false"
-                                    step2ButtonText="Confirm">
-                                    <x-slot:content>
-                                        <x-forms.button canGate="deploy" :canResource="$application" title="With rolling update if possible">
-                                            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-orange-400"
-                                                viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
-                                                stroke-linecap="round" stroke-linejoin="round">
-                                                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                                                <path
-                                                    d="M10.09 4.01l.496 -.495a2 2 0 0 1 2.828 0l7.071 7.07a2 2 0 0 1 0 2.83l-7.07 7.07a2 2 0 0 1 -2.83 0l-7.07 -7.07a2 2 0 0 1 0 -2.83l3.535 -3.535h-3.988">
-                                                </path>
-                                                <path d="M7.05 11.038v-3.988"></path>
-                                            </svg>
-                                            Redeploy
-                                        </x-forms.button>
-                                    </x-slot:content>
-                                </x-modal-confirmation>
+                                <x-forms.button canGate="deploy" :canResource="$application" title="With rolling update if possible" wire:click="deploy">
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-orange-400"
+                                        viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
+                                        stroke-linecap="round" stroke-linejoin="round">
+                                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                                        <path
+                                            d="M10.09 4.01l.496 -.495a2 2 0 0 1 2.828 0l7.071 7.07a2 2 0 0 1 0 2.83l-7.07 7.07a2 2 0 0 1 -2.83 0l-7.07 -7.07a2 2 0 0 1 0 -2.83l3.535 -3.535h-3.988">
+                                        </path>
+                                        <path d="M7.05 11.038v-3.988"></path>
+                                    </svg>
+                                    Redeploy
+                                </x-forms.button>
                             @endif
                             @if ($application->build_pack !== 'dockercompose')
                                 @if ($application->destination->server->isSwarm())
-                                    <x-modal-confirmation title="Confirm Application Deployment?" buttonTitle="Update Service"
-                                        submitAction="deploy" :actions="[
-                                            'This Swarm service will be updated with a rolling deployment.',
-                                        ]" :confirmWithText="false" :confirmWithPassword="false"
-                                        step2ButtonText="Confirm">
-                                        <x-slot:content>
-                                            <x-forms.button canGate="deploy" :canResource="$application" title="Redeploy Swarm Service (rolling update)">
-                                                <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
-                                                    xmlns="http://www.w3.org/2000/svg">
-                                                    <g fill="none" stroke="currentColor" stroke-linecap="round"
-                                                        stroke-linejoin="round" stroke-width="2">
-                                                        <path
-                                                            d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                                                        <path d="M20 4v5h-5" />
-                                                    </g>
-                                                </svg>
-                                                Update Service
-                                            </x-forms.button>
-                                        </x-slot:content>
-                                    </x-modal-confirmation>
+                                    <x-forms.button canGate="deploy" :canResource="$application" title="Redeploy Swarm Service (rolling update)" wire:click="deploy">
+                                        <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                                            xmlns="http://www.w3.org/2000/svg">
+                                            <g fill="none" stroke="currentColor" stroke-linecap="round"
+                                                stroke-linejoin="round" stroke-width="2">
+                                                <path
+                                                    d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                                <path d="M20 4v5h-5" />
+                                            </g>
+                                        </svg>
+                                        Update Service
+                                    </x-forms.button>
                                 @else
                                     <x-modal-confirmation title="Confirm Application Restart?" buttonTitle="Restart"
                                         submitAction="restart" :actions="[
@@ -582,25 +533,15 @@ class="scrollbar hidden min-h-10 w-full flex-nowrap items-center gap-6 overflow-
                                 </x-slot:button-title>
                             </x-modal-confirmation>
                         @else
-
-                            <x-modal-confirmation title="Confirm Application Deployment?" buttonTitle="Deploy"
-                                submitAction="deploy" :actions="[
-                                    'This application will be deployed.',
-                                ]" :confirmWithText="false" :confirmWithPassword="false"
-                                step2ButtonText="Confirm">
-                                <x-slot:content>
-                                    <x-forms.button canGate="deploy" :canResource="$application">
-                                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
-                                            viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
-                                            stroke-linecap="round" stroke-linejoin="round">
-                                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                                            <path d="M7 4v16l13 -8z" />
-                                        </svg>
-                                        Deploy
-                                    </x-forms.button>
-                                </x-slot:content>
-                            </x-modal-confirmation>
-
+                            <x-forms.button canGate="deploy" :canResource="$application" wire:click="deploy">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
+                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
+                                    stroke-linecap="round" stroke-linejoin="round">
+                                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                    <path d="M7 4v16l13 -8z" />
+                                </svg>
+                                Deploy
+                            </x-forms.button>
                         @endif
                     </div>
                 </div>
diff --git a/resources/views/livewire/project/database/heading.blade.php b/resources/views/livewire/project/database/heading.blade.php
index 78b533ec0..29862b0b2 100644
--- a/resources/views/livewire/project/database/heading.blade.php
+++ b/resources/views/livewire/project/database/heading.blade.php
@@ -108,7 +108,7 @@
                         </x-forms.button>
                     @else
                         <button type="button" class="button shrink-0"
-                            @click="document.getElementById('database-start-trigger')?.click()">
+                            @click="$wire.dispatch('startEvent')">
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                                 stroke-linejoin="round">
@@ -234,7 +234,7 @@ class="scrollbar hidden min-h-10 w-full flex-nowrap items-center gap-6 overflow-
                             Stop
                         </x-forms.button>
                     @else
-                        <x-forms.button canGate="manage" :canResource="$database" @click="document.getElementById('database-start-trigger')?.click()" class="gap-2">
+                        <x-forms.button canGate="manage" :canResource="$database" @click="$wire.dispatch('startEvent')" class="gap-2">
 
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -286,15 +286,6 @@ class="scrollbar hidden min-h-10 w-full flex-nowrap items-center gap-6 overflow-
                     <button id="database-stop-trigger" type="button" class="hidden">Stop</button>
                 </x-slot:trigger>
             </x-modal-confirmation>
-            <x-modal-confirmation title="Confirm Database Start?" buttonTitle="Start" submitAction="startEvent"
-                :actions="[
-                    'This database will be started.',
-                ]" :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Start Database"
-                :dispatchAction="true">
-                <x-slot:trigger>
-                    <button id="database-start-trigger" type="button" class="hidden">Start</button>
-                </x-slot:trigger>
-            </x-modal-confirmation>
     @endif
 
 </nav>
diff --git a/resources/views/livewire/project/service/heading.blade.php b/resources/views/livewire/project/service/heading.blade.php
index c8933781d..b597c3b9e 100644
--- a/resources/views/livewire/project/service/heading.blade.php
+++ b/resources/views/livewire/project/service/heading.blade.php
@@ -168,7 +168,7 @@
                             Stop
                         </x-forms.button>
                         <button type="button" class="button shrink-0"
-                            @click="document.getElementById('service-forceDeploy-trigger')?.click()">
+                            @click="$wire.dispatch('forceDeployEvent')">
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                                 stroke-linejoin="round">
@@ -179,7 +179,7 @@
                         </button>
                     @elseif (str($service->status)->contains('exited'))
                         <button type="button" class="button shrink-0"
-                            @click="document.getElementById('service-start-trigger')?.click()">
+                            @click="$wire.dispatch('startEvent')">
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                                 stroke-linejoin="round">
@@ -189,7 +189,7 @@
                             Deploy
                         </button>
                         <button type="button" class="button shrink-0"
-                            @click="document.getElementById('service-forceDeploy-trigger')?.click()">
+                            @click="$wire.dispatch('forceDeployEvent')">
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                                 stroke-linejoin="round">
@@ -228,7 +228,7 @@
                             Stop
                         </x-forms.button>
                         <button type="button" class="button shrink-0"
-                            @click="document.getElementById('service-start-trigger')?.click()">
+                            @click="$wire.dispatch('startEvent')">
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                                 stroke-linejoin="round">
@@ -238,7 +238,7 @@
                             Deploy
                         </button>
                         <button type="button" class="button shrink-0"
-                            @click="document.getElementById('service-forceDeploy-trigger')?.click()">
+                            @click="$wire.dispatch('forceDeployEvent')">
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                                 stroke-linejoin="round">
@@ -422,7 +422,7 @@ class="scrollbar hidden min-h-10 w-full flex-nowrap items-center gap-6 overflow-
                             Stop
                         </x-forms.button>
                     @elseif (str($service->status)->contains('exited'))
-                        <x-forms.button canGate="deploy" :canResource="$service" @click="document.getElementById('service-start-trigger')?.click()" class="gap-2">
+                        <x-forms.button canGate="deploy" :canResource="$service" @click="$wire.dispatch('startEvent')" class="gap-2">
 
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -447,7 +447,7 @@ class="scrollbar hidden min-h-10 w-full flex-nowrap items-center gap-6 overflow-
                             </svg>
                             Stop
                         </x-forms.button>
-                        <x-forms.button canGate="deploy" :canResource="$service" @click="document.getElementById('service-start-trigger')?.click()" class="gap-2">
+                        <x-forms.button canGate="deploy" :canResource="$service" @click="$wire.dispatch('startEvent')" class="gap-2">
 
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -471,13 +471,6 @@ class="scrollbar hidden min-h-10 w-full flex-nowrap items-center gap-6 overflow-
         @endif
     </div>
     @if ($service->isDeployable)
-            <x-modal-confirmation title="Confirm Service Deployment?" buttonTitle="Deploy"
-                submitAction="startEvent" :dispatchAction="true" :actions="['This service will be deployed.']"
-                :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Confirm">
-                <x-slot:trigger>
-                    <button id="service-start-trigger" type="button" class="hidden">Deploy</button>
-                </x-slot:trigger>
-            </x-modal-confirmation>
             <x-modal-confirmation title="Confirm Service Restart?" buttonTitle="Restart"
                 submitAction="restartEvent" :dispatchAction="true" :actions="['This service will be restarted.']"
                 :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Confirm">
@@ -492,13 +485,6 @@ class="scrollbar hidden min-h-10 w-full flex-nowrap items-center gap-6 overflow-
                     <button id="service-stop-trigger" type="button" class="hidden">Stop</button>
                 </x-slot:trigger>
             </x-modal-confirmation>
-            <x-modal-confirmation title="Confirm Service Force Deployment?" buttonTitle="Force Deploy"
-                submitAction="forceDeployEvent" :dispatchAction="true" :actions="['This service will be force deployed.']"
-                :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Confirm">
-                <x-slot:trigger>
-                    <button id="service-forceDeploy-trigger" type="button" class="hidden">Force Deploy</button>
-                </x-slot:trigger>
-            </x-modal-confirmation>
             <x-modal-confirmation title="Confirm Pull Latest Images & Restart?" buttonTitle="Pull Latest Images & Restart"
                 submitAction="pullAndRestartEvent" :dispatchAction="true" :actions="['Latest images will be pulled and the service will be restarted.']"
                 :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Confirm">
diff --git a/tests/Feature/MobileResourceMenuTest.php b/tests/Feature/MobileResourceMenuTest.php
index 47ef03510..e02ff3af7 100644
--- a/tests/Feature/MobileResourceMenuTest.php
+++ b/tests/Feature/MobileResourceMenuTest.php
@@ -19,9 +19,12 @@
         ->toContain("value.startsWith('location|')")
         ->toContain('window.location.href = url')
         ->toContain('application-mobile-stop-trigger')
-        ->toContain('application-mobile-deploy-trigger')
         ->toContain('application-mobile-restart-trigger')
-        ->toContain('application-mobile-force-deploy-trigger')
+        ->toContain('wire:click="deploy"')
+        ->toContain('wire:click="force_deploy_without_cache"')
+        ->not->toContain('application-mobile-deploy-trigger')
+        ->not->toContain('application-mobile-force-deploy-trigger')
+        ->not->toContain('Confirm Application Deployment?')
         ->not->toContain('<optgroup label="Actions">');
 
     expect($applicationMobileActions)
@@ -51,7 +54,9 @@
         ->toContain('x-model="selected"')
         ->toContain('database-restart-trigger')
         ->toContain('database-stop-trigger')
-        ->toContain('database-start-trigger')
+        ->toContain("\$wire.dispatch('startEvent')")
+        ->not->toContain('database-start-trigger')
+        ->not->toContain('Confirm Database Start?')
         ->toContain('scrollbar hidden min-h-10')
         ->not->toContain('<optgroup label="Links">')
         ->not->toContain('<optgroup label="Actions">')
@@ -86,8 +91,13 @@
         ->toContain('x-model="selected"')
         ->toContain('service-restart-trigger')
         ->toContain('service-stop-trigger')
-        ->toContain('service-forceDeploy-trigger')
+        ->toContain("\$wire.dispatch('startEvent')")
+        ->toContain("\$wire.dispatch('forceDeployEvent')")
         ->toContain('service-pullAndRestart-trigger')
+        ->not->toContain('service-start-trigger')
+        ->not->toContain('service-forceDeploy-trigger')
+        ->not->toContain('Confirm Service Deployment?')
+        ->not->toContain('Confirm Service Force Deployment?')
         ->toContain('scrollbar hidden min-h-10')
         ->toContain('mb-4 w-full md:mb-0 md:hidden')
         ->toContain('hidden flex-wrap items-center gap-2 md:flex')
diff --git a/tests/Feature/ResponsiveCheckboxLayoutTest.php b/tests/Feature/ResponsiveCheckboxLayoutTest.php
index 9cbce97c9..ec461c403 100644
--- a/tests/Feature/ResponsiveCheckboxLayoutTest.php
+++ b/tests/Feature/ResponsiveCheckboxLayoutTest.php
@@ -98,12 +98,18 @@
     $response->assertSee('value="navigate|configuration|', false);
     $response->assertSee('window.Livewire?.navigate ? window.Livewire.navigate(url) : window.location.href = url', false);
     $response->assertSee('application-mobile-stop-trigger');
-    $response->assertSee('application-mobile-deploy-trigger');
     $response->assertSee('application-mobile-restart-trigger');
-    $response->assertSee('application-mobile-force-deploy-trigger');
-    $response->assertSee('Confirm Application Deployment?');
+    $response->assertSee('wire:click="deploy"', false);
+    $response->assertSee('Force deploy (without cache)');
+    expect(
+        str_contains($response->getContent(), 'wire:click="force_deploy_without_cache"')
+            || str_contains($response->getContent(), 'wire:click="deploy(true)"')
+    )->toBeTrue();
+    $response->assertDontSee('Confirm Application Deployment?');
     $response->assertSee('Confirm Application Restart?');
-    $response->assertSee('Confirm Application Force Deployment?');
+    $response->assertDontSee('Confirm Application Force Deployment?');
+    $response->assertDontSee('application-mobile-deploy-trigger');
+    $response->assertDontSee('application-mobile-force-deploy-trigger');
     $response->assertSee('sub-menu-wrapper hidden md:flex', false);
     $response->assertSee('scrollbar hidden min-h-10', false);
     $response->assertSee(route('project.application.deployment.index', [