diff --git a/examples/fdc3-chart-and-grid/js-datagrid/package.json b/examples/fdc3-chart-and-grid/js-datagrid/package.json
index f25e99c3b..8fc4ffc02 100644
--- a/examples/fdc3-chart-and-grid/js-datagrid/package.json
+++ b/examples/fdc3-chart-and-grid/js-datagrid/package.json
@@ -20,7 +20,7 @@
     "@angular/material": "21.1.5",
     "@angular/platform-browser": "21.1.5",
     "@angular/platform-browser-dynamic": "21.1.5",
-    "@angular/router": "21.1.5",
+    "@angular/router": "20.3.32",
     "@finos/fdc3": "~2.0.3",
     "material-icons": "1.13.14",
     "rxjs": "7.8.2",
diff --git a/examples/fdc3-trade-simulator/js-order-book/package.json b/examples/fdc3-trade-simulator/js-order-book/package.json
index ff2638f7d..144e4b5d1 100644
--- a/examples/fdc3-trade-simulator/js-order-book/package.json
+++ b/examples/fdc3-trade-simulator/js-order-book/package.json
@@ -18,7 +18,7 @@
     "@angular/material": "21.1.5",
     "@angular/platform-browser": "^21.1.5",
     "@angular/platform-browser-dynamic": "^21.1.5",
-    "@angular/router": "^21.1.5",
+    "@angular/router": "^20.3.32",
     "@finos/fdc3": "~2.0.3",
     "material-icons": "^1.13.14",
     "rxjs": "7.8.2",
diff --git a/examples/fdc3-trade-simulator/js-trader-app/package.json b/examples/fdc3-trade-simulator/js-trader-app/package.json
index cc03655cb..b6fa1f7d7 100644
--- a/examples/fdc3-trade-simulator/js-trader-app/package.json
+++ b/examples/fdc3-trade-simulator/js-trader-app/package.json
@@ -19,7 +19,7 @@
     "@angular/material": "21.1.5",
     "@angular/platform-browser": "^21.1.5",
     "@angular/platform-browser-dynamic": "^21.1.5",
-    "@angular/router": "^21.1.5",
+    "@angular/router": "^20.3.32",
     "@finos/fdc3": "^2.0.3",
     "material-icons": "^1.13.12",
     "rxjs": "7.8.2",
diff --git a/examples/js-chart-and-grid-messagerouter/js-datagrid/package.json b/examples/js-chart-and-grid-messagerouter/js-datagrid/package.json
index 5d97be98e..c3dfb9ac7 100644
--- a/examples/js-chart-and-grid-messagerouter/js-datagrid/package.json
+++ b/examples/js-chart-and-grid-messagerouter/js-datagrid/package.json
@@ -20,7 +20,7 @@
     "@angular/material": "21.1.5",
     "@angular/platform-browser": "21.1.5",
     "@angular/platform-browser-dynamic": "21.1.5",
-    "@angular/router": "21.1.5",
+    "@angular/router": "20.3.32",
     "material-icons": "1.13.14",
     "@morgan-stanley/composeui-messaging-client": "*",
     "rxjs": "7.8.2",
