diff --git a/app/router.js b/app/router.js
index a3e7db36..e9694a6f 100644
--- a/app/router.js
+++ b/app/router.js
@@ -1,4 +1,4 @@
-import EmberRouter from '@ember/routing/router';
+import EmberRouter from '@embroider/router';
 import { scheduleOnce } from '@ember/runloop';
 import config from 'ember-api-docs/config/environment';
 import { inject as service } from '@ember/service';
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 2b2f5ef9..ac6567d2 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -70,6 +70,16 @@ module.exports = function (defaults) {
     staticHelpers: true,
     staticModifiers: true,
     staticComponents: true,
+    splitAtRoutes: [
+      'project-version.classes',
+      'project-version.functions',
+      'project-version.namespaces',
+      'project-version.modules',
+      'class',
+      'module',
+      'data-class',
+      'data-module',
+    ],
   });
 
   return mergeTrees([require('prember').prerender(app, appTree), mappingsTree]);
diff --git a/package.json b/package.json
index 74379004..4753db37 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "@ember/test-helpers": "^2.6.0",
     "@embroider/compat": "^3.4.3",
     "@embroider/core": "^3.4.3",
+    "@embroider/router": "^2.1.8",
     "@embroider/webpack": "^3.2.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 71ec8f9e..7398ac52 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,6 +20,9 @@ devDependencies:
   '@embroider/core':
     specifier: ^3.4.3
     version: 3.4.10
+  '@embroider/router':
+    specifier: ^2.1.8
+    version: 2.1.8(@embroider/core@3.4.10)
   '@embroider/webpack':
     specifier: ^3.2.1
     version: 3.2.3(@embroider/core@3.4.10)(webpack@5.91.0)
@@ -2335,6 +2338,21 @@ packages:
       - supports-color
     dev: true
 
+  /@embroider/router@2.1.8(@embroider/core@3.4.10):
+    resolution: {integrity: sha512-Dvp8YdqAWT6T0yzBZfUe6SyaVNH7xoXBlrxF1LbqoF/Q2buNzDy9oAQ5tTnbX1x+5KOrM0ryOjfeF0GoqkfobA==}
+    peerDependencies:
+      '@embroider/core': ^2.0.0||^3.0.0
+    peerDependenciesMeta:
+      '@embroider/core':
+        optional: true
+    dependencies:
+      '@ember/test-waiters': 3.1.0
+      '@embroider/addon-shim': 1.8.9
+      '@embroider/core': 3.4.10
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@embroider/shared-internals@1.8.3:
     resolution: {integrity: sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w==}
     engines: {node: 12.* || 14.* || >= 16}