diff --git a/ponyracer/package.json b/ponyracer/package.json
index 821ed66..b2343d1 100644
--- a/ponyracer/package.json
+++ b/ponyracer/package.json
@@ -20,15 +20,15 @@
     "@angular/platform-browser-dynamic": "^18.0.0-next.0",
     "@angular/platform-server": "^18.0.0-next.0",
     "@angular/router": "^18.0.0-next.0",
-    "@angular/ssr": "^18.0.0-next.2",
+    "@angular/ssr": "^18.0.0-next.3",
     "express": "^4.18.2",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.14.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.0.0-next.2",
-    "@angular/cli": "^18.0.0-next.2",
+    "@angular-devkit/build-angular": "^18.0.0-next.3",
+    "@angular/cli": "^18.0.0-next.3",
     "@angular/compiler-cli": "^18.0.0-next.0",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~5.1.0",
diff --git a/ponyracer/server.ts b/ponyracer/server.ts
index 7083b14..1a0df5e 100644
--- a/ponyracer/server.ts
+++ b/ponyracer/server.ts
@@ -20,12 +20,13 @@ export function app(): express.Express {
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
   // Serve static files from /browser
-  server.get('*.*', express.static(browserDistFolder, {
-    maxAge: '1y'
+  server.get('**', express.static(browserDistFolder, {
+    maxAge: '1y',
+    index: 'index.html',
   }));
 
   // All regular routes use the Angular engine
-  server.get('*', (req, res, next) => {
+  server.get('**', (req, res, next) => {
     const { protocol, originalUrl, baseUrl, headers } = req;
 
     commonEngine