diff --git a/package-lock.json b/package-lock.json
index bd48e3e86..146b28a88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,7 +48,7 @@
       "dependencies": {
         "@angular/animations": "21.1.5",
         "@angular/cdk": "21.1.5",
-        "@angular/common": "^20.3.30",
+        "@angular/common": "20.3.30",
         "@angular/compiler": "20.3.28",
         "@angular/core": "21.1.5",
         "@angular/flex-layout": "^15.0.0-beta.42",
@@ -56,7 +56,7 @@
         "@angular/material": "21.1.5",
         "@angular/platform-browser": "21.1.5",
         "@angular/platform-browser-dynamic": "21.1.5",
-        "@angular/router": "21.1.5",
+        "@angular/router": "^20.3.32",
         "@finos/fdc3": "~2.0.3",
         "material-icons": "1.13.14",
         "rxjs": "7.8.2",
@@ -105,6 +105,24 @@
         "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
+    "examples/fdc3-chart-and-grid/js-datagrid/node_modules/@angular/router": {
+      "version": "20.3.32",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.32.tgz",
+      "integrity": "sha512-enTR59hEh1GYTkOT6kLQD8SNP7xXa/UrdJRmkVoX9HjIVq8fEha9MOgIR8/MWKVX7Py9+IlnwtZSUt4Hx8vneQ==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "20.3.32",
+        "@angular/core": "20.3.32",
+        "@angular/platform-browser": "20.3.32",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
     "examples/fdc3-chart-and-grid/js-datagrid/node_modules/@finos/fdc3": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@finos/fdc3/-/fdc3-2.0.3.tgz",
@@ -171,7 +189,7 @@
         "@angular/material": "21.1.5",
         "@angular/platform-browser": "^21.1.5",
         "@angular/platform-browser-dynamic": "^21.1.5",
-        "@angular/router": "^21.1.5",
+        "@angular/router": "^20.3.32",
         "@finos/fdc3": "~2.0.3",
         "material-icons": "^1.13.14",
         "rxjs": "7.8.2",
@@ -192,9 +210,9 @@
       }
     },
     "examples/fdc3-trade-simulator/js-order-book/node_modules/@angular/common": {
-      "version": "20.3.30",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.30.tgz",
-      "integrity": "sha512-XDeT5lshP2tpl9/6IAPmJ5M4zzOTJSUtRxfkOrxmNnNCH4+vbBv1RYs2bnUDdZNsFxRMrV/ZvpZfO7dZTAie+Q==",
+      "version": "20.3.32",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.32.tgz",
+      "integrity": "sha512-8ma8TJUYLDyg/V/8NrODLG2ZUrtJSHD9xjfXFo/u3+liZ/e8l9a5TD2hM9yExhbL2hvk6S4KReLuKL+t4AdXgw==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -203,7 +221,7 @@
         "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "20.3.30",
+        "@angular/core": "20.3.32",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
@@ -219,6 +237,24 @@
         "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
+    "examples/fdc3-trade-simulator/js-order-book/node_modules/@angular/router": {
+      "version": "20.3.32",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.32.tgz",
+      "integrity": "sha512-enTR59hEh1GYTkOT6kLQD8SNP7xXa/UrdJRmkVoX9HjIVq8fEha9MOgIR8/MWKVX7Py9+IlnwtZSUt4Hx8vneQ==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "20.3.32",
+        "@angular/core": "20.3.32",
+        "@angular/platform-browser": "20.3.32",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
     "examples/fdc3-trade-simulator/js-order-book/node_modules/@finos/fdc3": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@finos/fdc3/-/fdc3-2.0.3.tgz",
@@ -238,7 +274,7 @@
         "@angular/material": "21.1.5",
         "@angular/platform-browser": "^21.1.5",
         "@angular/platform-browser-dynamic": "^21.1.5",
-        "@angular/router": "^21.1.5",
+        "@angular/router": "^20.3.32",
         "@finos/fdc3": "^2.0.3",
         "material-icons": "^1.13.12",
         "rxjs": "7.8.2",
@@ -259,9 +295,9 @@
       }
     },
     "examples/fdc3-trade-simulator/js-trader-app/node_modules/@angular/common": {
-      "version": "20.3.30",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.30.tgz",
-      "integrity": "sha512-XDeT5lshP2tpl9/6IAPmJ5M4zzOTJSUtRxfkOrxmNnNCH4+vbBv1RYs2bnUDdZNsFxRMrV/ZvpZfO7dZTAie+Q==",
+      "version": "20.3.32",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.32.tgz",
+      "integrity": "sha512-8ma8TJUYLDyg/V/8NrODLG2ZUrtJSHD9xjfXFo/u3+liZ/e8l9a5TD2hM9yExhbL2hvk6S4KReLuKL+t4AdXgw==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -270,7 +306,7 @@
         "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "20.3.30",
+        "@angular/core": "20.3.32",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
@@ -286,6 +322,24 @@
         "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
+    "examples/fdc3-trade-simulator/js-trader-app/node_modules/@angular/router": {
+      "version": "20.3.32",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.32.tgz",
+      "integrity": "sha512-enTR59hEh1GYTkOT6kLQD8SNP7xXa/UrdJRmkVoX9HjIVq8fEha9MOgIR8/MWKVX7Py9+IlnwtZSUt4Hx8vneQ==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "20.3.32",
+        "@angular/core": "20.3.32",
+        "@angular/platform-browser": "20.3.32",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
     "examples/js-chart-and-grid-messagerouter/js-chart": {
       "name": "@morgan-stanley/composeui-example-chart-messagerouter",
       "version": "0.1.0",
@@ -316,7 +370,7 @@
       "dependencies": {
         "@angular/animations": "21.1.5",
         "@angular/cdk": "21.1.5",
-        "@angular/common": "^20.3.30",
+        "@angular/common": "20.3.30",
         "@angular/compiler": "20.3.28",
         "@angular/core": "21.1.5",
         "@angular/flex-layout": "^15.0.0-beta.42",
@@ -324,7 +378,7 @@
         "@angular/material": "21.1.5",
         "@angular/platform-browser": "21.1.5",
         "@angular/platform-browser-dynamic": "21.1.5",
-        "@angular/router": "21.1.5",
+        "@angular/router": "^20.3.32",
         "@morgan-stanley/composeui-messaging-client": "*",
         "material-icons": "1.13.14",
         "rxjs": "7.8.2",
@@ -372,6 +426,24 @@
         "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
+    "examples/js-chart-and-grid-messagerouter/js-datagrid/node_modules/@angular/router": {
+      "version": "20.3.32",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.32.tgz",
+      "integrity": "sha512-enTR59hEh1GYTkOT6kLQD8SNP7xXa/UrdJRmkVoX9HjIVq8fEha9MOgIR8/MWKVX7Py9+IlnwtZSUt4Hx8vneQ==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "20.3.32",
+        "@angular/core": "20.3.32",
+        "@angular/platform-browser": "20.3.32",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
     "node_modules/@acemir/cssom": {
       "version": "0.9.31",
       "resolved": "https://registry.npmjs.org/@acemir/cssom/-/cssom-0.9.31.tgz",
@@ -1698,24 +1770,6 @@
         "@angular/platform-browser": "21.1.5"
       }
     },
-    "node_modules/@angular/router": {
-      "version": "21.1.5",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-21.1.5.tgz",
-      "integrity": "sha512-OjFn6Nw51CU712CMbl2U9TxlCkzOmjMLYPAfnV4+RdG7o+/eOS2nV0oapJ88RNCw7Yl04PA1amc3ql3agDFd4A==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": "21.1.5",
-        "@angular/core": "21.1.5",
-        "@angular/platform-browser": "21.1.5",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
     "node_modules/@asamuzakjp/css-color": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.2.tgz",
@@ -26865,7 +26919,7 @@
         "@angular/material": "^20.2.14",
         "@angular/platform-browser": "^20.3.15",
         "@angular/platform-browser-dynamic": "^20.3.15",
-        "@angular/router": "^20.3.15",
+        "@angular/router": "^20.3.32",
         "@improbable-eng/grpc-web": "^0.15.0",
         "@types/google-protobuf": "^3.15.12",
         "google-protobuf": "^4.0.2",
@@ -27486,9 +27540,9 @@
       }
     },
     "prototypes/process-explorer/oss-frontend/node_modules/@angular/router": {
-      "version": "20.3.16",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.16.tgz",
-      "integrity": "sha512-e1LiQFZaajKqc00cY5FboIrWJZSMnZ64GDp5R0UejritYrqorQQQNOqP1W85BMuY2owibMmxVfX+dJg/Mc8PuQ==",
+      "version": "20.3.32",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.32.tgz",
+      "integrity": "sha512-enTR59hEh1GYTkOT6kLQD8SNP7xXa/UrdJRmkVoX9HjIVq8fEha9MOgIR8/MWKVX7Py9+IlnwtZSUt4Hx8vneQ==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -27497,9 +27551,9 @@
         "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "20.3.16",
-        "@angular/core": "20.3.16",
-        "@angular/platform-browser": "20.3.16",
+        "@angular/common": "20.3.32",
+        "@angular/core": "20.3.32",
+        "@angular/platform-browser": "20.3.32",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
diff --git a/prototypes/process-explorer/oss-frontend/package.json b/prototypes/process-explorer/oss-frontend/package.json
index 1c38645ef..ca14d7031 100644
--- a/prototypes/process-explorer/oss-frontend/package.json
+++ b/prototypes/process-explorer/oss-frontend/package.json
@@ -21,7 +21,7 @@
     "@angular/material": "^20.2.14",
     "@angular/platform-browser": "^20.3.15",
     "@angular/platform-browser-dynamic": "^20.3.15",
-    "@angular/router": "^20.3.15",
+    "@angular/router": "^20.3.32",
     "@improbable-eng/grpc-web": "^0.15.0",
     "@types/google-protobuf": "^3.15.12",
     "google-protobuf": "^4.0.2",