diff --git a/resources/views/livewire/project/shared/danger.blade.php b/resources/views/livewire/project/shared/danger.blade.php
index a86142138..a2b0d0a93 100644
--- a/resources/views/livewire/project/shared/danger.blade.php
+++ b/resources/views/livewire/project/shared/danger.blade.php
@@ -2,30 +2,26 @@
     <h2>Danger Zone</h2>
     <div class="">Woah. I hope you know what are you doing.</div>
     <h4 class="pt-4">Delete Resource</h4>
-    <div class="pb-4">This will stop your containers, delete all related data, etc. Beware! There is no coming
-        back!
-    </div>
+    <div class="pb-4">This will stop your containers, delete all related data, etc. Beware! There is no coming back!</div>
     <x-modal-confirmation 
-        isError
-        type="button"
-        buttonTitle="Delete this resource" 
+        title="Confirm Resource Deletion?"
+        buttonTitle="Delete Resource"
+        isErrorButton
+        type="button" 
+        submitAction="delete" 
+        buttonTitle="Delete Resource" 
         :checkboxes="[
-            ['id' => 'delete_volumes', 'model' => 'delete_volumes', 'label' => 'Permanently delete associated volumes?'],
-            ['id' => 'delete_connected_networks', 'model' => 'delete_connected_networks', 'label' => 'Permanently delete connected networks, predefined networks are not deleted?'],
-            ['id' => 'delete_configurations', 'model' => 'delete_configurations', 'label' => 'Permanently delete configuration files from the server?'],
-            ['id' => 'docker_cleanup', 'model' => 'docker_cleanup', 'label' => 'Run Docker cleanup (remove builder cache and unused images)?']
-        ]"
-        :checkboxActions="[
-            'delete_volumes' => 'All associated volumes of this resource will be deleted.',
-            'delete_connected_networks' => 'All connected networks of this resource will be deleted (predefined networks are not deleted).',
-            'delete_configurations' => 'All configuration files of this resource will be deleted on the server.',
-            'docker_cleanup' => 'Docker cleanup will be executed which removes builder cache and unused images.'
-        ]"
+            ['id' => 'delete_volumes', 'model' => 'delete_volumes', 'label' => 'All associated volumes with this resource will be permanently deleted'],
+            ['id' => 'delete_connected_networks', 'model' => 'delete_connected_networks', 'label' => 'All connected networks with this resource will be permanently deleted (predefined networks will not be deleted)'],
+            ['id' => 'delete_configurations', 'model' => 'delete_configurations', 'label' => 'All configuration files will be permanently deleted form the server'],
+            ['id' => 'docker_cleanup', 'model' => 'docker_cleanup', 'label' => 'Docker cleanup will be run on the server which removes builder cache and unused images']
+        ]" 
         :actions="[
             'All containers of this resource will be stopped and permanently deleted.'
-        ]"
-        {{-- :confirmWithPassword="false" --}}
-    >
-        This resource will be deleted. It is not reversible. <strong class="text-error">Please think again.</strong><br><br>
-    </x-modal-confirmation>
+        ]" 
+        confirmationText="{{ $resourceName }}"
+        confirmationLabel="Please confirm the execution of the actions by entering the Resource Name below"
+        shortConfirmationLabel="Resource Name"
+        step3ButtonText="Permanently Delete Resource"
+    />
 </div>