diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index 3d4874084..adab81b44 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -139,8 +139,11 @@ export function isTrackingAllowed() {
 }
 
 export enum Click {
+    BackupRestoreClick = 'click_backup_restore',
     BreadcrumbClick = 'click_breadcrumb',
     ConnectRepositoryClick = 'click_connect_repository',
+    CreditsRedeemClick = 'click_credits_redeem',
+    CloudSignupClick = 'click_cloud_signup',
     DatabaseAttributeDelete = 'click_attribute_delete',
     DatabaseIndexDelete = 'click_index_delete',
     DatabaseCollectionDelete = 'click_collection_delete',
@@ -154,10 +157,12 @@ export enum Click {
     FunctionsDeploymentDeleteClick = 'click_deployment_delete',
     KeyCreateClick = 'click_key_create',
     MenuDropDownClick = 'click_menu_dropdown',
+    MenuOverviewClick = 'click_menu_overview',
     ModalCloseClick = 'click_close_modal',
     MessagingScheduleClick = 'click_messaging_schedule',
     MessagingTopicCreateClick = 'click_messaging_topic_create',
     MessagingTargetCreateClick = 'click_messaging_target_create',
+    MembershipDeleteClick = 'click_delete_membership',
     PlatformCreateClick = 'click_platform_create',
     OrganizationClickCreate = 'click_create_organization',
     OrganizationClickUpgrade = 'click_organization_upgrade',
@@ -175,12 +180,15 @@ export enum Click {
     SettingsWebhookDeleteClick = 'click_webhook_delete',
     SettingsInstallProviderClick = 'click_install_provider',
     SettingsStartMigrationClick = 'click_start_migration',
+    SubmitFormClick = 'click_submit_form',
     ShowCustomIdClick = 'click_show_custom_id',
     SupportOpenClick = 'click_open_support_menu',
     PromoClick = 'click_promo',
+    PolicyDeleteClick = 'click_policy_delete',
     VariablesCreateClick = 'click_variable_create',
     VariablesUpdateClick = 'click_variable_update',
-    VariablesImportClick = 'click_variable_import'
+    VariablesImportClick = 'click_variable_import',
+    WebsiteOpenClick = 'click_open_website'
 }
 
 export enum Submit {
@@ -352,7 +360,6 @@ export enum Submit {
     OrganizationUpgrade = 'submit_organization_upgrade',
     OrganizationDowngrade = 'submit_organization_downgrade',
     OrganizationBillingTaxIdUpdate = 'submit_organization_billing_tax_id_update',
-
     SupportTicket = 'submit_support_ticket',
     InstallationCreate = 'submit_installation_create',
     InstallationDelete = 'submit_installation_delete',
diff --git a/src/lib/components/billing/alerts/newDevUpgradePro.svelte b/src/lib/components/billing/alerts/newDevUpgradePro.svelte
index c58ad7268..91cdc8267 100644
--- a/src/lib/components/billing/alerts/newDevUpgradePro.svelte
+++ b/src/lib/components/billing/alerts/newDevUpgradePro.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { base } from '$app/paths';
     import { page } from '$app/stores';
-    import { trackEvent } from '$lib/actions/analytics';
+    import { Click, trackEvent } from '$lib/actions/analytics';
     import { BillingPlan } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { organization } from '$lib/stores/organization';
@@ -31,7 +31,7 @@
                 class="u-line-height-1"
                 href={`${base}/apply-credit?code=appw50&org=${$organization.$id}`}
                 on:click={() => {
-                    trackEvent('click_credits_redeem', {
+                    trackEvent(Click.CreditsRedeemClick, {
                         from: 'button',
                         source: 'cloud_credits_banner',
                         campaign: 'WelcomeManual'
diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index ebb4da472..17bc9bb00 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -4,7 +4,7 @@
     import { disableCommands } from '$lib/commandCenter';
     import { beforeNavigate } from '$app/navigation';
     import { Layout, Modal } from '@appwrite.io/pink-svelte';
-    import { trackEvent } from '$lib/actions/analytics';
+    import { Click, trackEvent } from '$lib/actions/analytics';
 
     export let show = false;
     export let error: string = null;
@@ -28,7 +28,7 @@
             event.preventDefault();
             if (show) {
                 formComponent.triggerSubmit();
-                trackEvent('click_submit_form', { from: 'enter' });
+                trackEvent(Click.SubmitFormClick, { from: 'enter' });
             }
         }
     }
diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte
index 057563fa1..0c9b638b8 100644
--- a/src/lib/components/navbar.svelte
+++ b/src/lib/components/navbar.svelte
@@ -154,7 +154,7 @@
                         variant="compact"
                         on:click={() => {
                             toggleFeedback();
-                            trackEvent('click_menu_feedback', { source: 'top_nav' });
+                            trackEvent(Click.FeedbackSubmitClick, { source: 'top_nav' });
                         }}
                         >Feedback
                     </Button.Button>
@@ -200,7 +200,7 @@
                     showAccountMenu = !showAccountMenu;
                     shouldAnimateThemeToggle = false;
                     if (showAccountMenu) {
-                        trackEvent('click_menu_dropdown');
+                        trackEvent(Click.MenuDropDownClick);
                     }
                 }}>
                 <div style:user-select="none">
diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte
index 78f5681f3..e3822ad3f 100644
--- a/src/lib/components/sidebar.svelte
+++ b/src/lib/components/sidebar.svelte
@@ -140,7 +140,7 @@
                             class="link"
                             class:active={pathname.includes('overview')}
                             on:click={() => {
-                                trackEvent('click_menu_overview');
+                                trackEvent(Click.MenuOverviewClick);
                                 sideBarIsOpen = false;
                             }}
                             ><span class="link-icon"
@@ -244,7 +244,7 @@
                                 size="s"
                                 on:click={() => {
                                     toggleFeedback();
-                                    trackEvent('click_menu_feedback', { source: 'side_nav' });
+                                    trackEvent(Click.FeedbackSubmitClick, { source: 'side_nav' });
                                 }}
                                 >Feedback
                             </Button.Button>
diff --git a/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte b/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
index 538bd9646..6cdf7fc42 100644
--- a/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
+++ b/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+    import { Click, Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { CardGrid } from '$lib/components';
     import { InputPhone, InputOTP } from '$lib/elements/forms';
     import { Button, Form } from '$lib/elements/forms';
@@ -136,7 +136,7 @@
                             external={isSelfHosted}
                             href={isCloud ? $upgradeURL : 'https://cloud.appwrite.io/register'}
                             on:click={() => {
-                                trackEvent('click_cloud_signup', {
+                                trackEvent(Click.CloudSignupClick, {
                                     from: 'button',
                                     source
                                 });
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte
index e889289c9..d55231b0c 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte
@@ -11,7 +11,7 @@
     import CreateMember from '../createMembership.svelte';
     import DeleteMembership from '../deleteMembership.svelte';
     import { Dependencies } from '$lib/constants';
-    import { trackEvent } from '$lib/actions/analytics';
+    import { Click, trackEvent } from '$lib/actions/analytics';
     import { Table, Layout, Icon } from '@appwrite.io/pink-svelte';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
 
@@ -66,7 +66,7 @@
                             on:click|preventDefault={() => {
                                 selectedMembership = membership;
                                 showDelete = true;
-                                trackEvent('click_delete_membership');
+                                trackEvent(Click.MembershipDeleteClick);
                             }}>
                             <span class="icon-trash" aria-hidden="true" />
                         </button>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte
index ad7224c2c..9feb4a792 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte
@@ -15,7 +15,7 @@
     import EmptyLight from '$lib/images/backups/backups-light.png';
     import type { BackupPolicy, BackupPolicyList } from '$lib/sdk/backups';
     import { backupFrequencies } from '$lib/helpers/backups';
-    import { trackEvent } from '$lib/actions/analytics';
+    import { Click, trackEvent } from '$lib/actions/analytics';
     import { Icon, Tooltip } from '@appwrite.io/pink-svelte';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
 
@@ -168,7 +168,7 @@
                                             showDelete = true;
                                             selectedPolicy = policy;
                                             showDropdown[index] = false;
-                                            trackEvent('click_policy_delete');
+                                            trackEvent(Click.PolicyDeleteClick);
                                         }}>
                                         Delete
                                     </DropListItem>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte
index 7217b7f65..7f6ef65bb 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte
@@ -22,7 +22,7 @@
     import { ID } from '@appwrite.io/console';
     import { database } from '../store';
     import type { BackupArchive } from '$lib/sdk/backups';
-    import { trackEvent } from '$lib/actions/analytics';
+    import { Click, trackEvent } from '$lib/actions/analytics';
     import { copy } from '$lib/helpers/copy';
     import { LabelCard } from '$lib/components/index.js';
     import { Dependencies } from '$lib/constants';
@@ -219,7 +219,7 @@
                                         showRestore = true;
                                         selectedBackup = backup;
                                         showDropdown[index] = false;
-                                        trackEvent('click_backup_restore');
+                                        trackEvent(Click.BackupRestoreClick);
                                     }}>
                                     Restore
                                 </DropListItem>
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
index b7ee9166e..0b1820c6d 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
@@ -20,7 +20,7 @@
     import { invalidate } from '$app/navigation';
     import { Alert } from '$lib/components';
     import { Button } from '$lib/elements/forms';
-    import { trackEvent } from '$lib/actions/analytics';
+    import { Click, trackEvent } from '$lib/actions/analytics';
     import { Typography } from '@appwrite.io/pink-svelte';
 
     export let data;
@@ -62,7 +62,7 @@
             <svelte:fragment slot="buttons">
                 <Button
                     on:click={() =>
-                        trackEvent('click_open_website', {
+                        trackEvent(Click.WebsiteOpenClick, {
                             from: 'button',
                             source: 'function_keys_card',
                             destination: 'docs'