diff --git a/frontend/bun.lock b/frontend/bun.lock
index d31b8cd..33888af 100644
--- a/frontend/bun.lock
+++ b/frontend/bun.lock
@@ -5,7 +5,6 @@
     "": {
       "name": "frontend",
       "dependencies": {
-        "@angular-architects/ngrx-toolkit": "^22.0.0",
         "@angular/cdk": "^22.2.4",
         "@angular/common": "^22.2.3",
         "@angular/compiler": "^22.2.3",
@@ -19,6 +18,7 @@
         "@fontsource-variable/instrument-sans": "5.3.0",
         "@jsverse/transloco": "^8.4.0",
         "@jsverse/transloco-messageformat": "^8.4.0",
+        "@ngrx-toolkit/core": "^22.0.1",
         "@ngrx/signals": "^22.0.0",
         "angular-oauth2-oidc": "^22.0.2",
         "d3-drag": "^3.0.0",
@@ -68,8 +68,6 @@
 
     "@ampproject/remapping": ["@ampproject/remapping@2.3.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw=="],
 
-    "@angular-architects/ngrx-toolkit": ["@angular-architects/ngrx-toolkit@22.0.0", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/common": "^22.0.0", "@angular/core": "^22.0.0", "@ngrx/signals": "^22.0.0", "@ngrx/store": "^22.0.0", "rxjs": "^7.0.0" }, "optionalPeers": ["@ngrx/store"] }, "sha512-sZ/3VO+ZtL0fzYmG680JQQ64t0Wh1Rh3k555Jj57CEE1+N/CbDzz9lIdJj4p8smkVGRmPhXrId2gajmnhV3gaA=="],
-
     "@angular-devkit/architect": ["@angular-devkit/architect@0.2202.4", "", { "dependencies": { "@angular-devkit/core": "22.2.4", "rxjs": "7.8.2" }, "bin": { "architect": "bin/cli.js" } }, "sha512-hafew1tft3+bnv+DjAtLDEq/Yx5/UyAz/+M4VC5EWQQhcFCN81X47szTX3F9dNeiZIQb8d/WmCnmlbHz6CyupA=="],
 
     "@angular-devkit/core": ["@angular-devkit/core@22.2.4", "", { "dependencies": { "ajv": "8.20.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", "picomatch": "4.0.7", "rxjs": "7.8.2", "source-map": "0.8.0" }, "peerDependencies": { "chokidar": "^5.0.0" }, "optionalPeers": ["chokidar"] }, "sha512-HDlsVK/qN7p5ttKgPvVLo87yrN0UcHR7OyQo1n/lvvMQcYrA0n01E+ix4t+q4C04ifpMbNQtrK0I1222OKi99w=="],
@@ -394,6 +392,8 @@
 
     "@napi-rs/nice-win32-x64-msvc": ["@napi-rs/nice-win32-x64-msvc@1.1.1", "", { "os": "win32", "cpu": "x64" }, "sha512-vB+4G/jBQCAh0jelMTY3+kgFy00Hlx2f2/1zjMoH821IbplbWZOkLiTYXQkygNTzQJTq5cvwBDgn2ppHD+bglQ=="],
 
+    "@ngrx-toolkit/core": ["@ngrx-toolkit/core@22.0.1", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/common": "^22.0.0", "@angular/core": "^22.0.0", "@ngrx/signals": "^22.0.0", "@ngrx/store": "^22.0.0", "rxjs": "^7.0.0" }, "optionalPeers": ["@ngrx/store"] }, "sha512-57DKzE4xIAA2Td2ZfLleCGuju7BjeK/mB1GvXX39oXNzxQ1xMlZoMfY9nUzobsPrOeJe/oLES3wkJyhrGmrsaQ=="],
+
     "@ngrx/signals": ["@ngrx/signals@22.0.0", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/core": "^22.0.0", "rxjs": "^6.5.3 || ^7.4.0" }, "optionalPeers": ["rxjs"] }, "sha512-jW/JqU/FuOXsC7pUufx3pfEvb1ZIVD+AlETdB5hatHkF1bW9gMFTL0L001Mht8awvr3SJUXoRcxfnhBGBWgjEQ=="],
 
     "@nodelib/fs.scandir": ["@nodelib/fs.scandir@2.1.5", "", { "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="],
diff --git a/frontend/package.json b/frontend/package.json
index 39f6849..b8e911c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,7 +22,6 @@
   "private": true,
   "packageManager": "bun@1.3.12",
   "dependencies": {
-    "@angular-architects/ngrx-toolkit": "^22.0.0",
     "@angular/cdk": "^22.2.4",
     "@angular/common": "^22.2.3",
     "@angular/compiler": "^22.2.3",
@@ -36,6 +35,7 @@
     "@fontsource-variable/instrument-sans": "5.3.0",
     "@jsverse/transloco": "^8.4.0",
     "@jsverse/transloco-messageformat": "^8.4.0",
+    "@ngrx-toolkit/core": "^22.0.1",
     "@ngrx/signals": "^22.0.0",
     "angular-oauth2-oidc": "^22.0.2",
     "d3-drag": "^3.0.0",
diff --git a/frontend/src/app/core/store/devtools.ts b/frontend/src/app/core/store/devtools.ts
index 5349f8c..f274a86 100644
--- a/frontend/src/app/core/store/devtools.ts
+++ b/frontend/src/app/core/store/devtools.ts
@@ -1,5 +1,5 @@
 import {isDevMode} from '@angular/core';
-import {withDevToolsStub, withDevtools} from '@angular-architects/ngrx-toolkit';
+import {withDevToolsStub, withDevtools} from '@ngrx-toolkit/core';
 
 /**
  * Connects a store to the Redux DevTools browser extension in a dev build and to a