diff --git a/package-lock.json b/package-lock.json
index 323a3886c..a854cf8ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2935,16 +2935,6 @@
         "@types/json-schema": "*"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
@@ -4124,10 +4114,10 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "dev": true,
       "peerDependencies": {
         "acorn": "^8"
@@ -6350,9 +6340,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz",
-      "integrity": "sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -14276,21 +14266,20 @@
       "dev": true
     },
     "node_modules/webpack": {
-      "version": "5.91.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-      "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
+      "version": "5.95.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
       "dev": true,
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.5",
         "@webassemblyjs/ast": "^1.12.1",
         "@webassemblyjs/wasm-edit": "^1.12.1",
         "@webassemblyjs/wasm-parser": "^1.12.1",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.9.0",
+        "acorn-import-attributes": "^1.9.5",
         "browserslist": "^4.21.10",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.16.0",
+        "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
diff --git a/src/RouteServiceProvider.php b/src/RouteServiceProvider.php
index 16a18b19b..300810c6a 100644
--- a/src/RouteServiceProvider.php
+++ b/src/RouteServiceProvider.php
@@ -12,7 +12,7 @@
 use A17\Twill\Http\Middleware\ValidateBackHistory;
 use A17\Twill\Services\MediaLibrary\Glide;
 use A17\Twill\Facades\TwillRoutes;
-use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\ServiceProvider;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
@@ -29,26 +29,27 @@ public function boot(): void
         $this->registerRouteMiddlewares();
         $this->app->bind(TwillRoutes::class);
         $this->registerRouteMacros();
-        parent::boot();
     }
 
-    public function map(Router $router): void
+    public function register()
     {
-        \A17\Twill\Facades\TwillRoutes::registerRoutePatterns();
-
-        $this->mapInternalRoutes(
-            $router,
-            \A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
-            \A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
-            \A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
-        );
+        $this->callAfterResolving(Router::class, function (Router $router) {
+            \A17\Twill\Facades\TwillRoutes::registerRoutePatterns();
+
+            $this->mapInternalRoutes(
+                $router,
+                \A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
+                \A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
+                \A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
+            );
 
-        $this->mapHostRoutes(
-            $router,
-            \A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
-            \A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
-            \A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
-        );
+            $this->mapHostRoutes(
+                $router,
+                \A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
+                \A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
+                \A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
+            );
+        });
     }
 
     private function mapHostRoutes(