diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index f34a5b3e9b..5b9baa4e6d 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -11,6 +11,8 @@
 		"./element-api": "./dist-cms/libs/element-api/index.js",
 		"./extension-api": "./dist-cms/libs/extension-api/index.js",
 		"./observable-api": "./dist-cms/libs/observable-api/index.js",
+		"./auth": "./dist-cms/shared/auth/index.js",
+		"./context": "./dist-cms/shared/context/index.js",
 		"./events": "./dist-cms/shared/umb-events/index.js",
 		"./models": "./dist-cms/shared/models/index.js",
 		"./repository": "./dist-cms/shared/repository/index.js",
diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
index ed09065f09..db309ee6dc 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
@@ -1,6 +1,6 @@
+import { UMB_AUTH, UmbAuthFlow } from '@umbraco-cms/backoffice/auth';
+import { UMB_APP, UmbAppContext } from '@umbraco-cms/backoffice/context';
 import type { UmbAppErrorElement } from './app-error.element.js';
-import { UmbAuthFlow } from './auth/index.js';
-import { UMB_APP, UmbAppContext } from './app.context.js';
 import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UUIIconRegistryEssential } from '@umbraco-cms/backoffice/external/uui';
 import { UmbIconRegistry } from '@umbraco-cms/backoffice/icon';
@@ -81,6 +81,8 @@ export class UmbAppElement extends UmbLitElement {
 
 		this.#authFlow = new UmbAuthFlow(this.serverUrl, redirectUrl);
 
+		this.provideContext(UMB_AUTH, this.#authFlow);
+
 		this.provideContext(UMB_APP, new UmbAppContext({ backofficePath: this.backofficePath, serverUrl: this.serverUrl }));
 
 		// Try to initialise the auth flow and get the runtime status
diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/index.ts b/src/Umbraco.Web.UI.Client/src/apps/app/index.ts
index 8eb4f65238..0834e3b2c8 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/app/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/app/index.ts
@@ -1,4 +1,3 @@
 export * from './app-context-config.interface.js';
 export * from './app-error.element.js';
-export * from './app.context.js';
 export * from './app.element.js';
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index 65b090a30a..a3baeab158 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -35,6 +35,8 @@
 			"@umbraco-cms/backoffice/observable-api": ["src/libs/observable-api"],
 
 			// SHARED
+			"@umbraco-cms/backoffice/auth": ["src/shared/auth"],
+			"@umbraco-cms/backoffice/context": ["src/shared/context"],
 			"@umbraco-cms/backoffice/events": ["src/shared/umb-events"],
 			"@umbraco-cms/backoffice/models": ["src/shared/models"],
 			"@umbraco-cms/backoffice/repository": ["src/shared/repository"],
diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
index d5627f2078..fe00353f9c 100644
--- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
+++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
@@ -48,6 +48,8 @@ export default {
 						'@umbraco-cms/backoffice/extension-api': './src/libs/extension-api/index.ts',
 						'@umbraco-cms/backoffice/observable-api': './src/libs/observable-api/index.ts',
 
+						'@umbraco-cms/backoffice/auth': './src/shared/auth/index.ts',
+						'@umbraco-cms/backoffice/context': './src/shared/context/index.ts',
 						'@umbraco-cms/backoffice/events': './src/shared/umb-events/index.ts',
 						'@umbraco-cms/backoffice/models': './src/shared/models/index.ts',
 						'@umbraco-cms/backoffice/repository': './src/shared/repository/index.ts',