diff --git a/web/sdk/admin/views/organizations/details/members/remove-member.tsx b/web/sdk/admin/views/organizations/details/members/remove-member.tsx
index 88667d4233..49ea4caa3e 100644
--- a/web/sdk/admin/views/organizations/details/members/remove-member.tsx
+++ b/web/sdk/admin/views/organizations/details/members/remove-member.tsx
@@ -5,7 +5,7 @@ import {
 } from "@raystack/proton/frontier";
 import { create } from "@bufbuild/protobuf";
 import { useMutation } from "@connectrpc/connect-query";
-import { Button, Dialog, Flex, Text, toastManager } from "@raystack/apsara";
+import { AlertDialog, Button, toastManager } from "@raystack/apsara";
 import { handleConnectError } from "~/utils/error";
 import { useTerminology } from "../../../../hooks/useTerminology";
 
@@ -60,31 +60,24 @@ export const RemoveMember = ({
   }
 
   return (
-    <Dialog open onOpenChange={onClose}>
-      <Dialog.Content>
-        <Dialog.Header>
-          <Dialog.Title>Remove {t.member({ case: "capital" })}</Dialog.Title>
-          <Dialog.CloseButton data-test-id="remove-member-close-button" />
-        </Dialog.Header>
-        <Dialog.Body>
-          <Flex direction="column" gap={7}>
-            <Text variant="secondary">
-              Removing this {t.member({ case: "lower" })} will revoke all their access to the{" "}
-              {t.organization({ case: "lower" })}. This action cannot be undone. The {t.member({ case: "lower" })} will lose
-              all assigned roles and permissions immediately.
-            </Text>
-            <Text variant="secondary">
-              Are you sure you want to remove this {t.member({ case: "lower" })}?
-            </Text>
-          </Flex>
-        </Dialog.Body>
-        <Dialog.Footer>
-          <Dialog.Close
+    <AlertDialog open onOpenChange={onClose}>
+      <AlertDialog.Content>
+        <AlertDialog.Header>
+          <AlertDialog.Title>Remove {t.member({ case: "capital" })}</AlertDialog.Title>
+          <AlertDialog.Description>
+            Removing this {t.member({ case: "lower" })} will revoke all their access to the{" "}
+            {t.organization({ case: "lower" })}. This action cannot be undone. The {t.member({ case: "lower" })} will lose
+            all assigned roles and permissions immediately. Are you sure you want to remove this {t.member({ case: "lower" })}?
+          </AlertDialog.Description>
+        </AlertDialog.Header>
+        <AlertDialog.Footer>
+          <AlertDialog.Close
             render={
               <Button
                 type="button"
                 variant="outline"
                 color="neutral"
+                disabled={isPending}
                 data-test-id="remove-member-cancel-button"
               >
                 Cancel
@@ -101,8 +94,8 @@ export const RemoveMember = ({
           >
             Remove
           </Button>
-        </Dialog.Footer>
-      </Dialog.Content>
-    </Dialog>
+        </AlertDialog.Footer>
+      </AlertDialog.Content>
+    </AlertDialog>
   );
 };
diff --git a/web/sdk/admin/views/users/details/layout/suspend-user.tsx b/web/sdk/admin/views/users/details/layout/suspend-user.tsx
index 5751998d96..1f8966c82f 100644
--- a/web/sdk/admin/views/users/details/layout/suspend-user.tsx
+++ b/web/sdk/admin/views/users/details/layout/suspend-user.tsx
@@ -1,5 +1,5 @@
 import { useState } from "react";
-import { Button, Dialog, Flex, Text, toastManager } from "@raystack/apsara";
+import { AlertDialog, Button, toastManager } from "@raystack/apsara";
 import { useTerminology } from "../../../../hooks/useTerminology";
 
 interface SuspendDropdownProps {
@@ -29,25 +29,24 @@ export const SuspendUser = ({
   };
 
   return (
-    <Dialog open onOpenChange={onClose}>
-      <Dialog.Content>
-        <Dialog.Body>
-          <Flex direction="column" gap={3}>
-            <Dialog.Title>Suspend {t.user({ case: "capital" })}</Dialog.Title>
-            <Text variant="secondary">
-              Suspending this {t.user({ case: "lower" })} will permanently restrict access to its
-              content, disable communication, and prevent any future
-              interactions. Are you sure you want to proceed?
-            </Text>
-          </Flex>
-        </Dialog.Body>
-        <Dialog.Footer>
-          <Dialog.Close
+    <AlertDialog open onOpenChange={onClose}>
+      <AlertDialog.Content>
+        <AlertDialog.Header>
+          <AlertDialog.Title>Suspend {t.user({ case: "capital" })}</AlertDialog.Title>
+          <AlertDialog.Description>
+            Suspending this {t.user({ case: "lower" })} will permanently restrict access to its
+            content, disable communication, and prevent any future
+            interactions. Are you sure you want to proceed?
+          </AlertDialog.Description>
+        </AlertDialog.Header>
+        <AlertDialog.Footer>
+          <AlertDialog.Close
             render={
               <Button
                 type="button"
                 variant="outline"
                 color="neutral"
+                disabled={isSubmitting}
                 data-test-id="admin-user-details-suspend-cancel"
               >
                 Cancel
@@ -65,8 +64,8 @@ export const SuspendUser = ({
           >
             Suspend
           </Button>
-        </Dialog.Footer>
-      </Dialog.Content>
-    </Dialog>
+        </AlertDialog.Footer>
+      </AlertDialog.Content>
+    </AlertDialog>
   );
 };
diff --git a/web/sdk/admin/views/users/details/security/sessions/revoke-session-confirm.tsx b/web/sdk/admin/views/users/details/security/sessions/revoke-session-confirm.tsx
index 67c3721451..4f121f0969 100644
--- a/web/sdk/admin/views/users/details/security/sessions/revoke-session-confirm.tsx
+++ b/web/sdk/admin/views/users/details/security/sessions/revoke-session-confirm.tsx
@@ -1,10 +1,8 @@
 import { useState } from 'react';
 import {
-  Button,
   Dialog,
-  Flex,
-  List,
-  Text
+  Button,
+  List
 } from '@raystack/apsara';
 import { RevokeSessionFinalConfirm } from './revoke-session-final-confirm';
 import { formatDeviceDisplay } from './index';
@@ -39,16 +37,11 @@ export const RevokeSessionConfirm = ({ isOpen, onOpenChange, sessionInfo, onRevo
   return (
     <>
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
-      <Dialog.Content
-        style={{ padding: 0, maxWidth: '400px', width: '100%' }}
-      >
+      <Dialog.Content showCloseButton={false}>
         <Dialog.Header className={styles.revokeSessionConfirmHeader}>
-          <Flex justify="between" align="center" width="full">
-            <Text size="regular">
+          <Dialog.Title>
             {sessionInfo ? formatDeviceDisplay(sessionInfo.browser, sessionInfo.operatingSystem) : "Unknown browser and OS"}
-            </Text>
-            <Dialog.CloseButton data-test-id="frontier-sdk-close-revoke-session-dialog" />
-          </Flex>
+          </Dialog.Title>
         </Dialog.Header>
 
         <Dialog.Body className={styles.revokeSessionConfirmBody}>
@@ -73,27 +66,28 @@ export const RevokeSessionConfirm = ({ isOpen, onOpenChange, sessionInfo, onRevo
         </Dialog.Body>
 
         <Dialog.Footer>
-          <Flex justify="end" gap={5}>
-            <Button
-              variant="outline"
-              color="neutral"
-              onClick={() => onOpenChange(false)}
-              disabled={isLoading}
-              data-test-id="frontier-ui-cancel-revoke-session-dialog"
-            >
-              Cancel
-            </Button>
-            <Button
-              variant="solid"
-              color="danger"
-              onClick={handleRevoke}
-              loading={isLoading}
-              loaderText="Revoking..."
-              data-test-id="frontier-ui-confirm-revoke-session-dialog"
-            >
-              Revoke
-            </Button>
-          </Flex>
+          <Dialog.Close
+            render={
+              <Button
+                variant="outline"
+                color="neutral"
+                disabled={isLoading}
+                data-test-id="frontier-ui-cancel-revoke-session-dialog"
+              >
+                Cancel
+              </Button>
+            }
+          />
+          <Button
+            variant="solid"
+            color="danger"
+            onClick={handleRevoke}
+            loading={isLoading}
+            loaderText="Revoking..."
+            data-test-id="frontier-ui-confirm-revoke-session-dialog"
+          >
+            Revoke
+          </Button>
         </Dialog.Footer>
       </Dialog.Content>
     </Dialog>
diff --git a/web/sdk/admin/views/users/details/security/sessions/revoke-session-final-confirm.tsx b/web/sdk/admin/views/users/details/security/sessions/revoke-session-final-confirm.tsx
index 8252f10bbd..158f0e02cf 100644
--- a/web/sdk/admin/views/users/details/security/sessions/revoke-session-final-confirm.tsx
+++ b/web/sdk/admin/views/users/details/security/sessions/revoke-session-final-confirm.tsx
@@ -1,12 +1,9 @@
 import {
+  AlertDialog,
   Button,
-  toastManager,
-  Dialog,
-  Flex,
-  Text
+  toastManager
 } from '@raystack/apsara';
 import { handleConnectError } from '~/utils/error';
-import styles from './sessions.module.css';
 
 interface RevokeSessionFinalConfirmProps {
   isOpen: boolean;
@@ -43,48 +40,41 @@ export const RevokeSessionFinalConfirm = ({
   };
 
   return (
-    <Dialog open={isOpen} onOpenChange={onOpenChange}>
-      <Dialog.Content
-        style={{ padding: 0, maxWidth: '400px', width: '100%' }}
-      >
-        <Dialog.Header className={styles.revokeSessionConfirmHeader}>
-          <Dialog.Title>Revoke</Dialog.Title>
-          <Dialog.CloseButton data-test-id="frontier-ui-close-final-revoke-dialog" />
-        </Dialog.Header>
+    <AlertDialog open={isOpen} onOpenChange={onOpenChange}>
+      <AlertDialog.Content>
+        <AlertDialog.Header>
+          <AlertDialog.Title>Revoke</AlertDialog.Title>
+          <AlertDialog.Description>
+            Are you sure you want to revoke this session? This action cannot be undone.
+          </AlertDialog.Description>
+        </AlertDialog.Header>
 
-        <Dialog.Body className={styles.revokeSessionFinalConfirmBody}>
-          <Flex direction="column" gap={4}>
-            <Text size="small" variant="secondary">
-              Are you sure you want to revoke this session? This action cannot be undone.
-            </Text>
-          </Flex>
-        </Dialog.Body>
-
-        <Dialog.Footer>
-          <Flex justify="end" gap={5}>
-            <Button
-              variant="outline"
-              color="neutral"
-              onClick={() => onOpenChange(false)}
-              data-test-id="frontier-ui-cancel-final-revoke-dialog"
-              disabled={isLoading}
-            >
-              Cancel
-            </Button>
-            <Button
-              variant="solid"
-              color="danger"
-              onClick={handleConfirm}
-              data-test-id="frontier-ui-confirm-final-revoke-dialog"
-              disabled={isLoading}
-              loading={isLoading}
-              loaderText="Revoking..."
-            >
-              Revoke
-            </Button>
-          </Flex>
-        </Dialog.Footer>
-      </Dialog.Content>
-    </Dialog>
+        <AlertDialog.Footer>
+          <AlertDialog.Close
+            render={
+              <Button
+                variant="outline"
+                color="neutral"
+                data-test-id="frontier-ui-cancel-final-revoke-dialog"
+                disabled={isLoading}
+              >
+                Cancel
+              </Button>
+            }
+          />
+          <Button
+            variant="solid"
+            color="danger"
+            onClick={handleConfirm}
+            data-test-id="frontier-ui-confirm-final-revoke-dialog"
+            disabled={isLoading}
+            loading={isLoading}
+            loaderText="Revoking..."
+          >
+            Revoke
+          </Button>
+        </AlertDialog.Footer>
+      </AlertDialog.Content>
+    </AlertDialog>
   );
 };
diff --git a/web/sdk/admin/views/users/details/security/sessions/sessions.module.css b/web/sdk/admin/views/users/details/security/sessions/sessions.module.css
index e7bd0f8558..b04d55ce03 100644
--- a/web/sdk/admin/views/users/details/security/sessions/sessions.module.css
+++ b/web/sdk/admin/views/users/details/security/sessions/sessions.module.css
@@ -40,9 +40,4 @@
   border-bottom: 1px solid var(--rs-color-border-base-primary);
 }
 
-.revokeSessionFinalConfirmBody {
-  padding: 0 var(--rs-space-7) var(--rs-space-6) var(--rs-space-7);
-  border-bottom: 1px solid var(--rs-color-border-base-primary);
-}
-
 /* Revoke Session Confirm END */
\ No newline at end of file
diff --git a/web/sdk/admin/views/webhooks/webhooks/delete/index.tsx b/web/sdk/admin/views/webhooks/webhooks/delete/index.tsx
index 6bcf5dd240..5b4484118a 100644
--- a/web/sdk/admin/views/webhooks/webhooks/delete/index.tsx
+++ b/web/sdk/admin/views/webhooks/webhooks/delete/index.tsx
@@ -1,4 +1,4 @@
-import { Button, Dialog, Flex, Text, toastManager } from "@raystack/apsara";
+import { AlertDialog, Button, toastManager } from "@raystack/apsara";
 import type { useMutation } from "@connectrpc/connect-query";
 import { handleConnectError } from "~/utils/error";
 
@@ -41,45 +41,41 @@ export function DeleteWebhookDialog({
   };
 
   return (
-    <Dialog open={isOpen} onOpenChange={onOpenChange}>
-      <Dialog.Content
-        style={{ padding: 0, maxWidth: '600px', width: '100%' }}
-      >
-        <Flex direction="column" gap={9} style={{ padding: "24px" }}>
-          <Flex direction="column" gap={5}>
-            <Text size="large" weight="medium">
-              Delete Webhook
-            </Text>
-            <Text>
-              Are you sure you want to delete this webhook
-              {webhookDescription ? ` "${webhookDescription}"` : ""}? This action
-              cannot be undone.
-            </Text>
-          </Flex>
-
-          <Flex justify="end" gap={5}>
-            <Button
-              variant="outline"
-              color="neutral"
-              onClick={() => onOpenChange(false)}
-              disabled={deleteWebhookMutation.isPending}
-              data-test-id="admin-cancel-delete-webhook"
-            >
-              Cancel
-            </Button>
-            <Button
-              variant="solid"
-              color="danger"
-              onClick={handleDelete}
-              loading={deleteWebhookMutation.isPending}
-              loaderText="Deleting..."
-              data-test-id="admin-confirm-delete-webhook"
-            >
-              Delete
-            </Button>
-          </Flex>
-        </Flex>
-      </Dialog.Content>
-    </Dialog>
+    <AlertDialog open={isOpen} onOpenChange={onOpenChange}>
+      <AlertDialog.Content width={600}>
+        <AlertDialog.Header>
+          <AlertDialog.Title>Delete Webhook</AlertDialog.Title>
+          <AlertDialog.Description>
+            Are you sure you want to delete this webhook
+            {webhookDescription ? ` "${webhookDescription}"` : ""}? This action
+            cannot be undone.
+          </AlertDialog.Description>
+        </AlertDialog.Header>
+        <AlertDialog.Footer>
+          <AlertDialog.Close
+            render={
+              <Button
+                variant="outline"
+                color="neutral"
+                disabled={deleteWebhookMutation.isPending}
+                data-test-id="admin-cancel-delete-webhook"
+              >
+                Cancel
+              </Button>
+            }
+          />
+          <Button
+            variant="solid"
+            color="danger"
+            onClick={handleDelete}
+            loading={deleteWebhookMutation.isPending}
+            loaderText="Deleting..."
+            data-test-id="admin-confirm-delete-webhook"
+          >
+            Delete
+          </Button>
+        </AlertDialog.Footer>
+      </AlertDialog.Content>
+    </AlertDialog>
   );
 }