diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-item/index.ts
index 985ccb3b2e07..3cfc7fe88b84 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-item/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-item/index.ts
@@ -5,3 +5,5 @@ export * from './utils.js';
 export type { UmbItemModel } from './types.js';
 
 export type { UmbItemDataResolver, UmbItemDataResolverConstructor } from './data-resolver/types.js';
+
+import './global-components.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts
index a2e86028438f..68a7d373770c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts
@@ -1,21 +1,25 @@
 import { manifests as coreManifests } from './manifests.js';
-import { UMB_AUTH_CONTEXT } from './auth/auth.context.token.js';
-import { UmbActionEventContext } from './action/action-event.context.js';
-import { UmbBackofficeNotificationContainerElement, UmbBackofficeModalContainerElement } from './components/index.js';
-import { UmbInteractionMemoryContext } from './interaction-memory/index.js';
+import { UmbActionEventContext } from '@umbraco-cms/backoffice/action';
+import {
+	UmbBackofficeNotificationContainerElement,
+	UmbBackofficeModalContainerElement,
+} from '@umbraco-cms/backoffice/components';
+import { UmbInteractionMemoryContext } from '@umbraco-cms/backoffice/interaction-memory';
+import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';
 import { UmbExtensionsApiInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
 import { UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
 import type { UmbEntryPointOnInit } from '@umbraco-cms/backoffice/extension-api';
 
-import './collection/global-components.js';
-import './entity-item/global-components.js';
-import './entity-sign/components/index.js';
-import './extension-registry/components/index.js';
-import './menu/components/index.js';
-import './property-action/components/index.js';
-import './property-editor-data-source/global-components.js';
-import './property-sort-mode/global-components/index.js';
+// Ensure the load of some package for their global components(Which are exported as part of the import-map, those where it's not have deep imports here):
+import '@umbraco-cms/backoffice/collection';
+import '@umbraco-cms/backoffice/entity-sign';
+import '@umbraco-cms/backoffice/extension-registry';
+import '@umbraco-cms/backoffice/menu';
+import '@umbraco-cms/backoffice/property-action';
+import '@umbraco-cms/backoffice/property-editor-data-source';
+import '@umbraco-cms/backoffice/property-sort-mode';
+import '@umbraco-cms/backoffice/entity-item';
 
 export const onInit: UmbEntryPointOnInit = (host, extensionRegistry) => {
 	new UmbExtensionsApiInitializer(host, extensionRegistry, 'globalContext', [host]);