diff --git a/src/Umbraco.Web.UI.Client/libs/workspace/actions/save/save.action.ts b/src/Umbraco.Web.UI.Client/libs/workspace/actions/save/save.action.ts
index 38dd1744eb..dde528e171 100644
--- a/src/Umbraco.Web.UI.Client/libs/workspace/actions/save/save.action.ts
+++ b/src/Umbraco.Web.UI.Client/libs/workspace/actions/save/save.action.ts
@@ -1,4 +1,4 @@
-import { UmbWorkspaceContextInterface } from '../../../../src/backoffice/shared/components/workspace/workspace-context/workspace-context.interface';
+import { UmbWorkspaceContextInterface } from '../../context/workspace-context.interface';
 import { UmbWorkspaceActionBase } from '../workspace-action-base';
 import type { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
 
diff --git a/src/Umbraco.Web.UI.Client/libs/workspace/context/index.ts b/src/Umbraco.Web.UI.Client/libs/workspace/context/index.ts
new file mode 100644
index 0000000000..c4aea806a5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/workspace/context/index.ts
@@ -0,0 +1 @@
+export * from './workspace-context.interface';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-context.interface.ts b/src/Umbraco.Web.UI.Client/libs/workspace/context/workspace-context.interface.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-context.interface.ts
rename to src/Umbraco.Web.UI.Client/libs/workspace/context/workspace-context.interface.ts
diff --git a/src/Umbraco.Web.UI.Client/libs/workspace/index.ts b/src/Umbraco.Web.UI.Client/libs/workspace/index.ts
index 485f1b10af..de14fcfee4 100644
--- a/src/Umbraco.Web.UI.Client/libs/workspace/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/workspace/index.ts
@@ -1 +1,2 @@
 export * from './actions';
+export * from './context';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-entity-context.interface.ts
index e066a7ec1a..a06b85f015 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-entity-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-entity-context.interface.ts
@@ -1,4 +1,4 @@
-import type { UmbWorkspaceContextInterface } from './workspace-context.interface';
+import type { UmbWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace';
 
 export interface UmbEntityWorkspaceContextInterface<T = unknown> extends UmbWorkspaceContextInterface<T> {
 	getEntityKey(): string | undefined; // COnsider if this should go away now that we have getUnique()
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace.context.ts
index e426843b5c..324422e1eb 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace.context.ts
@@ -1,7 +1,7 @@
 import { UmbWorkspaceContext } from '../../../shared/components/workspace/workspace-context/workspace-context';
 import { UmbStylesheetRepository } from '../repository/stylesheet.repository';
 import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
-import { UmbWorkspaceContextInterface } from 'src/backoffice/shared/components/workspace/workspace-context/workspace-context.interface';
+import { UmbWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace';
 
 export class UmbStylesheetWorkspaceContext
 	extends UmbWorkspaceContext<UmbStylesheetRepository>