diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte
index 589f01e394..2ec204ef21 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte
@@ -2,15 +2,19 @@
     import { goto } from '$app/navigation';
     import { base } from '$app/paths';
     import { page } from '$app/stores';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
-    import { Button } from '$lib/elements/forms';
+    import { Button, InputCheckbox } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
+    import { FormList } from '$lib/elements/forms/index.js';
+    import { func } from '../store';
 
     export let showDelete = false;
     const functionId = $page.params.function;
 
+    let confirmedDeletion = false;
+
     const handleSubmit = async () => {
         try {
             await sdk.forProject.functions.delete(functionId);
@@ -38,12 +42,22 @@
     icon="exclamation"
     state="warning"
     headerDivider={false}>
-    <p data-private>
-        Are you sure you want to delete this function and all associated deployments from your
-        project?
-    </p>
+    <FormList>
+        <p data-private>Are you sure you want to delete <b>{$func.name}</b>?</p>
+        <p data-private>
+            The function and all associated deployments will be permanently deleted. This action is
+            irreversible.
+        </p>
+
+        <InputCheckbox
+            size="s"
+            required
+            id="delete_function"
+            bind:checked={confirmedDeletion}
+            label="I understand and confirm" />
+    </FormList>
     <svelte:fragment slot="footer">
         <Button text on:click={() => (showDelete = false)}>Cancel</Button>
-        <Button secondary submit>Delete</Button>
+        <Button secondary submit disabled={!confirmedDeletion}>Delete</Button>
     </svelte:fragment>
 </Modal>
diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
index 86d9a930ec..ca5c6bf94a 100644
--- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
+++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
@@ -93,10 +93,7 @@
 
     async function cancelDeployment() {
         try {
-            await sdk.forProject.sites.updateDeploymentBuild(
-                deployment.resourceId,
-                deployment.$id
-            );
+            await sdk.forProject.sites.updateDeploymentBuild(deployment.resourceId, deployment.$id);
             await invalidate(Dependencies.DEPLOYMENTS);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte
index 47ab695ae1..32daf0b8c0 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte
@@ -30,4 +30,4 @@
     </svelte:fragment>
 </CardGrid>
 
-<Delete bind:showDelete />
+<Delete siteName={site.name} bind:showDelete />
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte
index 76dd3046be..f9e369977b 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte
@@ -2,15 +2,19 @@
     import { goto } from '$app/navigation';
     import { base } from '$app/paths';
     import { page } from '$app/stores';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
-    import { Button } from '$lib/elements/forms';
+    import { Button, InputCheckbox } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
+    import { FormList } from '$lib/elements/forms/index.js';
 
+    export let siteName = '';
     export let showDelete = false;
     const siteId = $page.params.site;
 
+    let confirmedDeletion = false;
+
     const handleSubmit = async () => {
         try {
             await sdk.forProject.sites.delete(siteId);
@@ -37,12 +41,22 @@
     onSubmit={handleSubmit}
     icon="exclamation"
     state="warning">
-    <p data-private>
-        Are you sure you want to delete this site and all associated deployments from your
-        project?
-    </p>
+    <FormList>
+        <p data-private>Are you sure you want to delete <b>{siteName}</b>?</p>
+        <p data-private>
+            The site and all associated deployments will be permanently deleted. This action is
+            irreversible.
+        </p>
+
+        <InputCheckbox
+            size="s"
+            required
+            id="delete_site"
+            bind:checked={confirmedDeletion}
+            label="I understand and confirm" />
+    </FormList>
     <svelte:fragment slot="footer">
         <Button text on:click={() => (showDelete = false)}>Cancel</Button>
-        <Button secondary submit>Delete</Button>
+        <Button secondary submit disabled={!confirmedDeletion}>Delete</Button>
     </svelte:fragment>
 </Modal>