diff --git a/backend/src/api/tenant/tenantUpdate.ts b/backend/src/api/tenant/tenantUpdate.ts
index 78f01ee1de..87eb731b7a 100644
--- a/backend/src/api/tenant/tenantUpdate.ts
+++ b/backend/src/api/tenant/tenantUpdate.ts
@@ -1,5 +1,6 @@
 import { Error403 } from '@crowd/common'
 import TenantService from '../../services/tenantService'
+import identifyTenant from '@/segment/identifyTenant'
 
 export default async (req, res) => {
   if (!req.currentUser || !req.currentUser.id) {
@@ -10,5 +11,7 @@ export default async (req, res) => {
   // checked inside the service
   const payload = await new TenantService(req).update(req.params.id, req.body)
 
+  identifyTenant({ ...req, currentTenant: payload })
+
   await req.responseHandler.success(req, res, payload)
 }
diff --git a/backend/src/database/migrations/U1704395824__memberMergeSuggestionsLastGeneratedAt.sql b/backend/src/database/migrations/U1704395824__memberMergeSuggestionsLastGeneratedAt.sql
new file mode 100644
index 0000000000..87c5849f6d
--- /dev/null
+++ b/backend/src/database/migrations/U1704395824__memberMergeSuggestionsLastGeneratedAt.sql
@@ -0,0 +1 @@
+alter table "tenants" drop column "memberMergeSuggestionsLastGeneratedAt";
\ No newline at end of file
diff --git a/backend/src/database/migrations/V1704395824__memberMergeSuggestionsLastGeneratedAt.sql b/backend/src/database/migrations/V1704395824__memberMergeSuggestionsLastGeneratedAt.sql
new file mode 100644
index 0000000000..0d89f2095c
--- /dev/null
+++ b/backend/src/database/migrations/V1704395824__memberMergeSuggestionsLastGeneratedAt.sql
@@ -0,0 +1,2 @@
+alter table "tenants"
+add column "memberMergeSuggestionsLastGeneratedAt" timestamp with time zone null;
\ No newline at end of file
diff --git a/backend/src/database/repositories/memberRepository.ts b/backend/src/database/repositories/memberRepository.ts
index 4d3fd07833..d739f3f93a 100644
--- a/backend/src/database/repositories/memberRepository.ts
+++ b/backend/src/database/repositories/memberRepository.ts
@@ -238,44 +238,49 @@ class MemberRepository {
   }
 
   static async findMembersWithMergeSuggestions(
-    { limit = 20, offset = 0 },
+    { limit = 20, offset = 0, memberId = undefined },
     options: IRepositoryOptions,
   ) {
-    const currentTenant = SequelizeRepository.getCurrentTenant(options)
     const segmentIds = SequelizeRepository.getSegmentIds(options)
 
+    const isSegmentsEnabled = await isFeatureEnabled(FeatureFlag.SEGMENTS, options)
+
+    const order = isSegmentsEnabled
+      ? 'mtm."activityEstimate" desc, mtm.similarity desc, mtm."memberId", mtm."toMergeId"'
+      : 'mtm.similarity desc, mtm."activityEstimate" desc, mtm."memberId", mtm."toMergeId"'
+
+    const similarityFilter = isSegmentsEnabled ? ' and mtm.similarity > 0.95 ' : ''
+
+    const memberFilter = memberId
+      ? ` and (mtm."memberId" = :memberId OR mtm."toMergeId" = :memberId)`
+      : ''
+
     const mems = await options.database.sequelize.query(
-      `SELECT 
-        "membersToMerge".id, 
-        "membersToMerge"."toMergeId",
-        "membersToMerge"."total_count",
-        "membersToMerge"."similarity",
-        "membersToMerge"."activityEstimate"
-      FROM 
-      (
-        SELECT DISTINCT ON (Greatest(Hashtext(Concat(mem.id, mtm."toMergeId")), Hashtext(Concat(mtm."toMergeId", mem.id)))) 
-            mem.id, 
-            mtm."toMergeId", 
-            mem."joinedAt", 
-            COUNT(*) OVER() AS total_count,
-            mtm."similarity",
-            mtm."activityEstimate"
-          FROM members mem
-          INNER JOIN "memberToMerge" mtm ON mem.id = mtm."memberId"
-          JOIN "memberSegments" ms ON ms."memberId" = mem.id
-          WHERE mem."tenantId" = :tenantId
-            AND ms."segmentId" IN (:segmentIds)
-        ) AS "membersToMerge" 
-      ORDER BY 
-        "membersToMerge"."activityEstimate", "membersToMerge"."similarity" DESC 
-      LIMIT :limit OFFSET :offset
+      `
+      select
+          mtm."memberId" AS id,
+          mtm."toMergeId",
+          count(*) over() AS total_count,
+          mtm.similarity
+      from
+          "memberToMerge" mtm
+      where exists (
+          select 1
+          from "memberSegments" ms
+          where ms."segmentId" in (:segmentIds) and ms."memberId" = mtm."memberId"
+          ${memberFilter}
+      )
+      ${similarityFilter}
+      order by ${order}
+      limit :limit
+      offset :offset;
     `,
       {
         replacements: {
-          tenantId: currentTenant.id,
           segmentIds,
           limit,
           offset,
+          memberId,
         },
         type: QueryTypes.SELECT,
       },
@@ -297,7 +302,7 @@ class MemberRepository {
         members: [i, memberToMergeResults[idx]],
         similarity: mems[idx].similarity,
       }))
-      return { rows: result, count: mems[0].total_count / 2, limit, offset }
+      return { rows: result, count: mems[0].total_count, limit, offset }
     }
 
     return { rows: [{ members: [], similarity: 0 }], count: 0, limit, offset }
diff --git a/backend/src/database/repositories/organizationRepository.ts b/backend/src/database/repositories/organizationRepository.ts
index eb4f050537..3850107c99 100644
--- a/backend/src/database/repositories/organizationRepository.ts
+++ b/backend/src/database/repositories/organizationRepository.ts
@@ -1445,12 +1445,16 @@ class OrganizationRepository {
   }
 
   static async findOrganizationsWithMergeSuggestions(
-    { limit = 20, offset = 0 },
+    { limit = 20, offset = 0, organizationId = undefined },
     options: IRepositoryOptions,
   ) {
     const currentTenant = SequelizeRepository.getCurrentTenant(options)
     const segmentIds = SequelizeRepository.getSegmentIds(options)
 
+    const organizationFilter = organizationId
+      ? ` AND ("otm"."organizationId" = :organizationId OR "otm"."toMergeId" = :organizationId)`
+      : ''
+
     const orgs = await options.database.sequelize.query(
       `WITH
       cte AS (
@@ -1473,6 +1477,7 @@ class OrganizationRepository {
         WHERE org."tenantId" = :tenantId
           AND os."segmentId" IN (:segmentIds)
           AND (ma.id IS NULL OR ma.state = :mergeActionStatus)
+          ${organizationFilter}
       ),
       
       count_cte AS (
@@ -1510,6 +1515,7 @@ class OrganizationRepository {
           offset,
           mergeActionType: MergeActionType.ORG,
           mergeActionStatus: MergeActionState.ERROR,
+          organizationId,
         },
         type: QueryTypes.SELECT,
       },
diff --git a/backend/src/segment/identifyTenant.ts b/backend/src/segment/identifyTenant.ts
index 5456c8a20f..641d6461e9 100644
--- a/backend/src/segment/identifyTenant.ts
+++ b/backend/src/segment/identifyTenant.ts
@@ -11,9 +11,12 @@ export default async function identifyTenant(req) {
         analytics.group({
           userId: req.currentUser.id,
           groupId: req.currentTenant.id,
-          traits: {
-            name: req.currentTenant.name,
-          },
+          traits:
+            req.currentTenant.name !== 'temporaryName'
+              ? {
+                  name: req.currentTenant.name,
+                }
+              : undefined,
         })
       }
     } else if (API_CONFIG.edition === Edition.COMMUNITY) {
diff --git a/backend/src/services/__tests__/tenantService.test.ts b/backend/src/services/__tests__/tenantService.test.ts
index 31cd532b6e..9d45442d96 100644
--- a/backend/src/services/__tests__/tenantService.test.ts
+++ b/backend/src/services/__tests__/tenantService.test.ts
@@ -24,97 +24,6 @@ describe('TenantService tests', () => {
     await SequelizeTestUtils.closeConnection(db)
   })
 
-  describe('findMembersToMerge', () => {
-    it('Should show the same merge suggestion once, with reverse order', async () => {
-      const mockIServiceOptions = await SequelizeTestUtils.getTestIServiceOptions(db)
-      const memberService = new MemberService(mockIServiceOptions)
-      const tenantService = new TenantService(mockIServiceOptions)
-
-      const memberToCreate1 = {
-        username: {
-          [PlatformType.SLACK]: {
-            username: 'member 1',
-            integrationId: generateUUIDv1(),
-          },
-        },
-        platform: PlatformType.SLACK,
-        email: 'member.1@email.com',
-        joinedAt: '2020-05-27T15:13:30Z',
-      }
-
-      const memberToCreate2 = {
-        username: {
-          [PlatformType.DISCORD]: {
-            username: 'member 2',
-            integrationId: generateUUIDv1(),
-          },
-        },
-        platform: PlatformType.DISCORD,
-        email: 'member.2@email.com',
-        joinedAt: '2020-05-26T15:13:30Z',
-      }
-
-      const memberToCreate3 = {
-        username: {
-          [PlatformType.GITHUB]: {
-            username: 'member 3',
-            integrationId: generateUUIDv1(),
-          },
-        },
-        platform: PlatformType.GITHUB,
-        email: 'member.3@email.com',
-        joinedAt: '2020-05-25T15:13:30Z',
-      }
-
-      const memberToCreate4 = {
-        username: {
-          [PlatformType.TWITTER]: {
-            username: 'member 4',
-            integrationId: generateUUIDv1(),
-          },
-        },
-        platform: PlatformType.TWITTER,
-        email: 'member.4@email.com',
-        joinedAt: '2020-05-24T15:13:30Z',
-      }
-
-      const member1 = await memberService.upsert(memberToCreate1)
-      let member2 = await memberService.upsert(memberToCreate2)
-      const member3 = await memberService.upsert(memberToCreate3)
-      let member4 = await memberService.upsert(memberToCreate4)
-
-      await memberService.addToMerge([{ members: [member1.id, member2.id], similarity: 1 }])
-      await memberService.addToMerge([{ members: [member3.id, member4.id], similarity: 0.5 }])
-
-      member2 = await memberService.findById(member2.id)
-      member4 = await memberService.findById(member4.id)
-
-      const memberToMergeSuggestions = await tenantService.findMembersToMerge({})
-
-      // In the DB there should be:
-      // - Member 1 should have member 2 in toMerge
-      // - Member 3 should have member 4 in toMerge
-      // - Member 4 should have member 3 in toMerge
-      // - We should get these 4 combinations
-      // But this function should not return duplicates, so we should get
-      // only two pairs: [m2, m1] and [m4, m3]
-
-      expect(memberToMergeSuggestions.count).toEqual(1)
-
-      expect(
-        memberToMergeSuggestions.rows[0].members
-          .sort((a, b) => (a.createdAt > b.createdAt ? 1 : -1))
-          .map((m) => m.id),
-      ).toStrictEqual([member1.id, member2.id])
-
-      expect(
-        memberToMergeSuggestions.rows[1].members
-          .sort((a, b) => (a.createdAt > b.createdAt ? 1 : -1))
-          .map((m) => m.id),
-      ).toStrictEqual([member3.id, member4.id])
-    })
-  })
-
   describe('_findAndCountAllForEveryUser method', () => {
     it('Should succesfully find all tenants without filtering by currentUser', async () => {
       let tenants = await TenantService._findAndCountAllForEveryUser({ filter: {} })
diff --git a/frontend/src/modules/member/components/member-actions.vue b/frontend/src/modules/member/components/member-actions.vue
new file mode 100644
index 0000000000..de658eaf28
--- /dev/null
+++ b/frontend/src/modules/member/components/member-actions.vue
@@ -0,0 +1,135 @@
+<template>
+  <div>
+    <el-button-group class="ml-4">
+      <!-- Edit contact -->
+      <el-button class="btn btn--bordered btn--sm !h-8" :disabled="isEditLockedForSampleData" @click="edit()">
+        <span class="ri-pencil-line text-base mr-2" />Edit contact
+      </el-button>
+      <el-button
+        v-if="mergeSuggestionsCount > 0"
+        class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5"
+        :disabled="isEditLockedForSampleData"
+        @click="mergeSuggestions()"
+      >
+        <span class="mr-2 h-5 px-1.5 rounded-md bg-brand-100 text-brand-500 leading-5">{{ mergeSuggestionsCount }}</span>Merge suggestion
+      </el-button>
+
+      <el-button
+        v-else
+        class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5"
+        :disabled="isEditLockedForSampleData"
+        @click="merge()"
+      >
+        <span class="ri-shuffle-line text-base mr-2" />Merge
+      </el-button>
+      <app-member-dropdown
+        :member="props.member"
+        :hide-merge="true"
+        :hide-edit="true"
+        @find-github="isFindGithubDrawerOpen = member"
+      >
+        <template #trigger>
+          <el-button class="btn btn--bordered btn--sm !p-2 !h-8 !border-l-2 !border-l-gray-200">
+            <span class="ri-more-fill text-base" />
+          </el-button>
+        </template>
+      </app-member-dropdown>
+    </el-button-group>
+  </div>
+  <app-member-find-github-drawer
+    v-if="isFindGithubDrawerOpen"
+    v-model="isFindGithubDrawerOpen"
+  />
+  <app-member-merge-dialog
+    v-if="isMergeDialogOpen"
+    v-model="isMergeDialogOpen"
+  />
+</template>
+
+<script setup>
+import AppMemberDropdown from '@/modules/member/components/member-dropdown.vue';
+import {
+  computed, onMounted, ref, watch,
+} from 'vue';
+import { MemberPermissions } from '@/modules/member/member-permissions';
+import { mapGetters } from '@/shared/vuex/vuex.helpers';
+import { useRouter } from 'vue-router';
+import AppMemberFindGithubDrawer from '@/modules/member/components/member-find-github-drawer.vue';
+import AppMemberMergeDialog from '@/modules/member/components/member-merge-dialog.vue';
+import { MemberService } from '@/modules/member/member-service';
+
+const props = defineProps({
+  member: {
+    type: Object,
+    default: () => {},
+  },
+});
+const router = useRouter();
+
+const { currentUser, currentTenant } = mapGetters('auth');
+
+const isMergeDialogOpen = ref(null);
+const isFindGithubDrawerOpen = ref(null);
+const mergeSuggestionsCount = ref(0);
+
+const isEditLockedForSampleData = computed(
+  () => new MemberPermissions(currentTenant.value, currentUser.value)
+    .editLockedForSampleData,
+);
+
+const fetchMembersToMergeCount = () => {
+  MemberService.fetchMergeSuggestions(1, 0, {
+    memberId: props.member.id,
+  })
+    .then(({ count }) => {
+      mergeSuggestionsCount.value = count;
+    });
+};
+
+const edit = () => {
+  if (isEditLockedForSampleData.value) {
+    return;
+  }
+  router.push({
+    name: 'memberEdit',
+    params: {
+      id: props.member.id,
+    },
+  });
+};
+const mergeSuggestions = () => {
+  if (isEditLockedForSampleData.value) {
+    return;
+  }
+  router.push({
+    name: 'memberMergeSuggestions',
+    query: {
+      memberId: props.member.id,
+    },
+  });
+};
+
+const merge = () => {
+  if (isEditLockedForSampleData.value) {
+    return;
+  }
+  isMergeDialogOpen.value = props.member;
+};
+
+watch(() => props.member, () => {
+  fetchMembersToMergeCount();
+});
+
+onMounted(() => {
+  fetchMembersToMergeCount();
+});
+</script>
+
+<script>
+export default {
+  name: 'AppMemberActions',
+};
+</script>
+
+<style lang="scss">
+</style>
diff --git a/frontend/src/modules/member/components/member-dropdown-content.vue b/frontend/src/modules/member/components/member-dropdown-content.vue
index 93f564a872..18132c6d15 100644
--- a/frontend/src/modules/member/components/member-dropdown-content.vue
+++ b/frontend/src/modules/member/components/member-dropdown-content.vue
@@ -1,5 +1,6 @@
 <template>
   <router-link
+    v-if="!props.hideEdit"
     :to="{
       name: 'memberEdit',
       params: {
@@ -70,6 +71,7 @@
     <span class="ml-2 text-xs"> Find GitHub </span>
   </button>
   <button
+    v-if="!props.hideMerge"
     class="h-10 el-dropdown-menu__item w-full"
     :disabled="isEditLockedForSampleData"
     type="button"
@@ -250,6 +252,8 @@ enum Actions {
 const emit = defineEmits<{(e: 'merge'): void, (e: 'closeDropdown'): void, (e: 'findGithub'): void }>();
 const props = defineProps<{
   member: Member;
+  hideMerge: boolean;
+  hideEdit: boolean;
 }>();
 
 const store = useStore();
diff --git a/frontend/src/modules/member/components/member-dropdown.vue b/frontend/src/modules/member/components/member-dropdown.vue
index d597ab172e..fc7f489e7d 100644
--- a/frontend/src/modules/member/components/member-dropdown.vue
+++ b/frontend/src/modules/member/components/member-dropdown.vue
@@ -1,11 +1,11 @@
 <template>
-  <div>
-    <el-dropdown
-      v-if="!isReadOnly"
-      ref="dropdown"
-      trigger="click"
-      placement="bottom-end"
-    >
+  <el-dropdown
+    v-if="!isReadOnly"
+    ref="dropdown"
+    trigger="click"
+    placement="bottom-end"
+  >
+    <slot name="trigger">
       <button
         class="el-dropdown-link btn p-1.5 rounder-md hover:bg-gray-200 text-gray-600"
         type="button"
@@ -13,16 +13,19 @@
       >
         <i class="text-xl ri-more-fill" />
       </button>
-      <template #dropdown>
-        <app-member-dropdown-content
-          :member="member"
-          @find-github="emit('findGithub')"
-          @close-dropdown="onDropdownClose"
-          @merge="emit('merge')"
-        />
-      </template>
-    </el-dropdown>
-  </div>
+    </slot>
+
+    <template #dropdown>
+      <app-member-dropdown-content
+        :member="member"
+        :hide-edit="hideEdit"
+        :hide-merge="hideMerge"
+        @find-github="emit('findGithub')"
+        @close-dropdown="onDropdownClose"
+        @merge="emit('merge')"
+      />
+    </template>
+  </el-dropdown>
 </template>
 
 <script setup>
@@ -37,6 +40,14 @@ defineProps({
     type: Object,
     default: () => {},
   },
+  hideEdit: {
+    type: Boolean,
+    default: false,
+  },
+  hideMerge: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const { currentTenant, currentUser } = mapGetters('auth');
diff --git a/frontend/src/modules/member/components/view/member-view-header.vue b/frontend/src/modules/member/components/view/member-view-header.vue
index a0078e3e78..14f0efb14d 100644
--- a/frontend/src/modules/member/components/view/member-view-header.vue
+++ b/frontend/src/modules/member/components/view/member-view-header.vue
@@ -11,12 +11,6 @@
           <div class="flex items-center gap-4">
             <app-member-sentiment :member="member" />
             <app-member-engagement-level :member="member" />
-            <app-member-dropdown
-              :member="member"
-              :show-view-member="false"
-              @merge="isMergeDialogOpen = member"
-              @find-github="isFindGithubDrawerOpen = member"
-            />
           </div>
         </div>
         <app-member-organizations
@@ -118,11 +112,6 @@
         <app-tag-popover v-model="isEditTagsDialogOpen" :member="member" />
       </div>
     </div>
-    <app-member-find-github-drawer
-      v-if="isFindGithubDrawerOpen"
-      v-model="isFindGithubDrawerOpen"
-    />
-    <app-member-merge-dialog v-model="isMergeDialogOpen" />
   </div>
 </template>
 
@@ -135,13 +124,10 @@ import { formatDateToTimeAgo, formatDate } from '@/utils/date';
 import AppMemberReach from '@/modules/member/components/member-reach.vue';
 import AppMemberSentiment from '@/modules/member/components/member-sentiment.vue';
 import AppMemberEngagementLevel from '@/modules/member/components/member-engagement-level.vue';
-import AppMemberDropdown from '@/modules/member/components/member-dropdown.vue';
 import AppMemberBadge from '@/modules/member/components/member-badge.vue';
 import AppTags from '@/modules/tag/components/tag-list.vue';
 import AppMemberBio from '@/modules/member/components/member-bio.vue';
 import AppTagPopover from '@/modules/tag/components/tag-popover.vue';
-import AppMemberMergeDialog from '@/modules/member/components/member-merge-dialog.vue';
-import AppMemberFindGithubDrawer from '@/modules/member/components/member-find-github-drawer.vue';
 import AppSvg from '@/shared/svg/svg.vue';
 import { getAttributeSourceName } from '@/shared/helpers/attribute.helpers';
 import CrEnrichmentSneakPeak from '@/shared/modules/enrichment/components/enrichment-sneak-peak.vue';
@@ -154,8 +140,6 @@ defineProps({
 });
 
 const isEditTagsDialogOpen = ref(false);
-const isMergeDialogOpen = ref(null);
-const isFindGithubDrawerOpen = ref(null);
 
 const formattedInformation = (value, type) => {
   // Show dash for empty information
diff --git a/frontend/src/modules/member/member-service.js b/frontend/src/modules/member/member-service.js
index 008713e277..a78b168169 100644
--- a/frontend/src/modules/member/member-service.js
+++ b/frontend/src/modules/member/member-service.js
@@ -218,13 +218,14 @@ export class MemberService {
     return response.data;
   }
 
-  static async fetchMergeSuggestions(limit, offset) {
+  static async fetchMergeSuggestions(limit, offset, query) {
     const sampleTenant = AuthCurrentTenant.getSampleTenantData();
     const tenantId = sampleTenant?.id || AuthCurrentTenant.get();
 
     const params = {
       limit,
       offset,
+      ...query,
     };
 
     return authAxios.get(
diff --git a/frontend/src/modules/member/pages/member-merge-suggestions-page.vue b/frontend/src/modules/member/pages/member-merge-suggestions-page.vue
index 139b0c4239..0f4aa8c8c1 100644
--- a/frontend/src/modules/member/pages/member-merge-suggestions-page.vue
+++ b/frontend/src/modules/member/pages/member-merge-suggestions-page.vue
@@ -139,11 +139,14 @@ import Message from '@/shared/message/message';
 import { mapGetters } from '@/shared/vuex/vuex.helpers';
 import AppLoading from '@/shared/loading/loading-placeholder.vue';
 import AppMemberMergeSuggestionsDetails from '@/modules/member/components/suggestions/member-merge-suggestions-details.vue';
+import { useRoute } from 'vue-router';
 import { MemberService } from '../member-service';
 import { MemberPermissions } from '../member-permissions';
 
 const { currentTenant, currentUser } = mapGetters('auth');
 
+const route = useRoute();
+
 const membersToMerge = ref([]);
 const primary = ref(0);
 const offset = ref(0);
@@ -195,7 +198,7 @@ const fetch = (page) => {
   }
   loading.value = true;
 
-  MemberService.fetchMergeSuggestions(1, offset.value)
+  MemberService.fetchMergeSuggestions(1, offset.value, route.query ?? {})
     .then((res) => {
       offset.value = +res.offset;
       count.value = res.count;
diff --git a/frontend/src/modules/member/pages/member-view-page.vue b/frontend/src/modules/member/pages/member-view-page.vue
index 8d5fbfb417..7e997e134c 100644
--- a/frontend/src/modules/member/pages/member-view-page.vue
+++ b/frontend/src/modules/member/pages/member-view-page.vue
@@ -6,12 +6,15 @@
       class="app-page-spinner"
     />
     <div v-else>
-      <router-link
-        class="text-gray-600 btn-link--md btn-link--secondary p-0 inline-flex items-center"
-        :to="{ path: '/contacts' }"
-      >
-        <i class="ri-arrow-left-s-line mr-2" />Contacts
-      </router-link>
+      <div class="flex justify-between">
+        <router-link
+          class="text-gray-600 btn-link--md btn-link--secondary p-0 inline-flex items-center"
+          :to="{ path: '/contacts' }"
+        >
+          <i class="ri-arrow-left-s-line mr-2" />Contacts
+        </router-link>
+        <app-member-actions :member="member" />
+      </div>
       <div class="grid grid-cols-3 gap-6 mt-4">
         <app-member-view-header
           :member="member"
@@ -83,6 +86,7 @@ import AppMemberViewTasks from '@/modules/member/components/view/member-view-tas
 import { useMemberStore } from '@/modules/member/store/pinia';
 import { storeToRefs } from 'pinia';
 import Plans from '@/security/plans';
+import AppMemberActions from '@/modules/member/components/member-actions.vue';
 
 const store = useStore();
 const props = defineProps({
diff --git a/frontend/src/modules/organization/components/organization-actions.vue b/frontend/src/modules/organization/components/organization-actions.vue
new file mode 100644
index 0000000000..89aeed1fba
--- /dev/null
+++ b/frontend/src/modules/organization/components/organization-actions.vue
@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <el-button-group class="ml-4">
+      <!-- Edit contact -->
+      <el-button class="btn btn--bordered btn--sm !h-8" :disabled="isEditLockedForSampleData" @click="edit()">
+        <span class="ri-pencil-line text-base mr-2" />Edit organization
+      </el-button>
+      <el-button
+        v-if="mergeSuggestionsCount > 0"
+        class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5"
+        :disabled="isEditLockedForSampleData"
+        @click="mergeSuggestions()"
+      >
+        <span class="mr-2 h-5 px-1.5 rounded-md bg-brand-100 text-brand-500 leading-5">{{ mergeSuggestionsCount }}</span>Merge suggestion
+      </el-button>
+
+      <el-button
+        v-else
+        class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5"
+        :disabled="isEditLockedForSampleData"
+        @click="merge()"
+      >
+        <span class="ri-shuffle-line text-base mr-2" />Merge
+      </el-button>
+      <app-organization-dropdown
+        :organization="props.organization"
+        :hide-merge="true"
+        :hide-edit="true"
+      >
+        <template #trigger>
+          <el-button class="btn btn--bordered btn--sm !p-2 !h-8 !border-l-2 !border-l-gray-200">
+            <span class="ri-more-fill text-base" />
+          </el-button>
+        </template>
+      </app-organization-dropdown>
+    </el-button-group>
+  </div>
+  <app-organization-merge-dialog v-model="isMergeDialogOpen" />
+</template>
+
+<script setup>
+import {
+  computed, onMounted, ref, watch,
+} from 'vue';
+import { mapGetters } from '@/shared/vuex/vuex.helpers';
+import { useRouter } from 'vue-router';
+import { OrganizationPermissions } from '@/modules/organization/organization-permissions';
+import AppOrganizationDropdown from '@/modules/organization/components/organization-dropdown.vue';
+import { OrganizationService } from '@/modules/organization/organization-service';
+import AppOrganizationMergeDialog from '@/modules/organization/components/organization-merge-dialog.vue';
+
+const props = defineProps({
+  organization: {
+    type: Object,
+    default: () => {},
+  },
+});
+const router = useRouter();
+
+const { currentUser, currentTenant } = mapGetters('auth');
+
+const isMergeDialogOpen = ref(null);
+const mergeSuggestionsCount = ref(0);
+
+const isEditLockedForSampleData = computed(
+  () => new OrganizationPermissions(currentTenant.value, currentUser.value)
+    .editLockedForSampleData,
+);
+
+const fetchOrganizationsToMergeCount = () => {
+  OrganizationService.fetchMergeSuggestions(1, 0, {
+    organizationId: props.organization.id,
+  })
+    .then(({ count }) => {
+      mergeSuggestionsCount.value = count;
+    });
+};
+
+const edit = () => {
+  if (isEditLockedForSampleData.value) {
+    return;
+  }
+  router.push({
+    name: 'organizationEdit',
+    params: {
+      id: props.organization.id,
+    },
+  });
+};
+
+const mergeSuggestions = () => {
+  if (isEditLockedForSampleData.value) {
+    return;
+  }
+  router.push({
+    name: 'organizationMergeSuggestions',
+    query: {
+      organizationId: props.organization.id,
+    },
+  });
+};
+
+const merge = () => {
+  if (isEditLockedForSampleData.value) {
+    return;
+  }
+  isMergeDialogOpen.value = props.organization;
+};
+
+watch(() => props.organization, () => {
+  fetchOrganizationsToMergeCount();
+});
+
+onMounted(() => {
+  fetchOrganizationsToMergeCount();
+});
+</script>
+
+<script>
+export default {
+  name: 'AppOrganizationActions',
+};
+</script>
+
+<style lang="scss">
+</style>
diff --git a/frontend/src/modules/organization/components/organization-dropdown-content.vue b/frontend/src/modules/organization/components/organization-dropdown-content.vue
index 18246caa5a..38c12a1b40 100644
--- a/frontend/src/modules/organization/components/organization-dropdown-content.vue
+++ b/frontend/src/modules/organization/components/organization-dropdown-content.vue
@@ -1,6 +1,7 @@
 <template>
   <!-- Edit -->
   <router-link
+    v-if="!hideEdit"
     :to="{
       name: 'organizationEdit',
       params: {
@@ -22,6 +23,7 @@
 
   <!-- Merge organization -->
   <button
+    v-if="!hideMerge"
     class="h-10 el-dropdown-menu__item w-full"
     type="button"
     :disabled="isEditLockedForSampleData"
@@ -182,6 +184,8 @@ const router = useRouter();
 const emit = defineEmits<{(e: 'merge'): void, (e: 'closeDropdown'): void }>();
 defineProps<{
   organization: Organization;
+  hideMerge: boolean;
+  hideEdit: boolean;
 }>();
 
 const store = useStore();
diff --git a/frontend/src/modules/organization/components/organization-dropdown.vue b/frontend/src/modules/organization/components/organization-dropdown.vue
index 873c3d08d4..c85ea6078d 100644
--- a/frontend/src/modules/organization/components/organization-dropdown.vue
+++ b/frontend/src/modules/organization/components/organization-dropdown.vue
@@ -1,11 +1,11 @@
 <template>
-  <div>
-    <el-dropdown
-      v-if="!isReadOnly && organization"
-      ref="dropdown"
-      trigger="click"
-      placement="bottom-end"
-    >
+  <el-dropdown
+    v-if="!isReadOnly && organization"
+    ref="dropdown"
+    trigger="click"
+    placement="bottom-end"
+  >
+    <slot name="trigger">
       <button
         class="el-dropdown-link btn p-1.5 rounder-md hover:bg-gray-200 text-gray-600"
         type="button"
@@ -13,15 +13,17 @@
       >
         <i class="text-xl ri-more-fill" />
       </button>
-      <template #dropdown>
-        <app-organization-dropdown-content
-          :organization="organization"
-          @merge="emit('merge')"
-          @close-dropdown="onDropdownClose"
-        />
-      </template>
-    </el-dropdown>
-  </div>
+    </slot>
+    <template #dropdown>
+      <app-organization-dropdown-content
+        :organization="organization"
+        :hide-edit="hideEdit"
+        :hide-merge="hideMerge"
+        @merge="emit('merge')"
+        @close-dropdown="onDropdownClose"
+      />
+    </template>
+  </el-dropdown>
 </template>
 
 <script setup>
@@ -37,6 +39,14 @@ defineProps({
     type: Object,
     default: () => {},
   },
+  hideEdit: {
+    type: Boolean,
+    default: false,
+  },
+  hideMerge: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits([
diff --git a/frontend/src/modules/organization/components/view/organization-view-header.vue b/frontend/src/modules/organization/components/view/organization-view-header.vue
index 43cc216864..30f42d9a3d 100644
--- a/frontend/src/modules/organization/components/view/organization-view-header.vue
+++ b/frontend/src/modules/organization/components/view/organization-view-header.vue
@@ -50,12 +50,6 @@
           </div>
         </div>
       </div>
-      <div class="flex items-center">
-        <app-organization-dropdown
-          :organization="organization"
-          @merge="isMergeDialogOpen = organization"
-        />
-      </div>
     </div>
     <div
       class="py-6 border-b border-gray-200 mb-4"
@@ -194,8 +188,6 @@
         </p>
       </div>
     </div>
-
-    <app-organization-merge-dialog v-model="isMergeDialogOpen" />
   </div>
 </template>
 
@@ -212,9 +204,7 @@ import {
 } from '@/utils/number';
 import { withHttp } from '@/utils/string';
 import AppOrganizationBadge from '@/modules/organization/components/organization-badge.vue';
-import AppOrganizationDropdown from '@/modules/organization/components/organization-dropdown.vue';
 import AppOrganizationHeadline from '@/modules/organization/components/organization-headline..vue';
-import AppOrganizationMergeDialog from '@/modules/organization/components/organization-merge-dialog.vue';
 import AppSvg from '@/shared/svg/svg.vue';
 import CrEnrichmentSneakPeak from '@/shared/modules/enrichment/components/enrichment-sneak-peak.vue';
 import revenueRange from '../../config/enrichment/revenueRange';
@@ -228,7 +218,6 @@ const props = defineProps({
 
 const showMore = ref(false);
 const descriptionRef = ref(null);
-const isMergeDialogOpen = ref(null);
 const displayShowMore = computed(() => {
   if (!props.organization.description) {
     return false;
diff --git a/frontend/src/modules/organization/organization-service.js b/frontend/src/modules/organization/organization-service.js
index 9eb6204091..3ab3c7d1eb 100644
--- a/frontend/src/modules/organization/organization-service.js
+++ b/frontend/src/modules/organization/organization-service.js
@@ -133,13 +133,14 @@ export class OrganizationService {
     return response.data;
   }
 
-  static async fetchMergeSuggestions(limit, offset) {
+  static async fetchMergeSuggestions(limit, offset, query) {
     const sampleTenant = AuthCurrentTenant.getSampleTenantData();
     const tenantId = sampleTenant?.id || AuthCurrentTenant.get();
 
     const params = {
       limit,
       offset,
+      ...query,
     };
 
     return authAxios.get(
diff --git a/frontend/src/modules/organization/pages/organization-merge-suggestions-page.vue b/frontend/src/modules/organization/pages/organization-merge-suggestions-page.vue
index d48b2ff3d0..1a60af2444 100644
--- a/frontend/src/modules/organization/pages/organization-merge-suggestions-page.vue
+++ b/frontend/src/modules/organization/pages/organization-merge-suggestions-page.vue
@@ -141,6 +141,7 @@ import AppLoading from '@/shared/loading/loading-placeholder.vue';
 import AppOrganizationMergeSuggestionsDetails from '@/modules/organization/components/suggestions/organization-merge-suggestions-details.vue';
 import { useOrganizationStore } from '@/modules/organization/store/pinia';
 import { storeToRefs } from 'pinia';
+import { useRoute } from 'vue-router';
 import { OrganizationService } from '../organization-service';
 import { OrganizationPermissions } from '../organization-permissions';
 
@@ -151,6 +152,8 @@ const {
   mergedOrganizations,
 } = storeToRefs(organizationStore);
 
+const route = useRoute();
+
 const organizationsToMerge = ref([]);
 const primary = ref(0);
 const offset = ref(0);
@@ -202,7 +205,7 @@ const fetch = (page) => {
   }
   loading.value = true;
 
-  OrganizationService.fetchMergeSuggestions(1, offset.value)
+  OrganizationService.fetchMergeSuggestions(1, offset.value, route.query ?? {})
     .then((res) => {
       offset.value = +res.offset;
       count.value = res.count;
diff --git a/frontend/src/modules/organization/pages/organization-view-page.vue b/frontend/src/modules/organization/pages/organization-view-page.vue
index d2585294c4..5f91502576 100644
--- a/frontend/src/modules/organization/pages/organization-view-page.vue
+++ b/frontend/src/modules/organization/pages/organization-view-page.vue
@@ -6,12 +6,16 @@
       class="app-page-spinner"
     />
     <div v-else-if="organization">
-      <router-link
-        class="text-gray-600 btn-link--md btn-link--secondary p-0 inline-flex items-center"
-        :to="{ path: '/organizations' }"
-      >
-        <i class="ri-arrow-left-s-line mr-2" />Organizations
-      </router-link>
+      <div class="flex items-center justify-between">
+        <router-link
+          class="text-gray-600 btn-link--md btn-link--secondary p-0 inline-flex items-center"
+          :to="{ path: '/organizations' }"
+        >
+          <i class="ri-arrow-left-s-line mr-2" />Organizations
+        </router-link>
+        <app-organization-actions :organization="organization" />
+      </div>
+
       <div class="grid grid-cols-3 gap-6 mt-4">
         <app-organization-view-header
           :organization="organization"
@@ -71,6 +75,7 @@ import AppOrganizationViewMembers from '@/modules/organization/components/view/o
 import Message from '@/shared/message/message';
 import { useOrganizationStore } from '@/modules/organization/store/pinia';
 import { storeToRefs } from 'pinia';
+import AppOrganizationActions from '@/modules/organization/components/organization-actions.vue';
 
 const props = defineProps({
   id: {
diff --git a/services/apps/merge_suggestions_worker/src/activities.ts b/services/apps/merge_suggestions_worker/src/activities.ts
index 7a42b2ce81..30821bfeb7 100644
--- a/services/apps/merge_suggestions_worker/src/activities.ts
+++ b/services/apps/merge_suggestions_worker/src/activities.ts
@@ -3,7 +3,8 @@ import {
   getMergeSuggestions,
   addToMerge,
   getMembers,
-  findTenantsLatestSuggestionCreatedAt,
+  findTenantsLatestMemberSuggestionGeneratedAt,
+  updateMemberMergeSuggestionsLastGeneratedAt,
 } from './activities/member-merge-suggestions/getMergeSuggestions'
 
 export {
@@ -11,5 +12,6 @@ export {
   getMergeSuggestions,
   getMembers,
   addToMerge,
-  findTenantsLatestSuggestionCreatedAt,
+  findTenantsLatestMemberSuggestionGeneratedAt,
+  updateMemberMergeSuggestionsLastGeneratedAt,
 }
diff --git a/services/apps/merge_suggestions_worker/src/activities/getAllTenants.ts b/services/apps/merge_suggestions_worker/src/activities/getAllTenants.ts
index 870635f384..15db9e697e 100644
--- a/services/apps/merge_suggestions_worker/src/activities/getAllTenants.ts
+++ b/services/apps/merge_suggestions_worker/src/activities/getAllTenants.ts
@@ -1,10 +1,10 @@
-import { ITenantId } from 'types'
+import { ITenant } from 'types'
 import { svc } from '../main'
 import TenantRepository from 'repo/tenant.repo'
 import { isFeatureEnabled } from '@crowd/feature-flags'
 import { FeatureFlag } from '@crowd/types'
 
-export async function getAllTenants(): Promise<ITenantId[]> {
+export async function getAllTenants(): Promise<ITenant[]> {
   const tenantRepository = new TenantRepository(svc.postgres.writer.connection(), svc.log)
   const tenants = await tenantRepository.getAllTenants()
 
@@ -15,6 +15,7 @@ export async function getAllTenants(): Promise<ITenantId[]> {
       async () => {
         return {
           tenantId: tenant.tenantId,
+          plan: tenant.plan,
         }
       },
       svc.unleash,
diff --git a/services/apps/merge_suggestions_worker/src/activities/member-merge-suggestions/getMergeSuggestions.ts b/services/apps/merge_suggestions_worker/src/activities/member-merge-suggestions/getMergeSuggestions.ts
index 2f875834ac..27020c3709 100644
--- a/services/apps/merge_suggestions_worker/src/activities/member-merge-suggestions/getMergeSuggestions.ts
+++ b/services/apps/merge_suggestions_worker/src/activities/member-merge-suggestions/getMergeSuggestions.ts
@@ -86,7 +86,8 @@ export async function getMergeSuggestions(
 
     let hasFuzzySearch = false
 
-    for (const identity of member.nested_identities) {
+    // prevent processing more than 200 identities because of opensearch limits
+    for (const identity of member.nested_identities.slice(0, 200)) {
       if (identity.string_username.length > 0) {
         // weak identity search
         identitiesPartialQuery.should[1].nested.query.bool.should.push({
@@ -131,7 +132,7 @@ export async function getMergeSuggestions(
   if (member.string_arr_emails && member.string_arr_emails.length > 0) {
     identitiesPartialQuery.should.push({
       terms: {
-        keyword_emails: member.string_arr_emails,
+        keyword_emails: member.string_arr_emails.filter((email: string) => email && email !== null),
       },
     })
   }
@@ -165,13 +166,23 @@ export async function getMergeSuggestions(
     ],
   }
 
-  const membersToMerge: ISimilarMemberOpensearch[] =
-    (
-      await svc.opensearch.client.search({
-        index: OpenSearchIndex.MEMBERS,
-        body: similarMembersQueryBody,
-      })
-    ).body?.hits?.hits || []
+  let membersToMerge: ISimilarMemberOpensearch[]
+
+  try {
+    membersToMerge =
+      (
+        await svc.opensearch.client.search({
+          index: OpenSearchIndex.MEMBERS,
+          body: similarMembersQueryBody,
+        })
+      ).body?.hits?.hits || []
+  } catch (e) {
+    svc.log.info(
+      { error: e, query: identitiesPartialQuery },
+      'Error while searching for similar members!',
+    )
+    throw e
+  }
 
   for (const memberToMerge of membersToMerge) {
     mergeSuggestions.push({
@@ -193,19 +204,29 @@ export async function addToMerge(suggestions: IMemberMergeSuggestion[]): Promise
   await memberMergeSuggestionsRepo.addToMerge(suggestions)
 }
 
-export async function findTenantsLatestSuggestionCreatedAt(tenantId: string): Promise<string> {
+export async function findTenantsLatestMemberSuggestionGeneratedAt(
+  tenantId: string,
+): Promise<string> {
+  const memberMergeSuggestionsRepo = new MemberMergeSuggestionsRepository(
+    svc.postgres.writer.connection(),
+    svc.log,
+  )
+  return memberMergeSuggestionsRepo.findTenantsLatestMemberSuggestionGeneratedAt(tenantId)
+}
+
+export async function updateMemberMergeSuggestionsLastGeneratedAt(tenantId: string): Promise<void> {
   const memberMergeSuggestionsRepo = new MemberMergeSuggestionsRepository(
     svc.postgres.writer.connection(),
     svc.log,
   )
-  return memberMergeSuggestionsRepo.findTenantsLatestSuggestionCreatedAt(tenantId)
+  await memberMergeSuggestionsRepo.updateMemberMergeSuggestionsLastGeneratedAt(tenantId)
 }
 
 export async function getMembers(
   tenantId: string,
   batchSize: number = 100,
   afterMemberId?: string,
-  lastCreatedAt?: string,
+  lastGeneratedAt?: string,
 ): Promise<IMemberPartialAggregatesOpensearch[]> {
   try {
     const queryBody: IMemberQueryBody = {
@@ -248,11 +269,11 @@ export async function getMembers(
       })
     }
 
-    if (lastCreatedAt) {
+    if (lastGeneratedAt) {
       queryBody.query.bool.filter.push({
         range: {
           date_createdAt: {
-            gt: new Date(lastCreatedAt).toISOString(),
+            gt: new Date(lastGeneratedAt).toISOString(),
           },
         },
       })
diff --git a/services/apps/merge_suggestions_worker/src/repo/memberMergeSuggestions.repo.ts b/services/apps/merge_suggestions_worker/src/repo/memberMergeSuggestions.repo.ts
index 47a906f314..d3e5544d66 100644
--- a/services/apps/merge_suggestions_worker/src/repo/memberMergeSuggestions.repo.ts
+++ b/services/apps/merge_suggestions_worker/src/repo/memberMergeSuggestions.repo.ts
@@ -1,7 +1,7 @@
 import { DbConnection, DbTransaction } from '@crowd/database'
 import { Logger } from '@crowd/logging'
 import { IMemberMergeSuggestion } from '@crowd/types'
-import { IMemberId, IMemberNoMerge, IMemberMergeSuggestionsLatestCreatedAt } from 'types'
+import { IMemberId, IMemberMergeSuggestionsLatestGeneratedAt, IMemberNoMerge } from 'types'
 import { chunkArray, removeDuplicateSuggestions } from 'utils'
 
 class MemberMergeSuggestionsRepository {
@@ -34,19 +34,34 @@ class MemberMergeSuggestionsRepository {
     }
   }
 
-  async findTenantsLatestSuggestionCreatedAt(tenantId: string): Promise<string> {
+  async findTenantsLatestMemberSuggestionGeneratedAt(tenantId: string): Promise<string> {
     try {
-      const result: IMemberMergeSuggestionsLatestCreatedAt = await this.connection.oneOrNone(
+      const result: IMemberMergeSuggestionsLatestGeneratedAt = await this.connection.oneOrNone(
         `
-        select max(mtm."createdAt") as "latestCreatedAt"
-        from "memberToMerge" mtm
-        inner join members m on mtm."memberId" = m.id
-        where m."tenantId" = $(tenantId);`,
+        select "memberMergeSuggestionsLastGeneratedAt"
+        from tenants
+        where "id" = $(tenantId);`,
+        {
+          tenantId,
+        },
+      )
+      return result?.memberMergeSuggestionsLastGeneratedAt
+    } catch (err) {
+      throw new Error(err)
+    }
+  }
+
+  async updateMemberMergeSuggestionsLastGeneratedAt(tenantId: string): Promise<void> {
+    try {
+      await this.connection.any(
+        `
+          update tenants set "memberMergeSuggestionsLastGeneratedAt" = now()
+          where "id" = $(tenantId);
+        `,
         {
           tenantId,
         },
       )
-      return result?.latestCreatedAt
     } catch (err) {
       throw new Error(err)
     }
@@ -87,11 +102,11 @@ class MemberMergeSuggestionsRepository {
     ) => {
       const idPlaceholder = (key: string) => `${key}${index}`
       return {
-        query: `($(${idPlaceholder('memberId')}), $(${idPlaceholder(
+        query: `($(${idPlaceholder('memberId')})::uuid, $(${idPlaceholder(
           'toMergeId',
-        )}), $(${idPlaceholder('similarity')}), $(${idPlaceholder(
+        )})::uuid, $(${idPlaceholder('similarity')}), $(${idPlaceholder(
           'activityEstimate',
-        )}), NOW(), NOW())`,
+        )})::integer, NOW(), NOW())`,
         replacements: {
           [idPlaceholder('memberId')]: memberId,
           [idPlaceholder('toMergeId')]: toMergeId,
@@ -118,9 +133,18 @@ class MemberMergeSuggestionsRepository {
       })
 
       const query = `
-        INSERT INTO "memberToMerge" ("memberId", "toMergeId", "similarity", "activityEstimate", "createdAt", "updatedAt")
-        VALUES ${placeholders.join(', ')}
-        on conflict do nothing;
+        insert into "memberToMerge" ("memberId", "toMergeId", "similarity", "activityEstimate", "createdAt", "updatedAt")
+        select new_vals.*
+        from (
+          values
+            ${placeholders.join(', ')}
+        ) AS new_vals ("memberId", "toMergeId", "similarity", "activityEstimate", "createdAt", "updatedAt")
+        where not exists (
+          select 1
+          from "memberToMerge"
+          where ("memberId" = new_vals."memberId"::uuid AND "toMergeId" = new_vals."toMergeId"::uuid) 
+          or ("memberId" = new_vals."toMergeId"::uuid AND "toMergeId" = new_vals."memberId"::uuid)
+        );
       `
       try {
         await this.connection.any(query, replacements)
diff --git a/services/apps/merge_suggestions_worker/src/repo/tenant.repo.ts b/services/apps/merge_suggestions_worker/src/repo/tenant.repo.ts
index 0105b4a678..8407daed98 100644
--- a/services/apps/merge_suggestions_worker/src/repo/tenant.repo.ts
+++ b/services/apps/merge_suggestions_worker/src/repo/tenant.repo.ts
@@ -1,6 +1,6 @@
 import { DbConnection, DbTransaction } from '@crowd/database'
 import { Logger } from '@crowd/logging'
-import { ITenantId } from 'types'
+import { ITenant } from 'types'
 
 class TenantRepository {
   constructor(
@@ -8,11 +8,11 @@ class TenantRepository {
     private readonly log: Logger,
   ) {}
 
-  async getAllTenants(): Promise<ITenantId[]> {
-    let rows: ITenantId[] = []
+  async getAllTenants(): Promise<ITenant[]> {
+    let rows: ITenant[] = []
     try {
       rows = await this.connection.query(`
-        SELECT id as "tenantId"
+        SELECT id as "tenantId", plan
         FROM tenants WHERE "deletedAt" IS NULL;
       `)
     } catch (err) {
diff --git a/services/apps/merge_suggestions_worker/src/types.ts b/services/apps/merge_suggestions_worker/src/types.ts
index 1cfa2f5528..3b8a1fba71 100644
--- a/services/apps/merge_suggestions_worker/src/types.ts
+++ b/services/apps/merge_suggestions_worker/src/types.ts
@@ -1,5 +1,6 @@
-export interface ITenantId {
+export interface ITenant {
   tenantId: string
+  plan: string
 }
 
 interface ITermFilter {
@@ -79,8 +80,8 @@ export interface IMemberNoMerge {
   noMergeId: string
 }
 
-export interface IMemberMergeSuggestionsLatestCreatedAt {
-  latestCreatedAt: string
+export interface IMemberMergeSuggestionsLatestGeneratedAt {
+  memberMergeSuggestionsLastGeneratedAt: string
 }
 
 export interface IMemberId {
diff --git a/services/apps/merge_suggestions_worker/src/workflows/generateMemberMergeSuggestions.ts b/services/apps/merge_suggestions_worker/src/workflows/generateMemberMergeSuggestions.ts
index dc5e5e54e4..716b29f2f5 100644
--- a/services/apps/merge_suggestions_worker/src/workflows/generateMemberMergeSuggestions.ts
+++ b/services/apps/merge_suggestions_worker/src/workflows/generateMemberMergeSuggestions.ts
@@ -1,4 +1,4 @@
-import { proxyActivities } from '@temporalio/workflow'
+import { proxyActivities, continueAsNew } from '@temporalio/workflow'
 import * as activities from '../activities/member-merge-suggestions/getMergeSuggestions'
 
 import { IMemberMergeSuggestion, IProcessGenerateMemberMergeSuggestionsArgs } from '@crowd/types'
@@ -10,40 +10,46 @@ const activity = proxyActivities<typeof activities>({ startToCloseTimeout: '1 mi
 export async function generateMemberMergeSuggestions(
   args: IProcessGenerateMemberMergeSuggestionsArgs,
 ): Promise<void> {
-  const PAGE_SIZE = 50
-  const PARALLEL_SUGGESTION_PROCESSING = 10
+  const PAGE_SIZE = 1000
+  const PARALLEL_SUGGESTION_PROCESSING = 250
 
-  let result: IMemberPartialAggregatesOpensearch[]
-  let lastUuid: string
+  let lastUuid: string = args.lastUuid || null
 
-  // get the latest createdAt of tenant's member suggestions, we'll only get members created after that for new suggestions
-  const lastCreatedAt = await activity.findTenantsLatestSuggestionCreatedAt(args.tenantId)
+  // get the latest generation time of tenant's member suggestions, we'll only get members created after that for new suggestions
+  const lastGeneratedAt = await activity.findTenantsLatestMemberSuggestionGeneratedAt(args.tenantId)
 
-  do {
-    result = await activity.getMembers(args.tenantId, PAGE_SIZE, lastUuid, lastCreatedAt)
+  const result: IMemberPartialAggregatesOpensearch[] = await activity.getMembers(
+    args.tenantId,
+    PAGE_SIZE,
+    lastUuid,
+    lastGeneratedAt,
+  )
 
-    lastUuid = result.length > 0 ? result[result.length - 1]?.uuid_memberId : null
+  if (result.length === 0) {
+    await activity.updateMemberMergeSuggestionsLastGeneratedAt(args.tenantId)
+    return
+  }
 
-    // Gather all promises for merge suggestions
-    const mergeSuggestionsPromises: Promise<IMemberMergeSuggestion[]>[] = result.map((member) =>
-      activity.getMergeSuggestions(args.tenantId, member),
-    )
+  lastUuid = result.length > 0 ? result[result.length - 1]?.uuid_memberId : null
+
+  const allMergeSuggestions: IMemberMergeSuggestion[] = []
 
-    const promiseChunks = chunkArray<Promise<IMemberMergeSuggestion[]>>(
-      mergeSuggestionsPromises,
-      PARALLEL_SUGGESTION_PROCESSING,
+  const promiseChunks = chunkArray(result, PARALLEL_SUGGESTION_PROCESSING)
+
+  for (const chunk of promiseChunks) {
+    const mergeSuggestionsPromises: Promise<IMemberMergeSuggestion[]>[] = chunk.map((member) =>
+      activity.getMergeSuggestions(args.tenantId, member),
     )
 
-    const allMergeSuggestions: IMemberMergeSuggestion[] = []
+    const mergeSuggestionsResults: IMemberMergeSuggestion[][] =
+      await Promise.all(mergeSuggestionsPromises)
+    allMergeSuggestions.push(...mergeSuggestionsResults.flat())
+  }
 
-    for (const promiseChunk of promiseChunks) {
-      const mergeSuggestionsResults: IMemberMergeSuggestion[][] = await Promise.all(promiseChunk)
-      allMergeSuggestions.push(...mergeSuggestionsResults.flat())
-    }
+  // Add all merge suggestions to add to merge
+  if (allMergeSuggestions.length > 0) {
+    await activity.addToMerge(allMergeSuggestions)
+  }
 
-    // Add all merge suggestions to add to merge
-    if (allMergeSuggestions.length > 0) {
-      await activity.addToMerge(allMergeSuggestions)
-    }
-  } while (result.length > 0)
+  await continueAsNew<typeof generateMemberMergeSuggestions>({ tenantId: args.tenantId, lastUuid })
 }
diff --git a/services/libs/types/src/temporal/automations.ts b/services/libs/types/src/temporal/automations.ts
index 1aed49f70d..903f13e812 100644
--- a/services/libs/types/src/temporal/automations.ts
+++ b/services/libs/types/src/temporal/automations.ts
@@ -20,4 +20,5 @@ export interface ITriggerMemberAutomationArgs {
 
 export interface IProcessGenerateMemberMergeSuggestionsArgs {
   tenantId: string
+  lastUuid?: string
 }