diff --git a/open-lens/package.json b/open-lens/package.json
index 3661bdf916..1e6b844e0d 100644
--- a/open-lens/package.json
+++ b/open-lens/package.json
@@ -199,11 +199,11 @@
     "@k8slens/run-many": "^1.0.0-alpha.7",
     "@k8slens/startable-stoppable": "^1.0.0-alpha.6",
     "@k8slens/utilities": "^1.0.0-alpha.6",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-mobx": "^15.8.1",
-    "@ogre-tools/injectable-react": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-mobx": "^16.1.0",
+    "@ogre-tools/injectable-react": "^16.1.0",
     "mobx": "^6.9.0"
   },
   "devDependencies": {
diff --git a/package.json b/package.json
index 07ee4000d7..24532265bc 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "@types/react": "^17"
   },
   "devDependencies": {
-    "@ogre-tools/linkable": "^15.8.1",
+    "@ogre-tools/linkable": "^16.1.0",
     "adr": "^1.4.3",
     "cross-env": "^7.0.3",
     "lerna": "^6.6.1",
diff --git a/packages/business-features/keyboard-shortcuts/package.json b/packages/business-features/keyboard-shortcuts/package.json
index c18d4aa492..00f49c0d99 100644
--- a/packages/business-features/keyboard-shortcuts/package.json
+++ b/packages/business-features/keyboard-shortcuts/package.json
@@ -33,10 +33,10 @@
   "peerDependencies": {
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@k8slens/react-application": "^1.0.0-alpha.0",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
-    "@ogre-tools/injectable-react": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
+    "@ogre-tools/injectable-react": "^16.1.0",
     "lodash": "^4.17.21",
     "react": "^17 || ^18"
   },
diff --git a/packages/cluster-settings/package.json b/packages/cluster-settings/package.json
index 6b4a3fa8e4..4a6117a57c 100644
--- a/packages/cluster-settings/package.json
+++ b/packages/cluster-settings/package.json
@@ -23,6 +23,6 @@
     "rimraf": "^4.4.1"
   },
   "peerDependencies": {
-    "@ogre-tools/injectable": "^15.8.1"
+    "@ogre-tools/injectable": "^16.1.0"
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index c374a80ba1..2c71731963 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -188,7 +188,7 @@
     "@async-fn/jest": "1.6.4",
     "@k8slens/messaging-fake-bridge": "^1.0.0-alpha.7",
     "@k8slens/react-testing-library-discovery": "^1.0.0-alpha.4",
-    "@ogre-tools/linkable": "^15.8.1",
+    "@ogre-tools/linkable": "^16.1.0",
     "@sentry/types": "^6.19.7",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.53",
@@ -311,11 +311,11 @@
     "@k8slens/test-utils": "^1.0.0-alpha.3",
     "@k8slens/tooltip": "^1.0.0-alpha.5",
     "@k8slens/utilities": "^1.0.0-alpha.1",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-mobx": "^15.8.1",
-    "@ogre-tools/injectable-react": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-mobx": "^16.1.0",
+    "@ogre-tools/injectable-react": "^16.1.0",
     "mobx": "^6.9.0",
     "mobx-observable-history": "^2.0.3",
     "mobx-react": "^7.6.0",
diff --git a/packages/infrastructure/webpack/package.json b/packages/infrastructure/webpack/package.json
index b2721b7dda..7568b694ee 100644
--- a/packages/infrastructure/webpack/package.json
+++ b/packages/infrastructure/webpack/package.json
@@ -25,7 +25,7 @@
     "test:unit": "jest --coverage --runInBand"
   },
   "dependencies": {
-    "@ogre-tools/linkable": "^15.8.1",
+    "@ogre-tools/linkable": "^16.1.0",
     "@types/webpack-env": "^1.18.0",
     "css-loader": "^6.7.2",
     "fork-ts-checker-webpack-plugin": "^7.3.0",
@@ -40,15 +40,15 @@
     "webpack-cli": "^4.10.0"
   },
   "peerDependencies": {
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@async-fn/jest": "^1.6.4",
     "@k8slens/typescript": "^6.5.0-alpha.3",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.9.0",
-    "@ogre-tools/test-utils": "^15.8.1",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
+    "@ogre-tools/test-utils": "^16.1.0",
     "ts-node": "^10.9.1",
     "webpack-node-externals": "^3.0.0"
   },
