diff --git a/apps/app/components/workspace/delete-workspace-modal.tsx b/apps/app/components/workspace/delete-workspace-modal.tsx
index 54ddedc3b..b896a87e7 100644
--- a/apps/app/components/workspace/delete-workspace-modal.tsx
+++ b/apps/app/components/workspace/delete-workspace-modal.tsx
@@ -50,8 +50,10 @@ export const DeleteWorkspaceModal: React.FC<Props> = ({ isOpen, data, onClose, u
   const canDelete = confirmWorkspaceName === data?.name && confirmDeleteMyWorkspace;
 
   const handleClose = () => {
-    onClose();
     setIsDeleteLoading(false);
+    setConfirmWorkspaceName("");
+    setConfirmDeleteMyWorkspace(false);
+    onClose();
   };
 
   const handleDeletion = async () => {
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
index 7de91c823..4287cee5d 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
@@ -34,7 +34,7 @@ import { truncateText } from "helpers/string.helper";
 import { IProject, IWorkspace } from "types";
 import type { NextPage } from "next";
 // fetch-keys
-import { PROJECTS_LIST, PROJECT_DETAILS } from "constants/fetch-keys";
+import { PROJECTS_LIST, PROJECT_DETAILS, USER_PROJECT_VIEW } from "constants/fetch-keys";
 // constants
 import { NETWORK_CHOICES } from "constants/project";
 
@@ -62,6 +62,13 @@ const GeneralSettings: NextPage = () => {
       : null
   );
 
+  const { data: memberDetails, error } = useSWR(
+    workspaceSlug && projectId ? USER_PROJECT_VIEW(projectId.toString()) : null,
+    workspaceSlug && projectId
+      ? () => projectService.projectMemberMe(workspaceSlug.toString(), projectId.toString())
+      : null
+  );
+
   const {
     register,
     handleSubmit,
@@ -157,6 +164,8 @@ const GeneralSettings: NextPage = () => {
 
   const currentNetwork = NETWORK_CHOICES.find((n) => n.key === projectDetails?.network);
 
+  const isAdmin = memberDetails?.role === 20;
+
   return (
     <ProjectAuthorizationWrapper
       breadcrumbs={
@@ -355,7 +364,7 @@ const GeneralSettings: NextPage = () => {
           </div>
           <div className="sm:text-right">
             {projectDetails ? (
-              <SecondaryButton type="submit" loading={isSubmitting}>
+              <SecondaryButton type="submit" loading={isSubmitting} disabled={!isAdmin}>
                 {isSubmitting ? "Updating Project..." : "Update Project"}
               </SecondaryButton>
             ) : (
@@ -364,32 +373,34 @@ const GeneralSettings: NextPage = () => {
               </Loader>
             )}
           </div>
-          <div className="grid grid-cols-12 gap-4 sm:gap-16">
-            <div className="col-span-12 sm:col-span-6">
-              <h4 className="text-lg font-semibold">Danger Zone</h4>
-              <p className="text-sm text-custom-text-200">
-                The danger zone of the project delete page is a critical area that requires careful
-                consideration and attention. When deleting a project, all of the data and resources
-                within that project will be permanently removed and cannot be recovered.
-              </p>
+          {memberDetails?.role === 20 && (
+            <div className="grid grid-cols-12 gap-4 sm:gap-16">
+              <div className="col-span-12 sm:col-span-6">
+                <h4 className="text-lg font-semibold">Danger Zone</h4>
+                <p className="text-sm text-custom-text-200">
+                  The danger zone of the project delete page is a critical area that requires
+                  careful consideration and attention. When deleting a project, all of the data and
+                  resources within that project will be permanently removed and cannot be recovered.
+                </p>
+              </div>
+              <div className="col-span-12 sm:col-span-6">
+                {projectDetails ? (
+                  <div>
+                    <DangerButton
+                      onClick={() => setSelectedProject(projectDetails.id ?? null)}
+                      outline
+                    >
+                      Delete Project
+                    </DangerButton>
+                  </div>
+                ) : (
+                  <Loader className="mt-2 w-full">
+                    <Loader.Item height="46px" width="100px" />
+                  </Loader>
+                )}
+              </div>
             </div>
-            <div className="col-span-12 sm:col-span-6">
-              {projectDetails ? (
-                <div>
-                  <DangerButton
-                    onClick={() => setSelectedProject(projectDetails.id ?? null)}
-                    outline
-                  >
-                    Delete Project
-                  </DangerButton>
-                </div>
-              ) : (
-                <Loader className="mt-2 w-full">
-                  <Loader.Item height="46px" width="100px" />
-                </Loader>
-              )}
-            </div>
-          </div>
+          )}
         </div>
       </form>
     </ProjectAuthorizationWrapper>
diff --git a/apps/app/pages/[workspaceSlug]/settings/index.tsx b/apps/app/pages/[workspaceSlug]/settings/index.tsx
index af46e0884..a254c7a49 100644
--- a/apps/app/pages/[workspaceSlug]/settings/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/settings/index.tsx
@@ -28,7 +28,7 @@ import { copyTextToClipboard, truncateText } from "helpers/string.helper";
 import type { IWorkspace } from "types";
 import type { NextPage } from "next";
 // fetch-keys
-import { WORKSPACE_DETAILS, USER_WORKSPACES } from "constants/fetch-keys";
+import { WORKSPACE_DETAILS, USER_WORKSPACES, WORKSPACE_MEMBERS_ME } from "constants/fetch-keys";
 // constants
 import { ORGANIZATION_SIZE } from "constants/workspace";
 
@@ -50,6 +50,11 @@ const WorkspaceSettings: NextPage = () => {
 
   const { user } = useUserAuth();
 
+  const { data: memberDetails } = useSWR(
+    workspaceSlug ? WORKSPACE_MEMBERS_ME(workspaceSlug.toString()) : null,
+    workspaceSlug ? () => workspaceService.workspaceMemberMe(workspaceSlug.toString()) : null
+  );
+
   const { setToastAlert } = useToast();
 
   const { data: activeWorkspace } = useSWR(
@@ -142,6 +147,8 @@ const WorkspaceSettings: NextPage = () => {
     });
   };
 
+  const isAdmin = memberDetails?.role === 20;
+
   return (
     <WorkspaceAuthorizationLayout
       breadcrumbs={
@@ -314,26 +321,32 @@ const WorkspaceSettings: NextPage = () => {
               </div>
             </div>
             <div className="sm:text-right">
-              <SecondaryButton onClick={handleSubmit(onSubmit)} loading={isSubmitting}>
+              <SecondaryButton
+                onClick={handleSubmit(onSubmit)}
+                loading={isSubmitting}
+                disabled={!isAdmin}
+              >
                 {isSubmitting ? "Updating..." : "Update Workspace"}
               </SecondaryButton>
             </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold">Danger Zone</h4>
-                <p className="text-sm text-custom-text-200">
-                  The danger zone of the workspace delete page is a critical area that requires
-                  careful consideration and attention. When deleting a workspace, all of the data
-                  and resources within that workspace will be permanently removed and cannot be
-                  recovered.
-                </p>
+            {memberDetails?.role === 20 && (
+              <div className="grid grid-cols-12 gap-4 sm:gap-16">
+                <div className="col-span-12 sm:col-span-6">
+                  <h4 className="text-lg font-semibold">Danger Zone</h4>
+                  <p className="text-sm text-custom-text-200">
+                    The danger zone of the workspace delete page is a critical area that requires
+                    careful consideration and attention. When deleting a workspace, all of the data
+                    and resources within that workspace will be permanently removed and cannot be
+                    recovered.
+                  </p>
+                </div>
+                <div className="col-span-12 sm:col-span-6">
+                  <DangerButton onClick={() => setIsOpen(true)} outline>
+                    Delete the workspace
+                  </DangerButton>
+                </div>
               </div>
-              <div className="col-span-12 sm:col-span-6">
-                <DangerButton onClick={() => setIsOpen(true)} outline>
-                  Delete the workspace
-                </DangerButton>
-              </div>
-            </div>
+            )}
           </div>
         ) : (
           <div className="grid h-full w-full place-items-center px-4 sm:px-0">