diff --git a/packages/constants/src/event-tracker/core.ts b/packages/constants/src/event-tracker/core.ts
index bbb1319ffbf..345567219d0 100644
--- a/packages/constants/src/event-tracker/core.ts
+++ b/packages/constants/src/event-tracker/core.ts
@@ -12,16 +12,6 @@ export type EventProps = {
   path?: string;
 };
 
-export const getWorkspaceEventPayload = (payload: any) => ({
-  workspace_id: payload.id,
-  created_at: payload.created_at,
-  updated_at: payload.updated_at,
-  organization_size: payload.organization_size,
-  first_time: payload.first_time,
-  state: payload.state,
-  element: payload.element,
-});
-
 export const getProjectEventPayload = (payload: any) => ({
   workspace_id: payload.workspace_id,
   project_id: payload.id,
@@ -35,20 +25,6 @@ export const getProjectEventPayload = (payload: any) => ({
   element: payload.element,
 });
 
-export const getCycleEventPayload = (payload: any) => ({
-  workspace_id: payload.workspace_id,
-  project_id: payload.project,
-  cycle_id: payload.id,
-  created_at: payload.created_at,
-  updated_at: payload.updated_at,
-  start_date: payload.start_date,
-  target_date: payload.target_date,
-  cycle_status: payload.status,
-  changed_properties: payload.changed_properties,
-  state: payload.state,
-  element: payload.element,
-});
-
 export const getModuleEventPayload = (payload: any) => ({
   workspace_id: payload.workspace_id,
   project_id: payload.project,
@@ -147,16 +123,6 @@ export const GITHUB_REDIRECTED_TRACKER_EVENT = "github_redirected";
 // Groups
 export const GROUP_WORKSPACE_TRACKER_EVENT = "workspace_metrics";
 
-export const TRACKING_ELEMENTS = {
-  RIGHT_HEADER_BUTTON: "right_header_button",
-  EMPTY_STATE_BUTTON: "empty_state_button",
-  COMMAND_PALETTE_ITEM: "command_palette_item",
-  RIGHT_SIDEBAR: "right_sidebar",
-  QUICK_ACTIONS: "quick_actions",
-  CONTEXT_MENU: "context_menu",
-} as const;
-export type TTrackingElement = (typeof TRACKING_ELEMENTS)[keyof typeof TRACKING_ELEMENTS];
-
 export const WORKSPACE_TRACKER_EVENTS = {
   create: "workspace_created",
   update: "workspace_updated",
@@ -175,7 +141,18 @@ export const CYCLE_TRACKER_EVENTS = {
   delete: "cycle_deleted",
   favorite: "cycle_favorited",
   unfavorite: "cycle_unfavorited",
-};
+  archive: "cycle_archived",
+  restore: "cycle_restored",
+};
+export const CYCLE_TRACKER_ELEMENTS = {
+  RIGHT_HEADER_ADD_BUTTON: "right_header_add_cycle_button",
+  EMPTY_STATE_ADD_BUTTON: "empty_state_add_cycle_button",
+  COMMAND_PALETTE_ADD_ITEM: "command_palette_add_cycle_item",
+  RIGHT_SIDEBAR: "cycle_right_sidebar",
+  QUICK_ACTIONS: "cycle_quick_actions",
+  CONTEXT_MENU: "cycle_context_menu",
+  LIST_ITEM: "cycle_list_item",
+} as const;
 
 export const MODULE_TRACKER_EVENTS = {
   create: "module_created",
diff --git a/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/header.tsx b/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/header.tsx
index 41dfde747cf..fe950378765 100644
--- a/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/header.tsx
+++ b/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/header.tsx
@@ -4,13 +4,13 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // ui
-import { EProjectFeatureKey, EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
+import { EProjectFeatureKey, EUserPermissions, EUserPermissionsLevel, CYCLE_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 import { Breadcrumbs, Button, Header } from "@plane/ui";
 // components
 import { CyclesViewHeader } from "@/components/cycles";
 // hooks
-import { useCommandPalette, useEventTracker, useProject, useUserPermissions } from "@/hooks/store";
+import { useCommandPalette, useProject, useUserPermissions } from "@/hooks/store";
 import { useAppRouter } from "@/hooks/use-app-router";
 // plane web
 import { CommonProjectBreadcrumbs } from "@/plane-web/components/breadcrumbs/common";
@@ -23,7 +23,6 @@ export const CyclesListHeader: FC = observer(() => {
 
   // store hooks
   const { toggleCreateCycleModal } = useCommandPalette();
-  const { setTrackElement } = useEventTracker();
   const { allowPermissions } = useUserPermissions();
   const { currentProjectDetails, loader } = useProject();
   const { t } = useTranslation();
@@ -51,8 +50,8 @@ export const CyclesListHeader: FC = observer(() => {
           <Button
             variant="primary"
             size="sm"
+            data-ph-element={CYCLE_TRACKER_ELEMENTS.RIGHT_HEADER_ADD_BUTTON}
             onClick={() => {
-              setTrackElement("Cycles page");
               toggleCreateCycleModal(true);
             }}
           >
diff --git a/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/page.tsx b/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/page.tsx
index edb4e1bcf1c..8af43dd8709 100644
--- a/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/page.tsx
+++ b/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/page.tsx
@@ -4,7 +4,7 @@ import { useState } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // plane imports
-import { EUserPermissionsLevel, EUserProjectRoles } from "@plane/constants";
+import { EUserPermissionsLevel, EUserProjectRoles, CYCLE_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 import { TCycleFilters } from "@plane/types";
 // components
@@ -16,7 +16,7 @@ import { ComicBoxButton, DetailedEmptyState } from "@/components/empty-state";
 import { CycleModuleListLayout } from "@/components/ui";
 // helpers
 // hooks
-import { useEventTracker, useCycle, useProject, useCycleFilter, useUserPermissions } from "@/hooks/store";
+import { useCycle, useProject, useCycleFilter, useUserPermissions } from "@/hooks/store";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 
@@ -24,7 +24,6 @@ const ProjectCyclesPage = observer(() => {
   // states
   const [createModal, setCreateModal] = useState(false);
   // store hooks
-  const { setTrackElement } = useEventTracker();
   const { currentProjectCycleIds, loader } = useCycle();
   const { getProjectById, currentProjectDetails } = useProject();
   // router
@@ -100,8 +99,8 @@ const ProjectCyclesPage = observer(() => {
                   label={t("project_cycles.empty_state.general.primary_button.text")}
                   title={t("project_cycles.empty_state.general.primary_button.comic.title")}
                   description={t("project_cycles.empty_state.general.primary_button.comic.description")}
+                  data-ph-element={CYCLE_TRACKER_ELEMENTS.EMPTY_STATE_ADD_BUTTON}
                   onClick={() => {
-                    setTrackElement("Cycle empty state");
                     setCreateModal(true);
                   }}
                   disabled={!hasMemberLevelPermission}
diff --git a/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/header.tsx b/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/header.tsx
index 89a11d5c008..aded9e3619c 100644
--- a/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/header.tsx
+++ b/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/header.tsx
@@ -55,7 +55,6 @@ export const ModulesListHeader: React.FC = observer(() => {
           <Button
             variant="primary"
             size="sm"
-            data-ph-element="RIGHT_HEADER_BUTTON"
             onClick={() => {
               setTrackElement("Modules page");
               toggleCreateModuleModal(true);
diff --git a/web/ce/helpers/command-palette.ts b/web/ce/helpers/command-palette.ts
index 28576735f72..c95ef846250 100644
--- a/web/ce/helpers/command-palette.ts
+++ b/web/ce/helpers/command-palette.ts
@@ -1,6 +1,8 @@
 // types
+import { CYCLE_TRACKER_ELEMENTS } from "@plane/constants";
 import { TCommandPaletteActionList, TCommandPaletteShortcut, TCommandPaletteShortcutList } from "@plane/types";
 // store
+import { captureClick } from "@/helpers/event-tracker.helper";
 import { store } from "@/lib/store-context";
 
 export const getGlobalShortcutsList: () => TCommandPaletteActionList = () => {
@@ -50,7 +52,10 @@ export const getProjectShortcutsList: () => TCommandPaletteActionList = () => {
     q: {
       title: "Create a new cycle",
       description: "Create a new cycle in the current project",
-      action: () => toggleCreateCycleModal(true),
+      action: () => {
+        toggleCreateCycleModal(true);
+        captureClick({ elementName: CYCLE_TRACKER_ELEMENTS.COMMAND_PALETTE_ADD_ITEM });
+      },
     },
     v: {
       title: "Create a new view",
diff --git a/web/core/components/command-palette/actions/project-actions.tsx b/web/core/components/command-palette/actions/project-actions.tsx
index 7666fd0a805..fd48978474b 100644
--- a/web/core/components/command-palette/actions/project-actions.tsx
+++ b/web/core/components/command-palette/actions/project-actions.tsx
@@ -3,8 +3,9 @@
 import { Command } from "cmdk";
 import { ContrastIcon, FileText, Layers } from "lucide-react";
 // hooks
+import { CYCLE_TRACKER_ELEMENTS } from "@plane/constants";
 import { DiceIcon } from "@plane/ui";
-import { useCommandPalette, useEventTracker } from "@/hooks/store";
+import { useCommandPalette } from "@/hooks/store";
 // ui
 
 type Props = {
@@ -16,15 +17,14 @@ export const CommandPaletteProjectActions: React.FC<Props> = (props) => {
   // store hooks
   const { toggleCreateCycleModal, toggleCreateModuleModal, toggleCreatePageModal, toggleCreateViewModal } =
     useCommandPalette();
-  const { setTrackElement } = useEventTracker();
 
   return (
     <>
       <Command.Group heading="Cycle">
         <Command.Item
+          data-ph-element={CYCLE_TRACKER_ELEMENTS.COMMAND_PALETTE_ADD_ITEM}
           onSelect={() => {
             closePalette();
-            setTrackElement("Command palette");
             toggleCreateCycleModal(true);
           }}
           className="focus:outline-none"
@@ -40,7 +40,6 @@ export const CommandPaletteProjectActions: React.FC<Props> = (props) => {
         <Command.Item
           onSelect={() => {
             closePalette();
-            setTrackElement("Command palette");
             toggleCreateModuleModal(true);
           }}
           className="focus:outline-none"
@@ -56,7 +55,6 @@ export const CommandPaletteProjectActions: React.FC<Props> = (props) => {
         <Command.Item
           onSelect={() => {
             closePalette();
-            setTrackElement("Command palette");
             toggleCreateViewModal(true);
           }}
           className="focus:outline-none"
@@ -72,7 +70,6 @@ export const CommandPaletteProjectActions: React.FC<Props> = (props) => {
         <Command.Item
           onSelect={() => {
             closePalette();
-            setTrackElement("Command palette");
             toggleCreatePageModal({ isOpen: true });
           }}
           className="focus:outline-none"
diff --git a/web/core/components/cycles/analytics-sidebar/sidebar-header.tsx b/web/core/components/cycles/analytics-sidebar/sidebar-header.tsx
index bad6335167a..1fa7c26e0db 100644
--- a/web/core/components/cycles/analytics-sidebar/sidebar-header.tsx
+++ b/web/core/components/cycles/analytics-sidebar/sidebar-header.tsx
@@ -1,11 +1,17 @@
 "use client";
 
-import React, { FC, useEffect, useState } from "react";
+import React, { FC, useEffect } from "react";
 import { observer } from "mobx-react";
 import { Controller, useForm } from "react-hook-form";
 import { ArrowRight, ChevronRight } from "lucide-react";
 // Plane Imports
-import { CYCLE_TRACKER_EVENTS, CYCLE_STATUS, EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
+import {
+  CYCLE_TRACKER_EVENTS,
+  CYCLE_STATUS,
+  EUserPermissions,
+  EUserPermissionsLevel,
+  CYCLE_TRACKER_ELEMENTS,
+} from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 import { ICycle } from "@plane/types";
 import { setToast, TOAST_TYPE } from "@plane/ui";
@@ -13,13 +19,11 @@ import { getDate, renderFormattedPayloadDate } from "@plane/utils";
 // components
 import { DateRangeDropdown } from "@/components/dropdowns";
 // hooks
-import { useCycle, useEventTracker, useUserPermissions } from "@/hooks/store";
+import { captureElementAndEvent } from "@/helpers/event-tracker.helper";
+import { useCycle, useUserPermissions } from "@/hooks/store";
 import { useTimeZoneConverter } from "@/hooks/use-timezone-converter";
 // services
 import { CycleService } from "@/services/cycle.service";
-// local imports
-import { ArchiveCycleModal } from "../archived-cycles";
-import { CycleDeleteModal } from "../delete-modal";
 
 type Props = {
   workspaceSlug: string;
@@ -38,13 +42,9 @@ const cycleService = new CycleService();
 
 export const CycleSidebarHeader: FC<Props> = observer((props) => {
   const { workspaceSlug, projectId, cycleDetails, handleClose, isArchived = false } = props;
-  // states
-  const [archiveCycleModal, setArchiveCycleModal] = useState(false);
-  const [cycleDeleteModal, setCycleDeleteModal] = useState(false);
   // hooks
   const { allowPermissions } = useUserPermissions();
   const { updateCycleDetails } = useCycle();
-  const { captureCycleEvent } = useEventTracker();
   const { t } = useTranslation();
   const { renderFormattedDateInUserTimezone, getProjectUTCOffset } = useTimeZoneConverter(projectId);
 
@@ -61,29 +61,36 @@ export const CycleSidebarHeader: FC<Props> = observer((props) => {
 
   const currentCycle = CYCLE_STATUS.find((status) => status.value === cycleStatus);
 
-  const submitChanges = async (data: Partial<ICycle>, changedProperty: string) => {
+  const submitChanges = async (data: Partial<ICycle>) => {
     if (!workspaceSlug || !projectId || !cycleDetails.id) return;
 
     await updateCycleDetails(workspaceSlug.toString(), projectId.toString(), cycleDetails.id.toString(), data)
-      .then((res) => {
-        captureCycleEvent({
-          eventName: CYCLE_TRACKER_EVENTS.update,
-          payload: {
-            ...res,
-            changed_properties: [changedProperty],
-            element: "Right side-peek",
+      .then(() => {
+        captureElementAndEvent({
+          element: {
+            elementName: CYCLE_TRACKER_ELEMENTS.RIGHT_SIDEBAR,
+          },
+          event: {
+            eventName: CYCLE_TRACKER_EVENTS.update,
             state: "SUCCESS",
+            payload: {
+              id: cycleDetails.id,
+            },
           },
         });
       })
 
       .catch(() => {
-        captureCycleEvent({
-          eventName: CYCLE_TRACKER_EVENTS.update,
-          payload: {
-            ...data,
-            element: "Right side-peek",
-            state: "FAILED",
+        captureElementAndEvent({
+          element: {
+            elementName: CYCLE_TRACKER_ELEMENTS.RIGHT_SIDEBAR,
+          },
+          event: {
+            eventName: CYCLE_TRACKER_EVENTS.update,
+            state: "ERROR",
+            payload: {
+              id: cycleDetails.id,
+            },
           },
         });
       });
@@ -122,7 +129,7 @@ export const CycleSidebarHeader: FC<Props> = observer((props) => {
       isDateValid = true;
     }
     if (isDateValid) {
-      submitChanges(payload, "date_range");
+      submitChanges(payload);
       setToast({
         type: TOAST_TYPE.SUCCESS,
         title: t("project_cycles.action.update.success.title"),
@@ -145,24 +152,6 @@ export const CycleSidebarHeader: FC<Props> = observer((props) => {
 
   return (
     <>
-      {cycleDetails && workspaceSlug && projectId && (
-        <>
-          <ArchiveCycleModal
-            workspaceSlug={workspaceSlug.toString()}
-            projectId={projectId.toString()}
-            cycleId={cycleDetails.id}
-            isOpen={archiveCycleModal}
-            handleClose={() => setArchiveCycleModal(false)}
-          />
-          <CycleDeleteModal
-            cycle={cycleDetails}
-            isOpen={cycleDeleteModal}
-            handleClose={() => setCycleDeleteModal(false)}
-            workspaceSlug={workspaceSlug.toString()}
-            projectId={projectId.toString()}
-          />
-        </>
-      )}
       <div className="sticky z-10 top-0 pt-2 flex items-center justify-between bg-custom-sidebar-background-100">
         <div className="flex items-center justify-center size-5">
           <button
diff --git a/web/core/components/cycles/archived-cycles/modal.tsx b/web/core/components/cycles/archived-cycles/modal.tsx
index 32c9bbe4f80..2832efa2c78 100644
--- a/web/core/components/cycles/archived-cycles/modal.tsx
+++ b/web/core/components/cycles/archived-cycles/modal.tsx
@@ -3,8 +3,10 @@
 import { useState, Fragment } from "react";
 import { Dialog, Transition } from "@headlessui/react";
 // ui
+import { CYCLE_TRACKER_EVENTS } from "@plane/constants";
 import { Button, TOAST_TYPE, setToast } from "@plane/ui";
 // hooks
+import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
 import { useCycle } from "@/hooks/store";
 import { useAppRouter } from "@/hooks/use-app-router";
 
@@ -42,16 +44,28 @@ export const ArchiveCycleModal: React.FC<Props> = (props) => {
           title: "Archive success",
           message: "Your archives can be found in project archives.",
         });
+        captureSuccess({
+          eventName: CYCLE_TRACKER_EVENTS.archive,
+          payload: {
+            id: cycleId,
+          },
+        });
         onClose();
         router.push(`/${workspaceSlug}/projects/${projectId}/cycles`);
       })
-      .catch(() =>
+      .catch(() => {
         setToast({
           type: TOAST_TYPE.ERROR,
           title: "Error!",
           message: "Cycle could not be archived. Please try again.",
-        })
-      )
+        });
+        captureError({
+          eventName: CYCLE_TRACKER_EVENTS.archive,
+          payload: {
+            id: cycleId,
+          },
+        });
+      })
       .finally(() => setIsArchiving(false));
   };
 
diff --git a/web/core/components/cycles/delete-modal.tsx b/web/core/components/cycles/delete-modal.tsx
index f48733f7569..9ace4e3738a 100644
--- a/web/core/components/cycles/delete-modal.tsx
+++ b/web/core/components/cycles/delete-modal.tsx
@@ -9,9 +9,10 @@ import { useTranslation } from "@plane/i18n";
 import { ICycle } from "@plane/types";
 // ui
 import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
-// constants
+// helpers
+import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
 // hooks
-import { useEventTracker, useCycle } from "@/hooks/store";
+import { useCycle } from "@/hooks/store";
 import { useAppRouter } from "@/hooks/use-app-router";
 
 interface ICycleDelete {
@@ -27,7 +28,6 @@ export const CycleDeleteModal: React.FC<ICycleDelete> = observer((props) => {
   // states
   const [loader, setLoader] = useState(false);
   // store hooks
-  const { captureCycleEvent } = useEventTracker();
   const { deleteCycle } = useCycle();
   const { t } = useTranslation();
   // router
@@ -49,9 +49,11 @@ export const CycleDeleteModal: React.FC<ICycleDelete> = observer((props) => {
             title: "Success!",
             message: "Cycle deleted successfully.",
           });
-          captureCycleEvent({
+          captureSuccess({
             eventName: CYCLE_TRACKER_EVENTS.delete,
-            payload: { ...cycle, state: "SUCCESS" },
+            payload: {
+              id: cycle.id,
+            },
           });
         })
         .catch((errors) => {
@@ -64,13 +66,16 @@ export const CycleDeleteModal: React.FC<ICycleDelete> = observer((props) => {
             type: TOAST_TYPE.ERROR,
             message: currentError.i18n_message && t(currentError.i18n_message),
           });
-          captureCycleEvent({
+          captureError({
             eventName: CYCLE_TRACKER_EVENTS.delete,
-            payload: { ...cycle, state: "FAILED" },
+            payload: {
+              id: cycle.id,
+            },
+            error: errors,
           });
         })
         .finally(() => handleClose());
-    } catch (error) {
+    } catch {
       setToast({
         type: TOAST_TYPE.ERROR,
         title: "Warning!",
diff --git a/web/core/components/cycles/form.tsx b/web/core/components/cycles/form.tsx
index 3c3c98575b2..bf98a38a647 100644
--- a/web/core/components/cycles/form.tsx
+++ b/web/core/components/cycles/form.tsx
@@ -16,7 +16,7 @@ import { DateRangeDropdown, ProjectDropdown } from "@/components/dropdowns";
 import { useUser } from "@/hooks/store/user/user-user";
 
 type Props = {
-  handleFormSubmit: (values: Partial<ICycle>, dirtyFields: any) => Promise<void>;
+  handleFormSubmit: (values: Partial<ICycle>) => Promise<void>;
   handleClose: () => void;
   status: boolean;
   projectId: string;
@@ -40,7 +40,7 @@ export const CycleForm: React.FC<Props> = (props) => {
   const { projectsWithCreatePermissions } = useUser();
   // form data
   const {
-    formState: { errors, isSubmitting, dirtyFields },
+    formState: { errors, isSubmitting },
     handleSubmit,
     control,
     reset,
@@ -64,7 +64,7 @@ export const CycleForm: React.FC<Props> = (props) => {
   }, [data, reset]);
 
   return (
-    <form onSubmit={handleSubmit((formData) => handleFormSubmit(formData, dirtyFields))}>
+    <form onSubmit={handleSubmit((formData) => handleFormSubmit(formData))}>
       <div className="space-y-5 p-5">
         <div className="flex items-center gap-x-3">
           {!status && (
diff --git a/web/core/components/cycles/list/cycle-list-item-action.tsx b/web/core/components/cycles/list/cycle-list-item-action.tsx
index c5978ebd397..9f7940597bd 100644
--- a/web/core/components/cycles/list/cycle-list-item-action.tsx
+++ b/web/core/components/cycles/list/cycle-list-item-action.tsx
@@ -6,7 +6,13 @@ import { useParams, usePathname, useSearchParams } from "next/navigation";
 import { useForm } from "react-hook-form";
 import { Eye, Users, ArrowRight, CalendarDays } from "lucide-react";
 // types
-import { CYCLE_TRACKER_EVENTS, EUserPermissions, EUserPermissionsLevel, IS_FAVORITE_MENU_OPEN } from "@plane/constants";
+import {
+  CYCLE_TRACKER_EVENTS,
+  EUserPermissions,
+  EUserPermissionsLevel,
+  IS_FAVORITE_MENU_OPEN,
+  CYCLE_TRACKER_ELEMENTS,
+} from "@plane/constants";
 import { useLocalStorage } from "@plane/hooks";
 import { useTranslation } from "@plane/i18n";
 import { ICycle, TCycleGroups } from "@plane/types";
@@ -19,7 +25,8 @@ import { DateRangeDropdown } from "@/components/dropdowns";
 import { ButtonAvatars } from "@/components/dropdowns/member/avatar";
 import { MergedDateDisplay } from "@/components/dropdowns/merged-date";
 // hooks
-import { useCycle, useEventTracker, useMember, useUserPermissions } from "@/hooks/store";
+import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
+import { useCycle, useMember, useUserPermissions } from "@/hooks/store";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 import { useTimeZoneConverter } from "@/hooks/use-timezone-converter";
@@ -57,7 +64,6 @@ export const CycleListItemAction: FC<Props> = observer((props) => {
   const pathname = usePathname();
   // store hooks
   const { addCycleToFavorites, removeCycleFromFavorites } = useCycle();
-  const { captureEvent } = useEventTracker();
   const { allowPermissions } = useUserPermissions();
 
   // local storage
@@ -98,16 +104,25 @@ export const CycleListItemAction: FC<Props> = observer((props) => {
     e.preventDefault();
     if (!workspaceSlug || !projectId) return;
 
-    const addToFavoritePromise = addCycleToFavorites(workspaceSlug?.toString(), projectId.toString(), cycleId).then(
-      () => {
+    const addToFavoritePromise = addCycleToFavorites(workspaceSlug?.toString(), projectId.toString(), cycleId)
+      .then(() => {
         if (!isFavoriteMenuOpen) toggleFavoriteMenu(true);
-        captureEvent(CYCLE_TRACKER_EVENTS.favorite, {
-          cycle_id: cycleId,
-          element: "List layout",
-          state: "SUCCESS",
+        captureSuccess({
+          eventName: CYCLE_TRACKER_EVENTS.favorite,
+          payload: {
+            id: cycleId,
+          },
         });
-      }
-    );
+      })
+      .catch((error) => {
+        captureError({
+          eventName: CYCLE_TRACKER_EVENTS.favorite,
+          payload: {
+            id: cycleId,
+          },
+          error,
+        });
+      });
 
     setPromiseToast(addToFavoritePromise, {
       loading: t("project_cycles.action.favorite.loading"),
@@ -126,17 +141,24 @@ export const CycleListItemAction: FC<Props> = observer((props) => {
     e.preventDefault();
     if (!workspaceSlug || !projectId) return;
 
-    const removeFromFavoritePromise = removeCycleFromFavorites(
-      workspaceSlug?.toString(),
-      projectId.toString(),
-      cycleId
-    ).then(() => {
-      captureEvent(CYCLE_TRACKER_EVENTS.unfavorite, {
-        cycle_id: cycleId,
-        element: "List layout",
-        state: "SUCCESS",
+    const removeFromFavoritePromise = removeCycleFromFavorites(workspaceSlug?.toString(), projectId.toString(), cycleId)
+      .then(() => {
+        captureSuccess({
+          eventName: CYCLE_TRACKER_EVENTS.unfavorite,
+          payload: {
+            id: cycleId,
+          },
+        });
+      })
+      .catch((error) => {
+        captureError({
+          eventName: CYCLE_TRACKER_EVENTS.unfavorite,
+          payload: {
+            id: cycleId,
+          },
+          error,
+        });
       });
-    });
 
     setPromiseToast(removeFromFavoritePromise, {
       loading: t("project_cycles.action.unfavorite.loading"),
@@ -292,6 +314,7 @@ export const CycleListItemAction: FC<Props> = observer((props) => {
       )}
       {isEditingAllowed && !cycleDetails.archived_at && (
         <FavoriteStar
+          data-ph-element={CYCLE_TRACKER_ELEMENTS.LIST_ITEM}
           onClick={(e) => {
             e.preventDefault();
             e.stopPropagation();
diff --git a/web/core/components/cycles/modal.tsx b/web/core/components/cycles/modal.tsx
index 003eed531e5..559f18e4d0e 100644
--- a/web/core/components/cycles/modal.tsx
+++ b/web/core/components/cycles/modal.tsx
@@ -12,7 +12,8 @@ import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@p
 import { CycleForm } from "@/components/cycles";
 // constants
 // hooks
-import { useEventTracker, useCycle, useProject } from "@/hooks/store";
+import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
+import { useCycle, useProject } from "@/hooks/store";
 import useKeypress from "@/hooks/use-keypress";
 import useLocalStorage from "@/hooks/use-local-storage";
 import { usePlatformOS } from "@/hooks/use-platform-os";
@@ -35,7 +36,6 @@ export const CycleCreateUpdateModal: React.FC<CycleModalProps> = (props) => {
   // states
   const [activeProject, setActiveProject] = useState<string | null>(null);
   // store hooks
-  const { captureCycleEvent } = useEventTracker();
   const { workspaceProjectIds } = useProject();
   const { createCycle, updateCycleDetails } = useCycle();
   const { isMobile } = usePlatformOS();
@@ -63,9 +63,11 @@ export const CycleCreateUpdateModal: React.FC<CycleModalProps> = (props) => {
           title: "Success!",
           message: "Cycle created successfully.",
         });
-        captureCycleEvent({
+        captureSuccess({
           eventName: CYCLE_TRACKER_EVENTS.create,
-          payload: { ...res, state: "SUCCESS" },
+          payload: {
+            id: res.id,
+          },
         });
       })
       .catch((err) => {
@@ -74,23 +76,24 @@ export const CycleCreateUpdateModal: React.FC<CycleModalProps> = (props) => {
           title: "Error!",
           message: err?.detail ?? "Error in creating cycle. Please try again.",
         });
-        captureCycleEvent({
+        captureError({
           eventName: CYCLE_TRACKER_EVENTS.create,
-          payload: { ...payload, state: "FAILED" },
+          error: err,
         });
       });
   };
 
-  const handleUpdateCycle = async (cycleId: string, payload: Partial<ICycle>, dirtyFields: any) => {
+  const handleUpdateCycle = async (cycleId: string, payload: Partial<ICycle>) => {
     if (!workspaceSlug || !projectId) return;
 
     const selectedProjectId = payload.project_id ?? projectId.toString();
     await updateCycleDetails(workspaceSlug, selectedProjectId, cycleId, payload)
       .then((res) => {
-        const changed_properties = Object.keys(dirtyFields);
-        captureCycleEvent({
+        captureSuccess({
           eventName: CYCLE_TRACKER_EVENTS.update,
-          payload: { ...res, changed_properties: changed_properties, state: "SUCCESS" },
+          payload: {
+            id: res.id,
+          },
         });
         setToast({
           type: TOAST_TYPE.SUCCESS,
@@ -99,15 +102,15 @@ export const CycleCreateUpdateModal: React.FC<CycleModalProps> = (props) => {
         });
       })
       .catch((err) => {
-        captureCycleEvent({
-          eventName: CYCLE_TRACKER_EVENTS.update,
-          payload: { ...payload, state: "FAILED" },
-        });
         setToast({
           type: TOAST_TYPE.ERROR,
           title: "Error!",
           message: err?.detail ?? "Error in updating cycle. Please try again.",
         });
+        captureError({
+          eventName: CYCLE_TRACKER_EVENTS.update,
+          error: err,
+        });
       });
   };
 
@@ -121,7 +124,7 @@ export const CycleCreateUpdateModal: React.FC<CycleModalProps> = (props) => {
     return status;
   };
 
-  const handleFormSubmit = async (formData: Partial<ICycle>, dirtyFields: any) => {
+  const handleFormSubmit = async (formData: Partial<ICycle>) => {
     if (!workspaceSlug || !projectId) return;
 
     const payload: Partial<ICycle> = {
@@ -145,7 +148,7 @@ export const CycleCreateUpdateModal: React.FC<CycleModalProps> = (props) => {
     }
 
     if (isDateValid) {
-      if (data) await handleUpdateCycle(data.id, payload, dirtyFields);
+      if (data) await handleUpdateCycle(data.id, payload);
       else {
         await handleCreateCycle(payload).then(() => {
           setCycleTab("all");
diff --git a/web/core/components/cycles/quick-actions.tsx b/web/core/components/cycles/quick-actions.tsx
index bd971f6259e..5639939e5fc 100644
--- a/web/core/components/cycles/quick-actions.tsx
+++ b/web/core/components/cycles/quick-actions.tsx
@@ -6,7 +6,12 @@ import { observer } from "mobx-react";
 // icons
 import { ArchiveRestoreIcon, ExternalLink, LinkIcon, Pencil, Trash2 } from "lucide-react";
 // ui
-import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
+import {
+  CYCLE_TRACKER_EVENTS,
+  EUserPermissions,
+  EUserPermissionsLevel,
+  CYCLE_TRACKER_ELEMENTS,
+} from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 import { ArchiveIcon, ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
 import { copyUrlToClipboard, cn } from "@plane/utils";
@@ -14,7 +19,8 @@ import { copyUrlToClipboard, cn } from "@plane/utils";
 import { ArchiveCycleModal, CycleCreateUpdateModal, CycleDeleteModal } from "@/components/cycles";
 // helpers
 // hooks
-import { useCycle, useEventTracker, useUserPermissions } from "@/hooks/store";
+import { captureClick, captureError, captureSuccess } from "@/helpers/event-tracker.helper";
+import { useCycle, useUserPermissions } from "@/hooks/store";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { useEndCycle, EndCycleModal } from "@/plane-web/components/cycles";
 
@@ -35,7 +41,6 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
   const [archiveCycleModal, setArchiveCycleModal] = useState(false);
   const [deleteModal, setDeleteModal] = useState(false);
   // store hooks
-  const { setTrackElement } = useEventTracker();
   const { allowPermissions } = useUserPermissions();
   const { getCycleById, restoreCycle } = useCycle();
   const { t } = useTranslation();
@@ -69,7 +74,6 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
   const handleOpenInNewTab = () => window.open(`/${cycleLink}`, "_blank");
 
   const handleEditCycle = () => {
-    setTrackElement("Cycles page list layout");
     setUpdateModal(true);
   };
 
@@ -83,18 +87,29 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
           title: t("project_cycles.action.restore.success.title"),
           message: t("project_cycles.action.restore.success.description"),
         });
+        captureSuccess({
+          eventName: CYCLE_TRACKER_EVENTS.restore,
+          payload: {
+            id: cycleId,
+          },
+        });
         router.push(`/${workspaceSlug}/projects/${projectId}/archives/cycles`);
       })
-      .catch(() =>
+      .catch(() => {
         setToast({
           type: TOAST_TYPE.ERROR,
           title: t("project_cycles.action.restore.failed.title"),
           message: t("project_cycles.action.restore.failed.description"),
-        })
-      );
+        });
+        captureError({
+          eventName: CYCLE_TRACKER_EVENTS.restore,
+          payload: {
+            id: cycleId,
+          },
+        });
+      });
 
   const handleDeleteCycle = () => {
-    setTrackElement("Cycles page list layout");
     setDeleteModal(true);
   };
 
@@ -149,6 +164,16 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
 
   if (endCycleContextMenu) MENU_ITEMS.splice(3, 0, endCycleContextMenu);
 
+  const CONTEXT_MENU_ITEMS = MENU_ITEMS.map((item) => ({
+    ...item,
+    action: () => {
+      captureClick({
+        elementName: CYCLE_TRACKER_ELEMENTS.CONTEXT_MENU,
+      });
+      item.action();
+    },
+  }));
+
   return (
     <>
       {cycleDetails && (
@@ -187,7 +212,7 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
           )}
         </div>
       )}
-      <ContextMenu parentRef={parentRef} items={MENU_ITEMS} />
+      <ContextMenu parentRef={parentRef} items={CONTEXT_MENU_ITEMS} />
       <CustomMenu ellipsis placement="bottom-end" closeOnSelect maxHeight="lg" buttonClassName={customClassName}>
         {MENU_ITEMS.map((item) => {
           if (item.shouldRender === false) return null;
@@ -197,6 +222,9 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
               onClick={(e) => {
                 e.preventDefault();
                 e.stopPropagation();
+                captureClick({
+                  elementName: CYCLE_TRACKER_ELEMENTS.QUICK_ACTIONS,
+                });
                 item.action();
               }}
               className={cn(
diff --git a/web/core/lib/posthog-provider.tsx b/web/core/lib/posthog-provider.tsx
index 7e8bd47a1e7..490a83cb9b1 100644
--- a/web/core/lib/posthog-provider.tsx
+++ b/web/core/lib/posthog-provider.tsx
@@ -7,7 +7,7 @@ import { useParams } from "next/navigation";
 import posthog from "posthog-js";
 import { PostHogProvider as PHProvider } from "posthog-js/react";
 // constants
-import { GROUP_WORKSPACE_TRACKER_EVENT, TTrackingElement } from "@plane/constants";
+import { GROUP_WORKSPACE_TRACKER_EVENT } from "@plane/constants";
 // helpers
 import { getUserRole } from "@plane/utils";
 // hooks
@@ -71,9 +71,13 @@ const PostHogProvider: FC<IPosthogWrapper> = observer((props) => {
   useEffect(() => {
     const clickHandler = (event: MouseEvent) => {
       const target = event.target as HTMLElement;
-      const element = target.getAttribute("data-ph-element");
-      if (element) {
-        captureClick({ elementName: element as TTrackingElement });
+      // Use closest to find the nearest parent element with data-ph-element attribute
+      const elementWithAttribute = target.closest("[data-ph-element]") as HTMLElement;
+      if (elementWithAttribute) {
+        const element = elementWithAttribute.getAttribute("data-ph-element");
+        if (element) {
+          captureClick({ elementName: element });
+        }
       }
     };
 
diff --git a/web/core/store/event-tracker.store.ts b/web/core/store/event-tracker.store.ts
index a72f12a026e..1f68c99cb55 100644
--- a/web/core/store/event-tracker.store.ts
+++ b/web/core/store/event-tracker.store.ts
@@ -5,7 +5,6 @@ import {
   GROUP_WORKSPACE_TRACKER_EVENT,
   EventProps,
   IssueEventProps,
-  getCycleEventPayload,
   getIssueEventPayload,
   getModuleEventPayload,
   getProjectEventPayload,
@@ -25,7 +24,6 @@ export interface ICoreEventTrackerStore {
   captureEvent: (eventName: string, payload?: any) => void;
   joinWorkspaceMetricGroup: (workspaceId?: string) => void;
   captureProjectEvent: (props: EventProps) => void;
-  captureCycleEvent: (props: EventProps) => void;
   captureModuleEvent: (props: EventProps) => void;
   capturePageEvent: (props: EventProps) => void;
   captureIssueEvent: (props: IssueEventProps) => void;
@@ -46,7 +44,6 @@ export abstract class CoreEventTrackerStore implements ICoreEventTrackerStore {
       setTrackElement: action,
       captureEvent: action,
       captureProjectEvent: action,
-      captureCycleEvent: action,
     });
     // store
     this.rootStore = _rootStore;
@@ -121,21 +118,6 @@ export abstract class CoreEventTrackerStore implements ICoreEventTrackerStore {
     this.setTrackElement(undefined);
   };
 
-  /**
-   * @description: Captures the cycle related events.
-   * @param {EventProps} props
-   */
-  captureCycleEvent = (props: EventProps) => {
-    const { eventName, payload } = props;
-    const eventPayload: any = getCycleEventPayload({
-      ...this.getRequiredProperties,
-      ...payload,
-      element: payload.element ?? this.trackElement,
-    });
-    posthog?.capture(eventName, eventPayload);
-    this.setTrackElement(undefined);
-  };
-
   /**
    * @description: Captures the module related events.
    * @param {EventProps} props
diff --git a/web/helpers/event-tracker.helper.ts b/web/helpers/event-tracker.helper.ts
index 175c6458a7a..08435ea90b5 100644
--- a/web/helpers/event-tracker.helper.ts
+++ b/web/helpers/event-tracker.helper.ts
@@ -1,13 +1,12 @@
 import posthog from "posthog-js";
-import { TTrackingElement } from "@plane/constants";
 
 export type TEventState = "SUCCESS" | "ERROR";
 export type TElementContext = Record<string, any>;
 export type TEventContext = Record<string, any>;
 export type TInteractionType = "clicked" | "viewed" | "hovered";
 
-type TTrackElementParams = {
-  elementName: TTrackingElement;
+type TCaptureElementParams = {
+  elementName: string;
   interaction_type: TInteractionType;
   context?: TElementContext;
 };
@@ -19,7 +18,7 @@ type TTrackElementParams = {
  * @param element - Generic UI element type
  * @param context - Context about where and why the interaction happened
  */
-const captureElement = (params: TTrackElementParams) => {
+const captureElement = (params: TCaptureElementParams) => {
   const { elementName, interaction_type, context } = params;
   if (!posthog) return;
 
@@ -34,43 +33,42 @@ const captureElement = (params: TTrackElementParams) => {
   posthog.capture(elementEvent, payload);
 };
 
-type TTrackClickParams = Omit<TTrackElementParams, "interaction_type">;
+type TCaptureClickParams = Omit<TCaptureElementParams, "interaction_type">;
 /**
  * Track click events
  * @param element - The element that was clicked
  * @param context - Additional context
  */
-export const captureClick = (params: TTrackClickParams) => {
+export const captureClick = (params: TCaptureClickParams) => {
   captureElement({ ...params, interaction_type: "clicked" });
 };
 
-type TTrackViewParams = Omit<TTrackElementParams, "interaction_type">;
+type TCaptureViewParams = Omit<TCaptureElementParams, "interaction_type">;
 /**
  * Track view events
  * @param element - The element that was viewed
  * @param context - Additional context
  */
-export const captureView = (params: TTrackViewParams) => {
+export const captureView = (params: TCaptureViewParams) => {
   captureElement({ ...params, interaction_type: "viewed" });
 };
 
-type TTrackHoverParams = Omit<TTrackElementParams, "interaction_type">;
+type TCaptureHoverParams = Omit<TCaptureElementParams, "interaction_type">;
 /**
  * Track hover events
  * @param element - The element that was hovered
  * @param context - Additional context
  */
-export const captureHover = (params: TTrackHoverParams) => {
+export const captureHover = (params: TCaptureHoverParams) => {
   captureElement({ ...params, interaction_type: "hovered" });
 };
 
-type TTrackEventParams = {
+type TCaptureEventParams = {
   eventName: string;
   payload?: Record<string, any>;
   context?: TEventContext;
   state: TEventState;
 };
-
 /**
  * Track business events (outcomes, state changes, etc.)
  * This helps understand business metrics and conversion rates
@@ -80,7 +78,7 @@ type TTrackEventParams = {
  * @param payload - Event-specific data
  * @param context - Additional context
  */
-const captureEvent = (params: TTrackEventParams) => {
+const captureEvent = (params: TCaptureEventParams) => {
   const { eventName, payload, context, state } = params;
   if (!posthog) return;
 
@@ -94,21 +92,20 @@ const captureEvent = (params: TTrackEventParams) => {
   posthog.capture(eventName, finalPayload);
 };
 
-type TTrackSuccessParams = Omit<TTrackEventParams, "state">;
+type TCaptureSuccessParams = Omit<TCaptureEventParams, "state">;
 /**
  * Track success events
  * @param eventName - The name of the event
  * @param payload - Additional payload
  * @param context - Additional context
  */
-export const captureSuccess = (params: TTrackSuccessParams) => {
+export const captureSuccess = (params: TCaptureSuccessParams) => {
   captureEvent({ ...params, state: "SUCCESS" });
 };
 
-type TTrackErrorParams = Omit<TTrackEventParams, "state"> & {
-  error: Error | string;
+type TCaptureErrorParams = Omit<TCaptureEventParams, "state"> & {
+  error?: Error | string;
 };
-
 /**
  * Track error events
  * @param eventName - The name of the event
@@ -116,21 +113,20 @@ type TTrackErrorParams = Omit<TTrackEventParams, "state"> & {
  * @param payload - Additional payload
  * @param context - Additional context
  */
-export const captureError = (params: TTrackErrorParams) => {
+export const captureError = (params: TCaptureErrorParams) => {
   captureEvent({ ...params, state: "ERROR", payload: { ...params.payload, error: params.error } });
 };
 
-type TTrackElementAndEventParams = {
-  element: Omit<TTrackElementParams, "interaction_type">;
-  event: TTrackEventParams;
+type TCaptureElementAndEventParams = {
+  element: Omit<TCaptureElementParams, "interaction_type">;
+  event: TCaptureEventParams;
 };
-
 /**
  * Track both element interaction and business event together
  * @param element - The element that was interacted with
  * @param event - The business event that was triggered
  */
-export const captureElementAndEvent = (params: TTrackElementAndEventParams) => {
+export const captureElementAndEvent = (params: TCaptureElementAndEventParams) => {
   const { element, event } = params;
   // Track the element interaction first
   captureElement({ ...element, interaction_type: "clicked" });