diff --git a/apps/web/modules/ee/role-management/components/add-member-role.tsx b/apps/web/modules/ee/role-management/components/add-member-role.tsx
index 3682070ea3..cfba5eb3a2 100644
--- a/apps/web/modules/ee/role-management/components/add-member-role.tsx
+++ b/apps/web/modules/ee/role-management/components/add-member-role.tsx
@@ -37,7 +37,7 @@ export function AddMemberRole({
     let rolesArray = ["member"];
 
     if (isOwner) {
-      rolesArray.push("owner", "manager");
+      rolesArray.push("manager", "owner");
       if (isFormbricksCloud) {
         rolesArray.push("billing");
       }
@@ -62,7 +62,7 @@ export function AddMemberRole({
         <div className="flex flex-col space-y-2">
           <Label>{t("common.role_organization")}</Label>
           <Select
-            defaultValue="member"
+            defaultValue={canDoRoleManagement ? "member" : "owner"}
             disabled={!canDoRoleManagement}
             onValueChange={(v) => {
               onChange(v as TOrganizationRole);
@@ -74,7 +74,7 @@ export function AddMemberRole({
               </SelectValue>
             </SelectTrigger>
             <SelectContent>
-              <SelectGroup>
+              <SelectGroup className="flex flex-col-reverse">
                 {roles.map((role) => (
                   <SelectItem key={role} value={role}>
                     <P className="capitalize">{role}</P>
diff --git a/apps/web/modules/ee/role-management/components/edit-membership-role.tsx b/apps/web/modules/ee/role-management/components/edit-membership-role.tsx
index 004974b973..ef4e54363b 100644
--- a/apps/web/modules/ee/role-management/components/edit-membership-role.tsx
+++ b/apps/web/modules/ee/role-management/components/edit-membership-role.tsx
@@ -81,7 +81,7 @@ export function EditMembershipRole({
     let roles: string[] = ["member"];
 
     if (isOwner) {
-      roles.push("owner", "manager");
+      roles.push("manager", "owner");
 
       if (isFormbricksCloud) {
         roles.push("billing");
@@ -111,7 +111,8 @@ export function EditMembershipRole({
               onValueChange={(value) => {
                 handleRoleChange(value.toLowerCase() as TOrganizationRole);
               }}
-              value={memberRole}>
+              value={memberRole}
+              className="flex flex-col-reverse">
               {getMembershipRoles().map((role) => (
                 <DropdownMenuRadioItem className="capitalize" key={role} value={role}>
                   {role.toLowerCase()}
diff --git a/apps/web/modules/organization/settings/teams/components/invite-member/individual-invite-tab.tsx b/apps/web/modules/organization/settings/teams/components/invite-member/individual-invite-tab.tsx
index ea7887aed1..2981680c78 100644
--- a/apps/web/modules/organization/settings/teams/components/invite-member/individual-invite-tab.tsx
+++ b/apps/web/modules/organization/settings/teams/components/invite-member/individual-invite-tab.tsx
@@ -49,7 +49,7 @@ export const IndividualInviteTab = ({
   const form = useForm<TFormData>({
     resolver: zodResolver(ZFormSchema),
     defaultValues: {
-      role: "member",
+      role: canDoRoleManagement ? "member" : "owner",
       teamIds: [],
     },
   });
diff --git a/packages/logger/package.json b/packages/logger/package.json
index b3b095e0b5..b11bf305fb 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -17,6 +17,14 @@
     "logger",
     "logging"
   ],
+  "files": [
+    "dist"
+  ],
+  "exports": {
+    "types": "./dist/index.d.ts",
+    "import": "./dist/index.js",
+    "require": "./dist/index.cjs"
+  },
   "scripts": {
     "clean": "rimraf .turbo node_modules coverage dist",
     "lint": "eslint . --ext .ts,.js,.tsx,.jsx",