diff --git a/resources/views/livewire/project/application/previews.blade.php b/resources/views/livewire/project/application/previews.blade.php
index e15aa7816..efd281a77 100644
--- a/resources/views/livewire/project/application/previews.blade.php
+++ b/resources/views/livewire/project/application/previews.blade.php
@@ -152,8 +152,17 @@
                             @endif
                         </x-forms.button>
                         @if (data_get($preview, 'status') !== 'exited')
-                            <x-modal-confirmation isErrorButton
-                                action="stop({{ data_get($preview, 'pull_request_id') }})">
+                            <x-modal-confirmation 
+                            title="Confirm Preview Deployment Stopping?"
+                            buttonTitle="Stop"
+                            submitAction="stop({{ data_get($preview, 'pull_request_id') }})"
+                            :actions="['This preview deployment will be stopped.', 'If the preview deployment is currently in use data could be lost.', 'All non-persistent data of this preview deployment (containers, networks, unused images) will be deleted (don\'t worry, no data is lost and you can start the preview deployment again).']"
+                            :confirmWithText="false"
+                            :confirmWithPassword="false"
+                            step2ButtonText="Stop Preview Deployment"
+                            :dispatchEvent="true"
+                            dispatchEventType="stopEvent"
+                            >
                                 <x-slot:customButton>
                                     <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error"
                                         viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
@@ -168,14 +177,22 @@
                                     </svg>
                                     Stop
                                 </x-slot:customButton>
-                                This will stop the preview deployment. <br>Please think again.
                             </x-modal-confirmation>
                         @endif
-                        <x-modal-confirmation isErrorButton
-                            action="delete({{ data_get($preview, 'pull_request_id') }})" buttonTitle="Delete">
-                            This will delete the preview deployment. <br>Please think again.
-                        </x-modal-confirmation>
-
+                        <x-modal-confirmation 
+                        title="Confirm Preview Deployment Deletion?"
+                        buttonTitle="Delete"
+                        isErrorButton
+                        submitAction="delete({{ data_get($preview, 'pull_request_id') }})"
+                        :actions="['All containers of this preview deployment will be stopped and permanently deleted.']"
+                        confirmationText="{{ data_get($preview, 'fqdn'). '/' }}"
+                        confirmationLabel="Please confirm the execution of the actions by entering the Preview Deployment name below"
+                        shortConfirmationLabel="Preview Deployment Name"
+                        :confirmWithPassword="false"
+                        :dispatchEvent="true"
+                        dispatchEventType="deleteEvent"
+                        dispatchEventMessage="Preview Deployment Deleted"
+                        />
                     </div>
                 </div>
             @endforeach
diff --git a/resources/views/livewire/project/database/heading.blade.php b/resources/views/livewire/project/database/heading.blade.php
index 594bc12d3..a9e208856 100644
--- a/resources/views/livewire/project/database/heading.blade.php
+++ b/resources/views/livewire/project/database/heading.blade.php
@@ -33,7 +33,7 @@
             title="Confirm Database Restart?"
             buttonTitle="Restart"
             submitAction="restart"
-            :actions="['This database will be restarted.', 'If the database is currently in active use data could be lost.']"
+            :actions="['This database will be restarted.', 'If the database is currently in use data could be lost.']"
             :confirmWithText="false"
             :confirmWithPassword="false"
             step2ButtonText="Restart Database"
diff --git a/resources/views/livewire/project/database/init-script.blade.php b/resources/views/livewire/project/database/init-script.blade.php
index e72b13fa9..fc1f88196 100644
--- a/resources/views/livewire/project/database/init-script.blade.php
+++ b/resources/views/livewire/project/database/init-script.blade.php
@@ -9,7 +9,7 @@
         submitAction="delete"
         :actions="[
             'The init-script of this database will be permanently deleted.',
-            'If you are actively using this init-script, it could cause errors on redeployments.'
+            'If you are actively using this init-script, it could cause errors on redeployment.'
         ]"
         confirmationText="{{ $filename }}"
         confirmationLabel="Please confirm the execution of the actions by entering the init-script name below"