diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/created/section-view-packages-created.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/created/section-view-packages-created.element.ts
index a95242f643..35bd4bfe14 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/created/section-view-packages-created.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/created/section-view-packages-created.element.ts
@@ -2,7 +2,7 @@ import { html, LitElement } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { IRoute, IRoutingInfo } from 'router-slot';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
-import { ManifestWorkspace } from '@umbraco-cms/models';
+import type { ManifestWorkspace } from '@umbraco-cms/models';
 import { createExtensionElement } from '@umbraco-cms/extensions-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/installed/section-view-packages-installed.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/installed/section-view-packages-installed.element.ts
index 61a60d67d7..c21a3cd755 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/installed/section-view-packages-installed.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/installed/section-view-packages-installed.element.ts
@@ -1,30 +1,62 @@
 import { html, LitElement } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { IRoute, IRoutingInfo } from 'router-slot';
-import { UmbWorkspaceElement } from '../../../../workspaces/shared/workspace-context/workspace.element';
+import type { ManifestWorkspace } from '@umbraco-cms/models';
+import { createExtensionElement } from '@umbraco-cms/extensions-api';
+import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
+import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 
 @customElement('umb-section-view-packages-installed')
-export class UmbSectionViewPackagesInstalledElement extends LitElement {
+export class UmbSectionViewPackagesInstalledElement extends UmbObserverMixin(LitElement) {
+	
 	@state()
-	private _routes: IRoute[] = [
-		{
-			path: 'overview',
-			component: () => import('./packages-installed-overview.element'),
-		},
-		{
-			path: `:entityType/:key`,
-			component: () => import('../../../../workspaces/shared/workspace-context/workspace.element'),
-			setup: (component: HTMLElement, info: IRoutingInfo) => {
-				const element = component as UmbWorkspaceElement;
-				element.entityKey = info.match.params.key;
-				element.entityType = info.match.params.entityType;
+	private _routes: IRoute[] = [];
+
+	private _workspaces: Array<ManifestWorkspace> = [];
+
+
+	constructor() {
+		super();
+
+		this.observe<ManifestWorkspace[]>(umbExtensionsRegistry?.extensionsOfType('workspace'), (workspaceExtensions) => {
+			this._workspaces = workspaceExtensions;
+			this._createRoutes();
+		});
+	}
+
+	private _createRoutes() {
+
+		const routes: any[] = [
+			{
+				path: 'overview',
+				component: () => import('./packages-installed-overview.element'),
 			},
-		},
-		{
+		];
+		
+		// TODO: find a way to make this reuseable across:
+		this._workspaces?.map((workspace:ManifestWorkspace) => {
+			routes.push({
+				path: `${workspace.meta.entityType}/:key`,
+				component: () => createExtensionElement(workspace),
+				setup: (component: Promise<HTMLElement>, info: IRoutingInfo) => {
+					component.then((el: HTMLElement) => {
+						(el as any).entityKey = info.match.params.key;
+					})
+					
+				},
+			})
+			routes.push({
+				path: workspace.meta.entityType,
+				component: () => createExtensionElement(workspace)
+			})
+		});
+
+		routes.push({
 			path: '**',
 			redirectTo: 'section/packages/view/installed/overview', //TODO: this should be dynamic
-		},
-	];
+		});
+		this._routes = routes;
+	}
 
 	render() {
 		return html`<router-slot .routes=${this._routes}></router-slot>`;