diff --git a/packages/kube-object/package.json b/packages/kube-object/package.json
index c33f47011a..3906e47e37 100644
--- a/packages/kube-object/package.json
+++ b/packages/kube-object/package.json
@@ -32,7 +32,7 @@
   },
   "peerDependencies": {
     "@k8slens/utilities": "^1.0.0-alpha.2",
-    "@ogre-tools/injectable": "^15.8.1",
+    "@ogre-tools/injectable": "^16.1.0",
     "auto-bind": "^4.0.0",
     "moment": "^2.29.4",
     "rfc6902": "^5.0.1",
diff --git a/packages/kubectl-versions/package.json b/packages/kubectl-versions/package.json
index cb9cf60722..636fa3fead 100644
--- a/packages/kubectl-versions/package.json
+++ b/packages/kubectl-versions/package.json
@@ -27,7 +27,7 @@
     "test": "jest --coverage --runInBand"
   },
   "peerDependencies": {
-    "@ogre-tools/injectable": "^15.8.1"
+    "@ogre-tools/injectable": "^16.1.0"
   },
   "devDependencies": {
     "@k8slens/webpack": "^6.5.0-alpha.8",
diff --git a/packages/legacy-global-di/package.json b/packages/legacy-global-di/package.json
index ebb56e994d..9aa760e10e 100644
--- a/packages/legacy-global-di/package.json
+++ b/packages/legacy-global-di/package.json
@@ -31,7 +31,7 @@
     "lint:fix": "lens-lint --fix"
   },
   "peerDependencies": {
-    "@ogre-tools/injectable": "^15.8.1"
+    "@ogre-tools/injectable": "^16.1.0"
   },
   "devDependencies": {
     "@k8slens/eslint-config": "^6.5.0-alpha.3",
diff --git a/packages/list-layout/package.json b/packages/list-layout/package.json
index 82066e3859..f3c7a0a639 100644
--- a/packages/list-layout/package.json
+++ b/packages/list-layout/package.json
@@ -34,7 +34,7 @@
   "peerDependencies": {
     "@k8slens/kube-object": "^1.0.0-alpha.1",
     "@k8slens/utilities": "^1.0.0-alpha.3",
-    "@ogre-tools/injectable": "^15.8.1",
+    "@ogre-tools/injectable": "^16.1.0",
     "react": "^17.0.2"
   },
   "devDependencies": {
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 30a0a2e595..94c1cc2f12 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -31,8 +31,10 @@
   },
   "peerDependencies": {
     "@k8slens/feature-core": "^6.5.0-alpha.0",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.3.0",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
+    "lodash": "^4.17.21",
     "winston": "^3.8.2"
   },
   "devDependencies": {
diff --git a/packages/metrics/package.json b/packages/metrics/package.json
index 79a6a04dea..3933d62659 100644
--- a/packages/metrics/package.json
+++ b/packages/metrics/package.json
@@ -33,7 +33,7 @@
   },
   "peerDependencies": {
     "@k8slens/kube-object": "^1.0.0-alpha.1",
-    "@ogre-tools/injectable": "^15.8.1",
+    "@ogre-tools/injectable": "^16.1.0",
     "react": "^17.0.2"
   },
   "devDependencies": {
diff --git a/packages/routing/package.json b/packages/routing/package.json
index 5ba04890db..7efe49872b 100644
--- a/packages/routing/package.json
+++ b/packages/routing/package.json
@@ -31,10 +31,10 @@
   "peerDependencies": {
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@k8slens/react-application": "^1.0.0-alpha.0",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
-    "@ogre-tools/injectable-react": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
+    "@ogre-tools/injectable-react": "^16.1.0",
     "auto-bind": "^4.0.0",
     "history": "^4.10.1",
     "lodash": "^4.17.21",
diff --git a/packages/technical-features/application/agnostic/package.json b/packages/technical-features/application/agnostic/package.json
index 0453c31670..4376077966 100644
--- a/packages/technical-features/application/agnostic/package.json
+++ b/packages/technical-features/application/agnostic/package.json
@@ -34,9 +34,9 @@
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@k8slens/logger": "^1.0.0-alpha.5",
     "@k8slens/run-many": "^1.0.0-alpha.1",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
     "lodash": "^4.17.15"
   },
   "devDependencies": {
diff --git a/packages/technical-features/application/electron-main/package.json b/packages/technical-features/application/electron-main/package.json
index 2b88316d6f..355575ff18 100644
--- a/packages/technical-features/application/electron-main/package.json
+++ b/packages/technical-features/application/electron-main/package.json
@@ -34,8 +34,8 @@
     "@k8slens/application": "^6.5.0-alpha.0",
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@k8slens/run-many": "^1.0.0-alpha.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
     "electron": "^22.3.3",
     "lodash": "^4.17.21"
   },
@@ -43,6 +43,6 @@
     "@async-fn/jest": "^1.6.4",
     "@k8slens/eslint-config": "^6.5.0-alpha.3",
     "@k8slens/webpack": "^6.5.0-alpha.8",
-    "@ogre-tools/test-utils": "^15.8.1"
+    "@ogre-tools/test-utils": "^16.1.0"
   }
 }
