diff --git a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/cron-jobs-workload.injectable.ts b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/cron-jobs-workload.injectable.ts
index 7e8ab5cf6e..d1f715f41c 100644
--- a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/cron-jobs-workload.injectable.ts
+++ b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/cron-jobs-workload.injectable.ts
@@ -6,16 +6,16 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { workloadInjectionToken } from "../workload-injection-token";
 import { ResourceNames } from "../../../../utils/rbac";
 import navigateToCronJobsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/cron-jobs/navigate-to-cron-jobs.injectable";
-import namespaceStoreInjectable from "../../../+namespaces/store.injectable";
 import cronJobsStoreInjectable from "../../../+workloads-cronjobs/store.injectable";
 import { computed } from "mobx";
+import clusterFrameContextForNamespacedResourcesInjectable from "../../../../cluster-frame-context/for-namespaced-resources.injectable";
 
 const cronJobsWorkloadInjectable = getInjectable({
   id: "cron-jobs-workload",
 
   instantiate: (di) => {
     const navigate = di.inject(navigateToCronJobsInjectable);
-    const namespaceStore = di.inject(namespaceStoreInjectable);
+    const context = di.inject(clusterFrameContextForNamespacedResourcesInjectable);
     const store = di.inject(cronJobsStoreInjectable);
 
     return {
@@ -25,10 +25,10 @@ const cronJobsWorkloadInjectable = getInjectable({
       },
       open: navigate,
       amountOfItems: computed(
-        () => store.getAllByNs(namespaceStore.contextNamespaces).length,
+        () => store.getAllByNs(context.contextNamespaces).length,
       ),
       status: computed(() =>
-        store.getStatuses(store.getAllByNs(namespaceStore.contextNamespaces)),
+        store.getStatuses(store.getAllByNs(context.contextNamespaces)),
       ),
       title: ResourceNames.cronjobs,
       orderNumber: 70,
diff --git a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/daemonsets-workload.injectable.ts b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/daemonsets-workload.injectable.ts
index 7b6d7d750f..a7c6cf6128 100644
--- a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/daemonsets-workload.injectable.ts
+++ b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/daemonsets-workload.injectable.ts
@@ -5,17 +5,17 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { workloadInjectionToken } from "../workload-injection-token";
 import { ResourceNames } from "../../../../utils/rbac";
-import namespaceStoreInjectable from "../../../+namespaces/store.injectable";
 import daemonsetsStoreInjectable from "../../../+workloads-daemonsets/store.injectable";
 import navigateToDaemonsetsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/daemonsets/navigate-to-daemonsets.injectable";
 import { computed } from "mobx";
+import clusterFrameContextForNamespacedResourcesInjectable from "../../../../cluster-frame-context/for-namespaced-resources.injectable";
 
 const daemonsetsWorkloadInjectable = getInjectable({
   id: "daemonsets-workload",
 
   instantiate: (di) => {
     const navigate = di.inject(navigateToDaemonsetsInjectable);
-    const namespaceStore = di.inject(namespaceStoreInjectable);
+    const context = di.inject(clusterFrameContextForNamespacedResourcesInjectable);
     const store = di.inject(daemonsetsStoreInjectable);
 
     return {
@@ -26,11 +26,11 @@ const daemonsetsWorkloadInjectable = getInjectable({
       open: navigate,
 
       amountOfItems: computed(
-        () => store.getAllByNs(namespaceStore.contextNamespaces).length,
+        () => store.getAllByNs(context.contextNamespaces).length,
       ),
 
       status: computed(() =>
-        store.getStatuses(store.getAllByNs(namespaceStore.contextNamespaces)),
+        store.getStatuses(store.getAllByNs(context.contextNamespaces)),
       ),
 
       title: ResourceNames.daemonsets,
diff --git a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/deployments-workload.injectable.ts b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/deployments-workload.injectable.ts
index b41e4ea5ca..eac2231038 100644
--- a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/deployments-workload.injectable.ts
+++ b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/deployments-workload.injectable.ts
@@ -5,17 +5,17 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { workloadInjectionToken } from "../workload-injection-token";
 import { ResourceNames } from "../../../../utils/rbac";
-import namespaceStoreInjectable from "../../../+namespaces/store.injectable";
 import deploymentsStoreInjectable from "../../../+workloads-deployments/store.injectable";
 import navigateToDeploymentsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/deployments/navigate-to-deployments.injectable";
 import { computed } from "mobx";
+import clusterFrameContextForNamespacedResourcesInjectable from "../../../../cluster-frame-context/for-namespaced-resources.injectable";
 
 const deploymentsWorkloadInjectable = getInjectable({
   id: "deployments-workload",
 
   instantiate: (di) => {
     const navigate = di.inject(navigateToDeploymentsInjectable);
-    const namespaceStore = di.inject(namespaceStoreInjectable);
+    const context = di.inject(clusterFrameContextForNamespacedResourcesInjectable);
     const store = di.inject(deploymentsStoreInjectable);
 
     return {
@@ -26,11 +26,11 @@ const deploymentsWorkloadInjectable = getInjectable({
       open: navigate,
 
       amountOfItems: computed(
-        () => store.getAllByNs(namespaceStore.contextNamespaces).length,
+        () => store.getAllByNs(context.contextNamespaces).length,
       ),
 
       status: computed(() =>
-        store.getStatuses(store.getAllByNs(namespaceStore.contextNamespaces)),
+        store.getStatuses(store.getAllByNs(context.contextNamespaces)),
       ),
 
       title: ResourceNames.deployments,
diff --git a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/jobs-workload.injectable.ts b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/jobs-workload.injectable.ts
index e68fd88c1c..bbe878723d 100644
--- a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/jobs-workload.injectable.ts
+++ b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/jobs-workload.injectable.ts
@@ -5,17 +5,17 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { workloadInjectionToken } from "../workload-injection-token";
 import { ResourceNames } from "../../../../utils/rbac";
-import namespaceStoreInjectable from "../../../+namespaces/store.injectable";
 import jobStoreInjectable from "../../../+workloads-jobs/store.injectable";
 import navigateToJobsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/jobs/navigate-to-jobs.injectable";
 import { computed } from "mobx";
+import clusterFrameContextForNamespacedResourcesInjectable from "../../../../cluster-frame-context/for-namespaced-resources.injectable";
 
 const jobsWorkloadInjectable = getInjectable({
   id: "jobs-workload",
 
   instantiate: (di) => {
     const navigate = di.inject(navigateToJobsInjectable);
-    const namespaceStore = di.inject(namespaceStoreInjectable);
+    const context = di.inject(clusterFrameContextForNamespacedResourcesInjectable);
     const store = di.inject(jobStoreInjectable);
 
     return {
@@ -26,11 +26,11 @@ const jobsWorkloadInjectable = getInjectable({
       open: navigate,
 
       amountOfItems: computed(
-        () => store.getAllByNs(namespaceStore.contextNamespaces).length,
+        () => store.getAllByNs(context.contextNamespaces).length,
       ),
 
       status: computed(() =>
-        store.getStatuses(store.getAllByNs(namespaceStore.contextNamespaces)),
+        store.getStatuses(store.getAllByNs(context.contextNamespaces)),
       ),
 
       title: ResourceNames.jobs,
diff --git a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts
index 246469b9e7..f77d2ffe3b 100644
--- a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts
+++ b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts
@@ -6,16 +6,16 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { workloadInjectionToken } from "../workload-injection-token";
 import { ResourceNames } from "../../../../utils/rbac";
 import navigateToPodsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/pods/navigate-to-pods.injectable";
-import namespaceStoreInjectable from "../../../+namespaces/store.injectable";
 import { computed } from "mobx";
 import podStoreInjectable from "../../../+workloads-pods/store.injectable";
+import clusterFrameContextForNamespacedResourcesInjectable from "../../../../cluster-frame-context/for-namespaced-resources.injectable";
 
 const podsWorkloadInjectable = getInjectable({
   id: "pods-workload",
 
   instantiate: (di) => {
     const navigate = di.inject(navigateToPodsInjectable);
-    const namespaceStore = di.inject(namespaceStoreInjectable);
+    const context = di.inject(clusterFrameContextForNamespacedResourcesInjectable);
     const store = di.inject(podStoreInjectable);
 
     return {
@@ -26,11 +26,11 @@ const podsWorkloadInjectable = getInjectable({
       open: navigate,
 
       amountOfItems: computed(
-        () => store.getAllByNs(namespaceStore.contextNamespaces).length,
+        () => store.getAllByNs(context.contextNamespaces).length,
       ),
 
       status: computed(() =>
-        store.getStatuses(store.getAllByNs(namespaceStore.contextNamespaces)),
+        store.getStatuses(store.getAllByNs(context.contextNamespaces)),
       ),
 
       title: ResourceNames.pods,
diff --git a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts
index 86189e4634..1d158ec1ba 100644
--- a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts
+++ b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts
@@ -5,17 +5,17 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { workloadInjectionToken } from "../workload-injection-token";
 import { ResourceNames } from "../../../../utils/rbac";
-import namespaceStoreInjectable from "../../../+namespaces/store.injectable";
 import replicasetsStoreInjectable from "../../../+workloads-replicasets/store.injectable";
 import { computed } from "mobx";
 import navigateToReplicasetsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/replicasets/navigate-to-replicasets.injectable";
+import clusterFrameContextForNamespacedResourcesInjectable from "../../../../cluster-frame-context/for-namespaced-resources.injectable";
 
 const replicasetsWorkloadInjectable = getInjectable({
   id: "replicasets-workload",
 
   instantiate: (di) => {
     const navigate = di.inject(navigateToReplicasetsInjectable);
-    const namespaceStore = di.inject(namespaceStoreInjectable);
+    const context = di.inject(clusterFrameContextForNamespacedResourcesInjectable);
     const store = di.inject(replicasetsStoreInjectable);
 
     return {
@@ -26,11 +26,11 @@ const replicasetsWorkloadInjectable = getInjectable({
       open: navigate,
 
       amountOfItems: computed(
-        () => store.getAllByNs(namespaceStore.contextNamespaces).length,
+        () => store.getAllByNs(context.contextNamespaces).length,
       ),
 
       status: computed(() =>
-        store.getStatuses(store.getAllByNs(namespaceStore.contextNamespaces)),
+        store.getStatuses(store.getAllByNs(context.contextNamespaces)),
       ),
 
       title: ResourceNames.replicasets,
diff --git a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/statefulsets-workload.injectable.ts b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/statefulsets-workload.injectable.ts
index 19b85c4fa0..f716d35e46 100644
--- a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/statefulsets-workload.injectable.ts
+++ b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/statefulsets-workload.injectable.ts
@@ -5,17 +5,17 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { workloadInjectionToken } from "../workload-injection-token";
 import { ResourceNames } from "../../../../utils/rbac";
-import namespaceStoreInjectable from "../../../+namespaces/store.injectable";
 import statefulsetsStoreInjectable from "../../../+workloads-statefulsets/store.injectable";
 import { computed } from "mobx";
 import navigateToStatefulsetsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/statefulsets/navigate-to-statefulsets.injectable";
+import clusterFrameContextForNamespacedResourcesInjectable from "../../../../cluster-frame-context/for-namespaced-resources.injectable";
 
 const statefulsetsWorkloadInjectable = getInjectable({
   id: "statefulsets-workload",
 
   instantiate: (di) => {
     const navigate = di.inject(navigateToStatefulsetsInjectable);
-    const namespaceStore = di.inject(namespaceStoreInjectable);
+    const context = di.inject(clusterFrameContextForNamespacedResourcesInjectable);
     const store = di.inject(statefulsetsStoreInjectable);
 
     return {
@@ -26,11 +26,11 @@ const statefulsetsWorkloadInjectable = getInjectable({
       open: navigate,
 
       amountOfItems: computed(
-        () => store.getAllByNs(namespaceStore.contextNamespaces).length,
+        () => store.getAllByNs(context.contextNamespaces).length,
       ),
 
       status: computed(() =>
-        store.getStatuses(store.getAllByNs(namespaceStore.contextNamespaces)),
+        store.getStatuses(store.getAllByNs(context.contextNamespaces)),
       ),
 
       title: ResourceNames.statefulsets,