diff --git a/apps/web/core/components/issues/issue-detail/main-content.tsx b/apps/web/core/components/issues/issue-detail/main-content.tsx
index d14bd35396..0b6a2d835c 100644
--- a/apps/web/core/components/issues/issue-detail/main-content.tsx
+++ b/apps/web/core/components/issues/issue-detail/main-content.tsx
@@ -26,7 +26,7 @@ import { DeDupeIssuePopoverRoot } from "@/plane-web/components/de-dupe/duplicate
 import { IssueTypeSwitcher } from "@/plane-web/components/issues/issue-details/issue-type-switcher";
 import { useDebouncedDuplicateIssues } from "@/plane-web/hooks/use-debounced-duplicate-issues";
 // services
-import { WorkItemVersionService } from "@/services/issue";
+import { WorkItemVersionService } from "@plane/services";
 // local imports
 import { IssueDetailWidgets } from "../issue-detail-widgets";
 import { NameDescriptionUpdateStatus } from "../issue-update-status";
diff --git a/apps/web/core/components/issues/peek-overview/issue-detail.tsx b/apps/web/core/components/issues/peek-overview/issue-detail.tsx
index 6bd89124b6..ca70e39fa4 100644
--- a/apps/web/core/components/issues/peek-overview/issue-detail.tsx
+++ b/apps/web/core/components/issues/peek-overview/issue-detail.tsx
@@ -27,7 +27,7 @@ import { IssueTypeSwitcher } from "@/plane-web/components/issues/issue-details/i
 // plane web hooks
 import { useDebouncedDuplicateIssues } from "@/plane-web/hooks/use-debounced-duplicate-issues";
 // services
-import { WorkItemVersionService } from "@/services/issue";
+import { WorkItemVersionService } from "@plane/services";
 // local components
 import type { TIssueOperations } from "../issue-detail";
 import { IssueParentDetail } from "../issue-detail/parent";
diff --git a/apps/web/core/store/issue/workspace-draft/issue.store.ts b/apps/web/core/store/issue/workspace-draft/issue.store.ts
index 850a9e03e3..fedf500c21 100644
--- a/apps/web/core/store/issue/workspace-draft/issue.store.ts
+++ b/apps/web/core/store/issue/workspace-draft/issue.store.ts
@@ -24,7 +24,7 @@ import type {
 } from "@plane/types";
 import { getCurrentDateTimeInISO, convertToISODateString } from "@plane/utils";
 // services
-import workspaceDraftService from "@/services/issue/workspace_draft.service";
+import { WorkspaceDraftService } from "@plane/services";
 // types
 import type { IIssueRootStore } from "../root.store";
 
@@ -112,6 +112,8 @@ export interface IWorkspaceDraftIssues {
   bulkUpdateProperties: (workspaceSlug: string, projectId: string, data: TBulkOperationsPayload) => Promise<void>;
 }
 
+const workspaceDraftService = new WorkspaceDraftService();
+
 export class WorkspaceDraftIssues implements IWorkspaceDraftIssues {
   // local constants
   paginatedCount = 50;
diff --git a/apps/web/core/services/issue/work_item_version.service.ts b/packages/services/src/issue/work-item-version.service.ts
similarity index 96%
rename from apps/web/core/services/issue/work_item_version.service.ts
rename to packages/services/src/issue/work-item-version.service.ts
index d36cb52418..3ebaf24e9e 100644
--- a/apps/web/core/services/issue/work_item_version.service.ts
+++ b/packages/services/src/issue/work-item-version.service.ts
@@ -10,7 +10,7 @@ import { EIssueServiceType } from "@plane/types";
 import type { TDescriptionVersionsListResponse, TDescriptionVersionDetails, TIssueServiceType } from "@plane/types";
 // helpers
 // services
-import { APIService } from "@/services/api.service";
+import { APIService } from "../api.service";
 
 export class WorkItemVersionService extends APIService {
   private serviceType: TIssueServiceType;
diff --git a/packages/services/src/workspace/index.ts b/packages/services/src/workspace/index.ts
index 6b67a9b65e..aa25e3c505 100644
--- a/packages/services/src/workspace/index.ts
+++ b/packages/services/src/workspace/index.ts
@@ -9,4 +9,5 @@ export * from "./member.service";
 export * from "./notification.service";
 export * from "./view.service";
 export * from "./workspace.service";
+export * from "./workspace-draft.service";
 export * from "./instance-workspace.service";
diff --git a/apps/web/core/services/issue/workspace_draft.service.ts b/packages/services/src/workspace/workspace-draft.service.ts
similarity index 97%
rename from apps/web/core/services/issue/workspace_draft.service.ts
rename to packages/services/src/workspace/workspace-draft.service.ts
index f66841eb15..20074f5e0e 100644
--- a/apps/web/core/services/issue/workspace_draft.service.ts
+++ b/packages/services/src/workspace/workspace-draft.service.ts
@@ -8,7 +8,7 @@ import { API_BASE_URL } from "@plane/constants";
 import type { TIssue, TWorkspaceDraftIssue, TWorkspaceDraftPaginationInfo } from "@plane/types";
 // helpers
 // services
-import { APIService } from "@/services/api.service";
+import { APIService } from "../api.service";
 
 export class WorkspaceDraftService extends APIService {
   constructor() {