diff --git a/packages/technical-features/application/legacy-extensions/package.json b/packages/technical-features/application/legacy-extensions/package.json
index 8926153fa2..59d5ac785d 100644
--- a/packages/technical-features/application/legacy-extensions/package.json
+++ b/packages/technical-features/application/legacy-extensions/package.json
@@ -30,7 +30,7 @@
     "lint:fix": "lens-lint --fix"
   },
   "peerDependencies": {
-    "@ogre-tools/injectable": "^15.8.1"
+    "@ogre-tools/injectable": "^16.1.0"
   },
   "devDependencies": {
     "@k8slens/eslint-config": "^6.5.0-alpha.3",
diff --git a/packages/technical-features/feature-core/package.json b/packages/technical-features/feature-core/package.json
index dbe559e48b..be0ccfb7bd 100644
--- a/packages/technical-features/feature-core/package.json
+++ b/packages/technical-features/feature-core/package.json
@@ -31,7 +31,7 @@
     "lint:fix": "lens-lint --fix"
   },
   "peerDependencies": {
-    "@ogre-tools/injectable": "^15.8.1"
+    "@ogre-tools/injectable": "^16.1.0"
   },
   "devDependencies": {
     "@k8slens/eslint-config": "^6.5.0-alpha.3",
diff --git a/packages/technical-features/messaging/agnostic/package.json b/packages/technical-features/messaging/agnostic/package.json
index e3198aba3a..ec2db38cf9 100644
--- a/packages/technical-features/messaging/agnostic/package.json
+++ b/packages/technical-features/messaging/agnostic/package.json
@@ -34,9 +34,9 @@
     "@k8slens/application": "^6.5.0-alpha.0",
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@k8slens/startable-stoppable": "^1.0.0-alpha.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-mobx": "^15.8.1",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-mobx": "^16.1.0",
     "lodash": "^4.17.21",
     "mobx": "^6.7.0"
   },
diff --git a/packages/technical-features/messaging/computed-channel/package.json b/packages/technical-features/messaging/computed-channel/package.json
index 78f95b0683..2b17f52d7e 100644
--- a/packages/technical-features/messaging/computed-channel/package.json
+++ b/packages/technical-features/messaging/computed-channel/package.json
@@ -34,10 +34,10 @@
     "@k8slens/application": "^6.5.0-alpha.0",
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@k8slens/messaging": "^1.0.0-alpha.1",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-mobx": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-mobx": "^16.1.0",
     "lodash": "^4.17.21",
     "mobx": "^6.8.0"
   },
diff --git a/packages/technical-features/messaging/electron/main/package.json b/packages/technical-features/messaging/electron/main/package.json
index 12b4ca65e3..7a0f806452 100644
--- a/packages/technical-features/messaging/electron/main/package.json
+++ b/packages/technical-features/messaging/electron/main/package.json
@@ -34,9 +34,9 @@
     "@k8slens/application": "^6.5.0-alpha.0",
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@k8slens/messaging": "^1.0.0-alpha.1",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
     "electron": "^22.3.3",
     "lodash": "^4.17.21"
   },
diff --git a/packages/technical-features/messaging/electron/renderer/package.json b/packages/technical-features/messaging/electron/renderer/package.json
index 3ae798cb27..8d67c335ef 100644
--- a/packages/technical-features/messaging/electron/renderer/package.json
+++ b/packages/technical-features/messaging/electron/renderer/package.json
@@ -36,8 +36,8 @@
     "@k8slens/messaging": "^1.0.0-alpha.1",
     "@k8slens/run-many": "^1.0.0-alpha.1",
     "@k8slens/startable-stoppable": "^1.0.0-alpha.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
     "electron": "^22.3.3",
     "lodash": "^4.17.21"
   },
