diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index c63200f73..fa36429ff 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -11,6 +11,8 @@
     import { isCloud } from '$lib/system';
     import { organization } from '$lib/stores/organization';
     import { BillingPlan } from '$lib/constants';
+    import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte';
+    import { trackEvent } from '$lib/actions/analytics';
 
     export let show = false;
 
@@ -43,7 +45,16 @@
             {/if}
         </div>
         {#if $organization?.billingPlan === BillingPlan.STARTER}
-            <Button fullWidth href="https://appwrite.io/pricing" external>
+            <Button
+                fullWidth
+                external
+                on:click={() => {
+                    wizard.start(ChangeOrganizationTierCloud);
+                    trackEvent('click_organization_upgrade', {
+                        from: 'button',
+                        source: 'support_menu'
+                    });
+                }}>
                 <span class="text">Get Premium support</span>
             </Button>
         {:else}
diff --git a/src/lib/elements/table/body.svelte b/src/lib/elements/table/body.svelte
index 7db8b0522..28ecc3a31 100644
--- a/src/lib/elements/table/body.svelte
+++ b/src/lib/elements/table/body.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { trackEvent } from '$lib/actions/analytics';
     import { getServiceLimit, type PlanServices } from '$lib/stores/billing';
     import { wizard } from '$lib/stores/wizard';
     import { isCloud } from '$lib/system';
@@ -10,6 +11,7 @@
     export let service: PlanServices = null;
     export let name = service;
     export let total: number = null;
+    export let event: string = null;
 
     let columns = 0;
 
@@ -34,7 +36,14 @@
             <span class="u-flex u-gap-24 u-main-center u-cross-center">
                 <slot name="limit" {upgradeMethod} {limit}>
                     <span class="text">Upgrade your plan to add {name} to your organization</span>
-                    <Button secondary on:click={upgradeMethod}>Upgrade plan</Button>
+                    <Button
+                        secondary
+                        on:click={upgradeMethod}
+                        on:click={() =>
+                            trackEvent('click_organization_upgrade', {
+                                from: 'button',
+                                source: event ?? 'table_row_limit_reached'
+                            })}>Upgrade plan</Button>
                 </slot>
             </span>
         </td>
diff --git a/src/routes/console/organization-[organization]/excesLimitModal.svelte b/src/routes/console/organization-[organization]/excesLimitModal.svelte
index b3a58ac1c..e39b81769 100644
--- a/src/routes/console/organization-[organization]/excesLimitModal.svelte
+++ b/src/routes/console/organization-[organization]/excesLimitModal.svelte
@@ -14,6 +14,7 @@
     import { goto } from '$app/navigation';
     import { last } from '$lib/helpers/array';
     import { BillingPlan } from '$lib/constants';
+    import { trackEvent } from '$lib/actions/analytics';
 
     export let show = false;
     const plan = $plansInfo?.get($organization.billingPlan);
@@ -89,13 +90,20 @@
                     on:click={() => {
                         show = false;
                         goto(`/console/organization-${$organization.$id}/usage`);
-                    }}>View usage</Button>
-
+                    }}>
+                    View usage
+                </Button>
                 <Button
                     on:click={() => {
                         show = false;
                         wizard.start(ChangeOrganizationTierCloud);
-                    }}>Upgrade plan</Button>
+                        trackEvent('click_organization_upgrade', {
+                            from: 'button',
+                            source: 'limit_reached_modal'
+                        });
+                    }}>
+                    Upgrade plan
+                </Button>
             </div>
         </div>
     </svelte:fragment>
diff --git a/src/routes/console/organization-[organization]/members/+page.svelte b/src/routes/console/organization-[organization]/members/+page.svelte
index 8497dac36..e7e121f98 100644
--- a/src/routes/console/organization-[organization]/members/+page.svelte
+++ b/src/routes/console/organization-[organization]/members/+page.svelte
@@ -70,7 +70,10 @@
                 <TableCellHead width={90} />
                 <TableCellHead width={30} />
             </TableHeader>
-            <TableBody service="members" total={data.organizationMembers.total}>
+            <TableBody
+                service="members"
+                total={data.organizationMembers.total}
+                event="members_list">
                 {#each data.organizationMembers.memberships as member}
                     <TableRow>
                         <TableCell title="Name">