diff --git a/ponyracer/angular.json b/ponyracer/angular.json
index f42262d..f181cfd 100644
--- a/ponyracer/angular.json
+++ b/ponyracer/angular.json
@@ -21,8 +21,10 @@
             ],
             "tsConfig": "tsconfig.app.json",
             "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "**/*",
+                "input": "public"
+              }
             ],
             "styles": [
               "src/styles.css"
@@ -85,8 +87,10 @@
             ],
             "tsConfig": "tsconfig.spec.json",
             "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "**/*",
+                "input": "public"
+              }
             ],
             "styles": [
               "src/styles.css"
diff --git a/ponyracer/package.json b/ponyracer/package.json
index 9b57599..c2caf44 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.0",
+    "@angular/ssr": "^18.0.0-next.1",
     "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.0",
-    "@angular/cli": "^18.0.0-next.0",
+    "@angular-devkit/build-angular": "^18.0.0-next.1",
+    "@angular/cli": "^18.0.0-next.1",
     "@angular/compiler-cli": "^18.0.0-next.0",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~5.1.0",
diff --git a/ponyracer/src/favicon.ico b/ponyracer/public/favicon.ico
similarity index 100%
rename from ponyracer/src/favicon.ico
rename to ponyracer/public/favicon.ico
diff --git a/ponyracer/server.ts b/ponyracer/server.ts
index 7083b14..721d0d4 100644
--- a/ponyracer/server.ts
+++ b/ponyracer/server.ts
@@ -44,7 +44,7 @@ export function app(): express.Express {
 }
 
 function run(): void {
-  const port = process.env['PORT'] || 4000;
+  const port = process.env['SSR_PORT'] || 4000;
 
   // Start up the Node server
   const server = app();
diff --git a/ponyracer/src/assets/.gitkeep b/ponyracer/src/assets/.gitkeep
deleted file mode 100644
index e69de29..0000000