diff --git a/packages/technical-features/messaging/message-bridge-fake/package.json b/packages/technical-features/messaging/message-bridge-fake/package.json
index 4cfd499e08..9cdbb6bb36 100644
--- a/packages/technical-features/messaging/message-bridge-fake/package.json
+++ b/packages/technical-features/messaging/message-bridge-fake/package.json
@@ -34,9 +34,9 @@
     "@async-fn/jest": "^1.6.4",
     "@k8slens/feature-core": "^6.5.0-alpha.2",
     "@k8slens/messaging": "^1.0.0-alpha.1",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-mobx": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-mobx": "^16.1.0",
     "lodash": "^4.17.21",
     "mobx": "^6.9.0"
   },
diff --git a/packages/technical-features/react-application/package.json b/packages/technical-features/react-application/package.json
index ed065c77c7..29b19f2aed 100644
--- a/packages/technical-features/react-application/package.json
+++ b/packages/technical-features/react-application/package.json
@@ -33,11 +33,11 @@
   "peerDependencies": {
     "@k8slens/application": "^6.5.0-alpha.2",
     "@k8slens/feature-core": "^6.5.0-alpha.0",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-mobx": "^15.8.1",
-    "@ogre-tools/injectable-react": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-mobx": "^16.1.0",
+    "@ogre-tools/injectable-react": "^16.1.0",
     "lodash": "^4.17.15",
     "mobx": "^6.8.0",
     "mobx-react": "^7.6.0",
diff --git a/packages/ui-components/error-boundary/package.json b/packages/ui-components/error-boundary/package.json
index 73de326f44..227d3677c8 100644
--- a/packages/ui-components/error-boundary/package.json
+++ b/packages/ui-components/error-boundary/package.json
@@ -36,8 +36,8 @@
     "@k8slens/button": "^1.0.0-alpha.5",
     "@k8slens/routing": "^1.0.0-alpha.5",
     "@k8slens/utilities": "^1.0.0-alpha.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-react": "^15.8.1",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-react": "^16.1.0",
     "auto-bind": "^4.0.0",
     "history": "^4.10.1",
     "lodash": "^4.17.21",
diff --git a/packages/ui-components/resizing-anchor/package.json b/packages/ui-components/resizing-anchor/package.json
index 1fe18d07de..92cf9ee94c 100644
--- a/packages/ui-components/resizing-anchor/package.json
+++ b/packages/ui-components/resizing-anchor/package.json
@@ -35,9 +35,9 @@
   "peerDependencies": {
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@k8slens/utilities": "^1.0.0-alpha.1",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^16.1.0",
     "auto-bind": "^4.0.0",
     "lodash": "^4.17.21",
     "mobx": "^6.8.0",
diff --git a/packages/utility-features/run-many/package.json b/packages/utility-features/run-many/package.json
index 01790c659b..d306659c2f 100644
--- a/packages/utility-features/run-many/package.json
+++ b/packages/utility-features/run-many/package.json
@@ -27,8 +27,8 @@
   "peerDependencies": {
     "@k8slens/test-utils": "^1.0.0-alpha.3",
     "@k8slens/utilities": "^1.0.0-alpha.1",
-    "@ogre-tools/fp": "^15.8.1",
-    "@ogre-tools/injectable": "^15.8.1",
+    "@ogre-tools/fp": "^16.1.0",
+    "@ogre-tools/injectable": "^16.1.0",
     "type-fest": "^2.19.0",
     "typed-emitter": "^1.4.0",
     "uuid": "^8.3.2"
diff --git a/packages/utility-features/test-utils/package.json b/packages/utility-features/test-utils/package.json
index 640318df19..29d8904644 100644
--- a/packages/utility-features/test-utils/package.json
+++ b/packages/utility-features/test-utils/package.json
@@ -24,8 +24,8 @@
     "build": "lens-webpack-build"
   },
   "peerDependencies": {
-    "@ogre-tools/injectable": "^15.8.1",
-    "@ogre-tools/injectable-react": "^15.8.1",
+    "@ogre-tools/injectable": "^16.1.0",
+    "@ogre-tools/injectable-react": "^16.1.0",
     "@testing-library/react": "^12.1.5",
     "lodash": "^4.17.21",
     "mobx": "^6.8.0",