From 570da82434e37d0c8ecd2772f61e9896da89adb0 Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Sat, 9 May 2026 17:59:17 -0700
Subject: [PATCH] server refactor

---
 .github/workflows/deploy.yml                  |    2 +
 deploy.sh                                     |    6 +
 index.html                                    |   10 +-
 package-lock.json                             |   16 +
 package.json                                  |    2 +-
 src/client/AccountModal.ts                    |    5 +-
 src/client/ClientEnv.ts                       |  112 ++
 src/client/ClientGameRunner.ts                |    6 +-
 src/client/GameModeSelector.ts                |    6 +-
 src/client/HostLobbyModal.ts                  |    8 +-
 src/client/JoinLobbyModal.ts                  |   11 +-
 src/client/LobbySocket.ts                     |    5 +-
 src/client/LocalServer.ts                     |    6 +-
 src/client/Main.ts                            |   22 +-
 src/client/Matchmaking.ts                     |   37 +-
 src/client/Transport.ts                       |    5 +-
 src/client/components/CopyButton.ts           |    5 +-
 src/client/graphics/AnimatedSpriteLoader.ts   |    2 +-
 src/client/graphics/SpriteLoader.ts           |    2 +-
 src/client/graphics/fx/SpriteFx.ts            |    2 +-
 src/client/graphics/layers/FxLayer.ts         |    2 +-
 src/client/graphics/layers/MultiTabModal.ts   |    3 +-
 src/client/graphics/layers/NameLayer.ts       |    3 +-
 .../graphics/layers/StructureDrawingUtils.ts  |    2 +-
 .../graphics/layers/StructureIconsLayer.ts    |    2 +-
 src/client/graphics/layers/StructureLayer.ts  |    2 +-
 src/client/graphics/layers/TerrainLayer.ts    |    3 +-
 src/client/graphics/layers/TerritoryLayer.ts  |    2 +-
 src/client/graphics/layers/UILayer.ts         |    2 +-
 src/client/graphics/layers/UnitLayer.ts       |    2 +-
 src/core/AssetUrls.ts                         |   19 +-
 src/core/GameRunner.ts                        |    4 +-
 src/core/configuration/Config.ts              | 1074 ++++++++++++++---
 src/core/configuration/ConfigLoader.ts        |  119 --
 src/core/configuration/DefaultConfig.ts       | 1014 ----------------
 src/core/configuration/DevConfig.ts           |   55 -
 src/core/configuration/Env.ts                 |   12 +
 src/core/configuration/PastelTheme.ts         |    2 +-
 src/core/configuration/PreprodConfig.ts       |   26 -
 src/core/configuration/ProdConfig.ts          |   17 -
 src/core/configuration/Theme.ts               |   31 +
 src/core/worker/Worker.worker.ts              |    2 +-
 src/server/Archive.ts                         |   18 +-
 src/server/GameManager.ts                     |    7 +-
 src/server/GamePreviewRoute.ts                |   20 +-
 src/server/GameServer.ts                      |    8 +-
 src/server/Logger.ts                          |   10 +-
 src/server/MapPlaylist.ts                     |    2 +-
 src/server/Master.ts                          |   17 +-
 src/server/MasterLobbyService.ts              |   14 +-
 src/server/OtelResource.ts                    |    6 +-
 src/server/RenderHtml.ts                      |    4 +
 src/server/ServerEnv.ts                       |  146 +++
 src/server/Turnstile.ts                       |    7 +-
 src/server/Worker.ts                          |   44 +-
 src/server/WorkerMetrics.ts                   |   11 +-
 src/server/jwt.ts                             |   17 +-
 tests/client/clan/ClanModalTestUtils.ts       |    2 +-
 tests/core/configuration/ConfigLoader.test.ts |   47 +-
 tests/core/game/TrainStation.test.ts          |   15 +-
 tests/core/pathfinding/_fixtures.ts           |    9 +-
 tests/pathfinding/utils.ts                    |    2 -
 tests/server/Archive.test.ts                  |    6 +-
 tests/server/GameLifecycle.test.ts            |    5 +-
 tests/server/KickPlayerAuthorization.test.ts  |   12 +-
 tests/server/MasterLobbyServiceHealth.test.ts |    7 +-
 tests/util/Setup.ts                           |   10 +-
 tests/util/TestConfig.ts                      |    8 +-
 tests/util/TestServerConfig.ts                |   91 --
 vite.config.ts                                |    6 +
 70 files changed, 1424 insertions(+), 1795 deletions(-)
 create mode 100644 src/client/ClientEnv.ts
 delete mode 100644 src/core/configuration/ConfigLoader.ts
 delete mode 100644 src/core/configuration/DefaultConfig.ts
 delete mode 100644 src/core/configuration/DevConfig.ts
 delete mode 100644 src/core/configuration/PreprodConfig.ts
 delete mode 100644 src/core/configuration/ProdConfig.ts
 create mode 100644 src/core/configuration/Theme.ts
 create mode 100644 src/server/ServerEnv.ts
 delete mode 100644 tests/util/TestServerConfig.ts

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f1284dcbf..cf3f6e556 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -139,6 +139,8 @@ jobs:
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_AUTH_HEADER: ${{ secrets.OTEL_AUTH_HEADER }}
           API_KEY: ${{ secrets.API_KEY }}
+          NUM_WORKERS: ${{ vars.NUM_WORKERS }}
+          TURNSTILE_SITE_KEY: ${{ vars.TURNSTILE_SITE_KEY }}
           SERVER_HOST_MASTERS: ${{ secrets.SERVER_HOST_MASTERS }}
           SERVER_HOST_FALK2: ${{ secrets.SERVER_HOST_FALK2 }}
           SERVER_HOST_STAGING: ${{ secrets.SERVER_HOST_STAGING }}
diff --git a/deploy.sh b/deploy.sh
index 53c90df21..f327a57a8 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -66,6 +66,9 @@ else
     GHCR_IMAGE="${GHCR_USERNAME}/${GHCR_REPO}:${VERSION_TAG}"
 fi
 
+# jwtAudience always matched DOMAIN in the old per-env configs.
+JWT_AUDIENCE="$DOMAIN"
+
 if [ "$HOST" == "staging" ]; then
     print_header "DEPLOYING TO STAGING HOST"
     SERVER_HOST=$SERVER_HOST_STAGING
@@ -138,6 +141,9 @@ API_KEY=$API_KEY
 DOMAIN=$DOMAIN
 SUBDOMAIN=$SUBDOMAIN
 CDN_BASE=$CDN_BASE
+JWT_AUDIENCE=$JWT_AUDIENCE
+NUM_WORKERS=$NUM_WORKERS
+TURNSTILE_SITE_KEY=$TURNSTILE_SITE_KEY
 OTEL_EXPORTER_OTLP_ENDPOINT=$OTEL_EXPORTER_OTLP_ENDPOINT
 OTEL_AUTH_HEADER=$OTEL_AUTH_HEADER
 EOL
diff --git a/index.html b/index.html
index b196749fd..aca2853cd 100644
--- a/index.html
+++ b/index.html
@@ -60,11 +60,15 @@
 
     <!-- Injected from Server env -->
     <script>
-      window.GIT_COMMIT = <%- gitCommit %>;
-      window.ASSET_MANIFEST = <%- assetManifest %>;
-      window.CDN_BASE = <%- cdnBase %>;
       window.BOOTSTRAP_CONFIG = {
+        gitCommit: <%- gitCommit %>,
+        assetManifest: <%- assetManifest %>,
+        cdnBase: <%- cdnBase %>,
         gameEnv: <%- gameEnv %>,
+        numWorkers: <%- numWorkers %>,
+        turnstileSiteKey: <%- turnstileSiteKey %>,
+        jwtAudience: <%- jwtAudience %>,
+        instanceId: <%- instanceId %>,
       };
       document.documentElement.style.setProperty(
         "--background-image-url",
diff --git a/package-lock.json b/package-lock.json
index 6667c0493..6d479c356 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12282,6 +12282,22 @@
         }
       }
     },
+    "node_modules/vite-tsconfig-paths/node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz",
diff --git a/package.json b/package.json
index e0e3cecc2..63f4845ee 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "build-prod": "concurrently --kill-others-on-fail \"tsc --noEmit\" \"vite build\"",
     "start:client": "vite",
     "start:server": "tsx src/server/Server.ts",
-    "start:server-dev": "cross-env GAME_ENV=dev tsx src/server/Server.ts",
+    "start:server-dev": "cross-env GAME_ENV=dev NUM_WORKERS=2 TURNSTILE_SITE_KEY=1x00000000000000000000AA JWT_AUDIENCE=localhost API_KEY=WARNING_DEV_API_KEY_DO_NOT_USE_IN_PRODUCTION DOMAIN=localhost GIT_COMMIT=DEV tsx src/server/Server.ts",
     "dev": "cross-env GAME_ENV=dev concurrently \"npm run start:client\" \"npm run start:server-dev\"",
     "dev:staging": "cross-env GAME_ENV=dev API_DOMAIN=api.openfront.dev concurrently \"npm run start:client\" \"npm run start:server-dev\"",
     "dev:prod": "cross-env GAME_ENV=dev API_DOMAIN=api.openfront.io concurrently \"npm run start:client\" \"npm run start:server-dev\"",
diff --git a/src/client/AccountModal.ts b/src/client/AccountModal.ts
index fb405f867..08d92586e 100644
--- a/src/client/AccountModal.ts
+++ b/src/client/AccountModal.ts
@@ -1,12 +1,12 @@
 import { html, TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators.js";
+import { ClientEnv } from "src/client/ClientEnv";
 import {
   PlayerGame,
   PlayerStatsTree,
   UserMeResponse,
 } from "../core/ApiSchemas";
 import { assetUrl } from "../core/AssetUrls";
-import { getRuntimeClientServerConfig } from "../core/configuration/ConfigLoader";
 import { fetchPlayerById, getUserMe } from "./Api";
 import { discordLogin, logOut, sendMagicLink } from "./Auth";
 import "./components/baseComponents/stats/DiscordUserHeader";
@@ -229,9 +229,8 @@ export class AccountModal extends BaseModal {
 
   private async viewGame(gameId: string): Promise<void> {
     this.close();
-    const config = await getRuntimeClientServerConfig();
     const encodedGameId = encodeURIComponent(gameId);
-    const newUrl = `/${config.workerPath(gameId)}/game/${encodedGameId}`;
+    const newUrl = `/${ClientEnv.workerPath(gameId)}/game/${encodedGameId}`;
 
     history.pushState({ join: gameId }, "", newUrl);
     window.dispatchEvent(
diff --git a/src/client/ClientEnv.ts b/src/client/ClientEnv.ts
new file mode 100644
index 000000000..015c4ce85
--- /dev/null
+++ b/src/client/ClientEnv.ts
@@ -0,0 +1,112 @@
+import { JWK } from "jose";
+import { z } from "zod";
+import { GameID } from "../core/Schemas";
+import { simpleHash } from "../core/Util";
+import {
+  GameEnv,
+  JwksSchema,
+  parseGameEnv,
+} from "../core/configuration/Config";
+
+export class ClientEnv {
+  private static values: ClientEnvValues | null = null;
+  private static publicKey: JWK | null = null;
+
+  /** Test-only. */
+  static reset(): void {
+    ClientEnv.values = null;
+    ClientEnv.publicKey = null;
+  }
+
+  private static get(): ClientEnvValues {
+    if (ClientEnv.values) return ClientEnv.values;
+    if (typeof window === "undefined") {
+      throw new Error("ClientEnv is only available on the browser main thread");
+    }
+    const bc = window.BOOTSTRAP_CONFIG;
+    if (
+      !bc ||
+      bc.gameEnv === undefined ||
+      bc.numWorkers === undefined ||
+      bc.turnstileSiteKey === undefined ||
+      bc.jwtAudience === undefined
+    ) {
+      throw new Error("Missing BOOTSTRAP_CONFIG");
+    }
+    if (bc.instanceId === undefined) {
+      throw new Error("Missing BOOTSTRAP_CONFIG");
+    }
+    ClientEnv.values = {
+      gameEnv: parseGameEnv(bc.gameEnv),
+      numWorkers: bc.numWorkers,
+      turnstileSiteKey: bc.turnstileSiteKey,
+      jwtAudience: bc.jwtAudience,
+      instanceId: bc.instanceId,
+    };
+    return ClientEnv.values;
+  }
+
+  // TODO: the following methods are duplicated on ServerEnv. The two classes
+  // read from different sources (window.BOOTSTRAP_CONFIG vs process.env) but
+  // the derived logic is identical. Consolidate into a shared helper that
+  // takes a source so we don't have to keep them in sync by hand.
+  static env(): GameEnv {
+    return ClientEnv.get().gameEnv;
+  }
+  static numWorkers(): number {
+    return ClientEnv.get().numWorkers;
+  }
+  static turnstileSiteKey(): string {
+    return ClientEnv.get().turnstileSiteKey;
+  }
+  static jwtAudience(): string {
+    return ClientEnv.get().jwtAudience;
+  }
+  static instanceId(): string {
+    return ClientEnv.get().instanceId;
+  }
+  static jwtIssuer(): string {
+    const audience = ClientEnv.jwtAudience();
+    return audience === "localhost"
+      ? "http://localhost:8787"
+      : `https://api.${audience}`;
+  }
+  static async jwkPublicKey(): Promise<JWK> {
+    if (ClientEnv.publicKey) return ClientEnv.publicKey;
+    const jwksUrl = ClientEnv.jwtIssuer() + "/.well-known/jwks.json";
+    console.log(`Fetching JWKS from ${jwksUrl}`);
+    const response = await fetch(jwksUrl);
+    const result = JwksSchema.safeParse(await response.json());
+    if (!result.success) {
+      const error = z.prettifyError(result.error);
+      console.error("Error parsing JWKS", error);
+      throw new Error("Invalid JWKS");
+    }
+    ClientEnv.publicKey = result.data.keys[0];
+    return ClientEnv.publicKey;
+  }
+  static turnIntervalMs(): number {
+    return 100;
+  }
+  static gameCreationRate(): number {
+    return ClientEnv.env() === GameEnv.Dev ? 5 * 1000 : 2 * 60 * 1000;
+  }
+  static workerIndex(gameID: GameID): number {
+    return simpleHash(gameID) % ClientEnv.numWorkers();
+  }
+  static workerPath(gameID: GameID): string {
+    return `w${ClientEnv.workerIndex(gameID)}`;
+  }
+}
+/**
+ * Values that flow from server → client via index.html. Set on the server from
+ * process.env, then re-hydrated on the client from window.BOOTSTRAP_CONFIG.
+ */
+
+export interface ClientEnvValues {
+  gameEnv: GameEnv;
+  numWorkers: number;
+  turnstileSiteKey: string;
+  jwtAudience: string;
+  instanceId: string;
+}
diff --git a/src/client/ClientGameRunner.ts b/src/client/ClientGameRunner.ts
index 7fd16a306..1981a4e1d 100644
--- a/src/client/ClientGameRunner.ts
+++ b/src/client/ClientGameRunner.ts
@@ -1,3 +1,4 @@
+import { Config } from "src/core/configuration/Config";
 import { translateText } from "../client/Utils";
 import { EventBus } from "../core/EventBus";
 import {
@@ -11,8 +12,6 @@ import {
   ServerMessage,
 } from "../core/Schemas";
 import { createPartialGameRecord, findClosestBy, replacer } from "../core/Util";
-import { ServerConfig } from "../core/configuration/Config";
-import { getGameLogicConfig } from "../core/configuration/ConfigLoader";
 import { BuildableUnit, Structures, UnitType } from "../core/game/Game";
 import { TileRef } from "../core/game/GameMap";
 import { GameMapLoader } from "../core/game/GameMapLoader";
@@ -57,7 +56,6 @@ import { GoToPlayerEvent } from "./graphics/TransformHandler";
 import { SoundManager } from "./sound/SoundManager";
 
 export interface LobbyConfig {
-  serverConfig: ServerConfig;
   cosmetics: PlayerCosmeticRefs;
   playerName: string;
   playerClanTag: string | null;
@@ -232,7 +230,7 @@ async function createClientGame(
   if (lobbyConfig.gameStartInfo === undefined) {
     throw new Error("missing gameStartInfo");
   }
-  const config = await getGameLogicConfig(
+  const config = new Config(
     lobbyConfig.gameStartInfo.config,
     userSettings,
     lobbyConfig.gameRecord !== undefined,
diff --git a/src/client/GameModeSelector.ts b/src/client/GameModeSelector.ts
index b2d7e0324..b9cfa0c06 100644
--- a/src/client/GameModeSelector.ts
+++ b/src/client/GameModeSelector.ts
@@ -1,6 +1,6 @@
 import { html, LitElement, nothing, type TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { getRuntimeClientServerConfig } from "src/core/configuration/ConfigLoader";
+import { ClientEnv } from "src/client/ClientEnv";
 import {
   Duos,
   GameMapType,
@@ -59,9 +59,7 @@ export class GameModeSelector extends LitElement {
   connectedCallback() {
     super.connectedCallback();
     this.lobbySocket.start();
-    getRuntimeClientServerConfig().then((config) => {
-      this.defaultLobbyTime = config.gameCreationRate() / 1000;
-    });
+    this.defaultLobbyTime = ClientEnv.gameCreationRate() / 1000;
   }
 
   disconnectedCallback() {
diff --git a/src/client/HostLobbyModal.ts b/src/client/HostLobbyModal.ts
index c80b8c4f8..aad4fde6c 100644
--- a/src/client/HostLobbyModal.ts
+++ b/src/client/HostLobbyModal.ts
@@ -1,7 +1,7 @@
 import { html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
+import { ClientEnv } from "src/client/ClientEnv";
 import { translateText } from "../client/Utils";
-import { getRuntimeClientServerConfig } from "../core/configuration/ConfigLoader";
 import { EventBus } from "../core/EventBus";
 import {
   Difficulty,
@@ -121,8 +121,7 @@ export class HostLobbyModal extends BaseModal {
         return link;
       }
     }
-    const config = await getRuntimeClientServerConfig();
-    return `${window.location.origin}/${config.workerPath(this.lobbyId)}/game/${this.lobbyId}?lobby&s=${encodeURIComponent(this.lobbyUrlSuffix)}`;
+    return `${window.location.origin}/${ClientEnv.workerPath(this.lobbyId)}/game/${this.lobbyId}?lobby&s=${encodeURIComponent(this.lobbyUrlSuffix)}`;
   }
 
   private async constructUrl(): Promise<string> {
@@ -1050,13 +1049,12 @@ export class HostLobbyModal extends BaseModal {
 }
 
 async function createLobby(gameID: string): Promise<GameInfo> {
-  const config = await getRuntimeClientServerConfig();
   // Send JWT token for creator identification - server extracts persistentID from it
   // persistentID should never be exposed to other clients
   const token = await getPlayToken();
   try {
     const response = await fetch(
-      `/${config.workerPath(gameID)}/api/create_game/${gameID}`,
+      `/${ClientEnv.workerPath(gameID)}/api/create_game/${gameID}`,
       {
         method: "POST",
         headers: {
diff --git a/src/client/JoinLobbyModal.ts b/src/client/JoinLobbyModal.ts
index dea832b87..5b408c3b1 100644
--- a/src/client/JoinLobbyModal.ts
+++ b/src/client/JoinLobbyModal.ts
@@ -1,5 +1,6 @@
 import { html, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators.js";
+import { ClientEnv } from "src/client/ClientEnv";
 import {
   calculateServerTimeOffset,
   getMapName,
@@ -19,7 +20,6 @@ import {
   LobbyInfoEvent,
   PublicGameInfo,
 } from "../core/Schemas";
-import { getRuntimeClientServerConfig } from "../core/configuration/ConfigLoader";
 import {
   Difficulty,
   GameMapSize,
@@ -967,8 +967,7 @@ export class JoinLobbyModal extends BaseModal {
   }
 
   private async checkActiveLobby(lobbyId: string): Promise<boolean> {
-    const config = await getRuntimeClientServerConfig();
-    const url = `/${config.workerPath(lobbyId)}/api/game/${lobbyId}/exists`;
+    const url = `/${ClientEnv.workerPath(lobbyId)}/api/game/${lobbyId}/exists`;
 
     const response = await fetch(url, {
       method: "GET",
@@ -1037,9 +1036,11 @@ export class JoinLobbyModal extends BaseModal {
       return "version_mismatch";
     }
 
+    const gitCommit = window.BOOTSTRAP_CONFIG?.gitCommit;
     if (
-      window.GIT_COMMIT !== "DEV" &&
-      parsed.data.gitCommit !== window.GIT_COMMIT
+      gitCommit !== "DEV" &&
+      gitCommit !== undefined &&
+      parsed.data.gitCommit !== gitCommit
     ) {
       const safeLobbyId = this.sanitizeForLog(lobbyId);
       console.warn(
diff --git a/src/client/LobbySocket.ts b/src/client/LobbySocket.ts
index e664329b7..92202ff63 100644
--- a/src/client/LobbySocket.ts
+++ b/src/client/LobbySocket.ts
@@ -1,4 +1,4 @@
-import { getRuntimeClientServerConfig } from "../core/configuration/ConfigLoader";
+import { ClientEnv } from "src/client/ClientEnv";
 import { PublicGames, PublicGamesSchema } from "../core/Schemas";
 
 interface LobbySocketOptions {
@@ -35,8 +35,7 @@ export class PublicLobbySocket {
     this.stopped = false;
     this.wsConnectionAttempts = 0;
     // Get config to determine number of workers, then pick a random one
-    const config = await getRuntimeClientServerConfig();
-    this.workerPath = getRandomWorkerPath(config.numWorkers());
+    this.workerPath = getRandomWorkerPath(ClientEnv.numWorkers());
     this.connectWebSocket();
   }
 
diff --git a/src/client/LocalServer.ts b/src/client/LocalServer.ts
index aeefc1581..0304224bf 100644
--- a/src/client/LocalServer.ts
+++ b/src/client/LocalServer.ts
@@ -1,3 +1,4 @@
+import { ClientEnv } from "src/client/ClientEnv";
 import { z } from "zod";
 import { EventBus } from "../core/EventBus";
 import {
@@ -81,8 +82,7 @@ export class LocalServer {
     console.log("local server starting");
     this.turnCheckInterval = setInterval(() => {
       const turnIntervalMs =
-        this.lobbyConfig.serverConfig.turnIntervalMs() *
-        this.replaySpeedMultiplier;
+        ClientEnv.turnIntervalMs() * this.replaySpeedMultiplier;
       const backlog = Math.max(0, this.turns.length - this.turnsExecuted);
       const allowReplayBacklog =
         this.replaySpeedMultiplier === ReplaySpeedMultiplier.fastest &&
@@ -297,7 +297,7 @@ export class LocalServer {
       console.error("Error parsing game record", error);
       return;
     }
-    const workerPath = this.lobbyConfig.serverConfig.workerPath(
+    const workerPath = ClientEnv.workerPath(
       this.lobbyConfig.gameStartInfo.gameID,
     );
 
diff --git a/src/client/Main.ts b/src/client/Main.ts
index cb009ba9d..8a4ce179f 100644
--- a/src/client/Main.ts
+++ b/src/client/Main.ts
@@ -1,4 +1,5 @@
 import version from "resources/version.txt?raw";
+import { ClientEnv } from "src/client/ClientEnv";
 import { UserMeResponse } from "../core/ApiSchemas";
 import { assetUrl } from "../core/AssetUrls";
 import { EventBus } from "../core/EventBus";
@@ -10,7 +11,6 @@ import {
   PublicGameInfo,
 } from "../core/Schemas";
 import { GameEnv } from "../core/configuration/Config";
-import { getRuntimeClientServerConfig } from "../core/configuration/ConfigLoader";
 import { GameType } from "../core/game/Game";
 import {
   DARK_MODE_KEY,
@@ -169,7 +169,6 @@ function updateAccountNavButton(userMeResponse: UserMeResponse | false) {
 
 declare global {
   interface Window {
-    GIT_COMMIT: string;
     turnstile: any;
     adsEnabled: boolean;
     PageOS: {
@@ -770,16 +769,14 @@ class Client {
     if (lobby.source === "public") {
       this.joinModal?.open(lobby.gameID, lobby.publicLobbyInfo);
     }
-    const config = await getRuntimeClientServerConfig();
     // Only update URL immediately for private lobbies, not public ones
     if (lobby.source !== "public") {
-      this.updateJoinUrlForShare(lobby.gameID, config);
+      this.updateJoinUrlForShare(lobby.gameID);
     }
     const auth = await userAuth();
     const playerRole = auth !== false ? (auth.claims.role ?? null) : null;
     const newLobbyHandle = joinLobby(this.eventBus, {
       gameID: lobby.gameID,
-      serverConfig: config,
       cosmetics: await getPlayerCosmeticsRefs(),
       turnstileToken: await this.getTurnstileToken(lobby),
       playerName: this.usernameInput?.getUsername() ?? genAnonUsername(),
@@ -881,7 +878,7 @@ class Client {
         "",
         lobbyIdHidden
           ? "/streamer-mode"
-          : `/${config.workerPath(lobby.gameID)}/game/${lobby.gameID}?live`,
+          : `/${ClientEnv.workerPath(lobby.gameID)}/game/${lobby.gameID}?live`,
       );
 
       // Store current URL for popstate confirmation
@@ -889,14 +886,11 @@ class Client {
     });
   }
 
-  private updateJoinUrlForShare(
-    lobbyId: string,
-    config: Awaited<ReturnType<typeof getRuntimeClientServerConfig>>,
-  ) {
+  private updateJoinUrlForShare(lobbyId: string) {
     const lobbyIdHidden = !this.userSettings.lobbyIdVisibility();
     const targetUrl = lobbyIdHidden
       ? "/streamer-mode"
-      : `/${config.workerPath(lobbyId)}/game/${lobbyId}`;
+      : `/${ClientEnv.workerPath(lobbyId)}/game/${lobbyId}`;
     const currentUrl = window.location.pathname;
 
     if (currentUrl !== targetUrl) {
@@ -970,9 +964,8 @@ class Client {
   private async getTurnstileToken(
     lobby: JoinLobbyEvent,
   ): Promise<string | null> {
-    const config = await getRuntimeClientServerConfig();
     if (
-      config.env() === GameEnv.Dev ||
+      ClientEnv.env() === GameEnv.Dev ||
       lobby.gameStartInfo?.config.gameType === GameType.Singleplayer
     ) {
       return null;
@@ -1048,9 +1041,8 @@ async function getTurnstileToken(): Promise<{
     throw new Error("Failed to load Turnstile script");
   }
 
-  const config = await getRuntimeClientServerConfig();
   const widgetId = window.turnstile.render("#turnstile-container", {
-    sitekey: config.turnstileSiteKey(),
+    sitekey: ClientEnv.turnstileSiteKey(),
     size: "normal",
     appearance: "interaction-only",
     theme: "light",
diff --git a/src/client/Matchmaking.ts b/src/client/Matchmaking.ts
index a15660853..f0f02a112 100644
--- a/src/client/Matchmaking.ts
+++ b/src/client/Matchmaking.ts
@@ -1,7 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
+import { ClientEnv } from "src/client/ClientEnv";
 import { UserMeResponse } from "../core/ApiSchemas";
-import { getRuntimeClientServerConfig } from "../core/configuration/ConfigLoader";
 import { getUserMe, hasLinkedAccount } from "./Api";
 import { getPlayToken } from "./Auth";
 import { BaseModal } from "./components/BaseModal";
@@ -12,7 +12,6 @@ import { translateText } from "./Utils";
 
 @customElement("matchmaking-modal")
 export class MatchmakingModal extends BaseModal {
-  private static instanceIdPromise: Promise<string> | null = null;
   private gameCheckInterval: ReturnType<typeof setInterval> | null = null;
   private connectTimeout: ReturnType<typeof setTimeout> | null = null;
   @state() private connected = false;
@@ -86,11 +85,8 @@ export class MatchmakingModal extends BaseModal {
   }
 
   private async connect() {
-    const config = await getRuntimeClientServerConfig();
-    const instanceId = await MatchmakingModal.getInstanceId();
-
     this.socket = new WebSocket(
-      `${config.jwtIssuer()}/matchmaking/join?instance_id=${encodeURIComponent(instanceId)}`,
+      `${ClientEnv.jwtIssuer()}/matchmaking/join?instance_id=${encodeURIComponent(ClientEnv.instanceId())}`,
     );
     this.socket.onopen = async () => {
       console.log("Connected to matchmaking server");
@@ -131,32 +127,6 @@ export class MatchmakingModal extends BaseModal {
     };
   }
 
-  private static async getInstanceId(): Promise<string> {
-    MatchmakingModal.instanceIdPromise ??= fetch("/api/instance", {
-      cache: "no-store",
-    })
-      .then(async (response) => {
-        if (!response.ok) {
-          throw new Error(
-            `Failed to load instance id: ${response.status} ${response.statusText}`,
-          );
-        }
-
-        const data = (await response.json()) as { instanceId?: string };
-        if (!data.instanceId) {
-          throw new Error("Missing instance id");
-        }
-
-        return data.instanceId;
-      })
-      .catch((error: unknown) => {
-        MatchmakingModal.instanceIdPromise = null;
-        throw error;
-      });
-
-    return MatchmakingModal.instanceIdPromise;
-  }
-
   protected async onOpen(): Promise<void> {
     const userMe = await getUserMe();
     // Early return if modal was closed during async operation
@@ -209,8 +179,7 @@ export class MatchmakingModal extends BaseModal {
     if (this.gameID === null) {
       return;
     }
-    const config = await getRuntimeClientServerConfig();
-    const url = `/${config.workerPath(this.gameID)}/api/game/${this.gameID}/exists`;
+    const url = `/${ClientEnv.workerPath(this.gameID)}/api/game/${this.gameID}/exists`;
 
     const response = await fetch(url, {
       method: "GET",
diff --git a/src/client/Transport.ts b/src/client/Transport.ts
index 1e4526a8c..fee60b966 100644
--- a/src/client/Transport.ts
+++ b/src/client/Transport.ts
@@ -1,3 +1,4 @@
+import { ClientEnv } from "src/client/ClientEnv";
 import { z } from "zod";
 import { EventBus, GameEvent } from "../core/EventBus";
 import {
@@ -330,9 +331,7 @@ export class Transport {
     this.killExistingSocket();
     const wsHost = window.location.host;
     const wsProtocol = window.location.protocol === "https:" ? "wss:" : "ws:";
-    const workerPath = this.lobbyConfig.serverConfig.workerPath(
-      this.lobbyConfig.gameID,
-    );
+    const workerPath = ClientEnv.workerPath(this.lobbyConfig.gameID);
     this.socket = new WebSocket(`${wsProtocol}//${wsHost}/${workerPath}`);
     this.onconnect = onconnect;
     this.onmessage = onmessage;
diff --git a/src/client/components/CopyButton.ts b/src/client/components/CopyButton.ts
index 3718aa73e..84a2ed024 100644
--- a/src/client/components/CopyButton.ts
+++ b/src/client/components/CopyButton.ts
@@ -1,6 +1,6 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { getRuntimeClientServerConfig } from "../../core/configuration/ConfigLoader";
+import { ClientEnv } from "src/client/ClientEnv";
 import { UserSettings } from "../../core/game/UserSettings";
 import { crazyGamesSDK } from "../CrazyGamesSDK";
 import { copyToClipboard, translateText } from "../Utils";
@@ -63,8 +63,7 @@ export class CopyButton extends LitElement {
   }
 
   private async buildCopyUrl(): Promise<string> {
-    const config = await getRuntimeClientServerConfig();
-    let url = `${window.location.origin}/${config.workerPath(this.lobbyId)}/game/${this.lobbyId}`;
+    let url = `${window.location.origin}/${ClientEnv.workerPath(this.lobbyId)}/game/${this.lobbyId}`;
     if (this.includeLobbyQuery) {
       url += `?lobby&s=${encodeURIComponent(this.lobbySuffix)}`;
     }
diff --git a/src/client/graphics/AnimatedSpriteLoader.ts b/src/client/graphics/AnimatedSpriteLoader.ts
index b31678083..d32dfe87b 100644
--- a/src/client/graphics/AnimatedSpriteLoader.ts
+++ b/src/client/graphics/AnimatedSpriteLoader.ts
@@ -1,3 +1,4 @@
+import { Theme } from "src/core/configuration/Theme";
 import miniBigSmoke from "../../../resources/sprites/bigsmoke.png";
 import buildingExplosion from "../../../resources/sprites/buildingExplosion.png";
 import conquestSword from "../../../resources/sprites/conquestSword.png";
@@ -10,7 +11,6 @@ import sinkingShip from "../../../resources/sprites/sinkingShip.png";
 import miniSmoke from "../../../resources/sprites/smoke.png";
 import miniSmokeAndFire from "../../../resources/sprites/smokeAndFire.png";
 import unitExplosion from "../../../resources/sprites/unitExplosion.png";
-import { Theme } from "../../core/configuration/Config";
 import { PlayerView } from "../../core/game/GameView";
 import { AnimatedSprite } from "./AnimatedSprite";
 import { FxType } from "./fx/Fx";
diff --git a/src/client/graphics/SpriteLoader.ts b/src/client/graphics/SpriteLoader.ts
index 3d3d44669..b9d1a95bc 100644
--- a/src/client/graphics/SpriteLoader.ts
+++ b/src/client/graphics/SpriteLoader.ts
@@ -1,6 +1,6 @@
 import { Colord } from "colord";
+import { Theme } from "src/core/configuration/Theme";
 import { assetUrl } from "../../core/AssetUrls";
-import { Theme } from "../../core/configuration/Config";
 import { TrainType, UnitType } from "../../core/game/Game";
 import { UnitView } from "../../core/game/GameView";
 const atomBombSprite = assetUrl("sprites/atombomb.png");
diff --git a/src/client/graphics/fx/SpriteFx.ts b/src/client/graphics/fx/SpriteFx.ts
index 24818da7c..cf625d797 100644
--- a/src/client/graphics/fx/SpriteFx.ts
+++ b/src/client/graphics/fx/SpriteFx.ts
@@ -1,4 +1,4 @@
-import { Theme } from "../../../core/configuration/Config";
+import { Theme } from "src/core/configuration/Theme";
 import { PlayerView } from "../../../core/game/GameView";
 import { AnimatedSprite } from "../AnimatedSprite";
 import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
diff --git a/src/client/graphics/layers/FxLayer.ts b/src/client/graphics/layers/FxLayer.ts
index bb040d84a..22ce78ff5 100644
--- a/src/client/graphics/layers/FxLayer.ts
+++ b/src/client/graphics/layers/FxLayer.ts
@@ -1,4 +1,4 @@
-import { Theme } from "../../../core/configuration/Config";
+import { Theme } from "src/core/configuration/Theme";
 import { EventBus } from "../../../core/EventBus";
 import { UnitType } from "../../../core/game/Game";
 import { TileRef } from "../../../core/game/GameMap";
diff --git a/src/client/graphics/layers/MultiTabModal.ts b/src/client/graphics/layers/MultiTabModal.ts
index 210752bd9..f2b5f498e 100644
--- a/src/client/graphics/layers/MultiTabModal.ts
+++ b/src/client/graphics/layers/MultiTabModal.ts
@@ -1,5 +1,6 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
+import { ClientEnv } from "src/client/ClientEnv";
 import { GameEnv } from "../../../core/configuration/Config";
 import { GameType } from "../../../core/game/Game";
 import { GameView } from "../../../core/game/GameView";
@@ -31,7 +32,7 @@ export class MultiTabModal extends LitElement implements Layer {
     if (
       this.game.inSpawnPhase() ||
       this.game.config().gameConfig().gameType === GameType.Singleplayer ||
-      this.game.config().serverConfig().env() === GameEnv.Dev ||
+      ClientEnv.env() === GameEnv.Dev ||
       this.game.config().isReplay()
     ) {
       return;
diff --git a/src/client/graphics/layers/NameLayer.ts b/src/client/graphics/layers/NameLayer.ts
index 701e09c26..ff5741a78 100644
--- a/src/client/graphics/layers/NameLayer.ts
+++ b/src/client/graphics/layers/NameLayer.ts
@@ -1,7 +1,8 @@
 import { assetUrl } from "src/core/AssetUrls";
+import { Theme } from "src/core/configuration/Theme";
 import { EventBus } from "../../../core/EventBus";
 import { PseudoRandom } from "../../../core/PseudoRandom";
-import { Config, Theme } from "../../../core/configuration/Config";
+import { Config } from "../../../core/configuration/Config";
 import { Cell } from "../../../core/game/Game";
 import { GameView, PlayerView } from "../../../core/game/GameView";
 import { UserSettings } from "../../../core/game/UserSettings";
diff --git a/src/client/graphics/layers/StructureDrawingUtils.ts b/src/client/graphics/layers/StructureDrawingUtils.ts
index cff6e1a42..d251d49c1 100644
--- a/src/client/graphics/layers/StructureDrawingUtils.ts
+++ b/src/client/graphics/layers/StructureDrawingUtils.ts
@@ -1,6 +1,6 @@
 import * as PIXI from "pixi.js";
+import { Theme } from "src/core/configuration/Theme";
 import { assetUrl } from "../../../core/AssetUrls";
-import { Theme } from "../../../core/configuration/Config";
 import {
   Cell,
   PlayerBuildableUnitType,
diff --git a/src/client/graphics/layers/StructureIconsLayer.ts b/src/client/graphics/layers/StructureIconsLayer.ts
index 5d879e740..4ff78465d 100644
--- a/src/client/graphics/layers/StructureIconsLayer.ts
+++ b/src/client/graphics/layers/StructureIconsLayer.ts
@@ -2,8 +2,8 @@ import { extend } from "colord";
 import a11yPlugin from "colord/plugins/a11y";
 import { OutlineFilter } from "pixi-filters";
 import * as PIXI from "pixi.js";
+import { Theme } from "src/core/configuration/Theme";
 import { assetUrl } from "../../../core/AssetUrls";
-import { Theme } from "../../../core/configuration/Config";
 import { EventBus } from "../../../core/EventBus";
 import { wouldNukeBreakAlliance } from "../../../core/execution/Util";
 import {
diff --git a/src/client/graphics/layers/StructureLayer.ts b/src/client/graphics/layers/StructureLayer.ts
index f26a7dfbd..9ba8e3b2a 100644
--- a/src/client/graphics/layers/StructureLayer.ts
+++ b/src/client/graphics/layers/StructureLayer.ts
@@ -1,6 +1,6 @@
 import { colord, Colord } from "colord";
+import { Theme } from "src/core/configuration/Theme";
 import { assetUrl } from "../../../core/AssetUrls";
-import { Theme } from "../../../core/configuration/Config";
 import { EventBus } from "../../../core/EventBus";
 import { TransformHandler } from "../TransformHandler";
 import { Layer } from "./Layer";
diff --git a/src/client/graphics/layers/TerrainLayer.ts b/src/client/graphics/layers/TerrainLayer.ts
index 353555912..492c97028 100644
--- a/src/client/graphics/layers/TerrainLayer.ts
+++ b/src/client/graphics/layers/TerrainLayer.ts
@@ -1,4 +1,5 @@
-import { Config, Theme } from "../../../core/configuration/Config";
+import { Theme } from "src/core/configuration/Theme";
+import { Config } from "../../../core/configuration/Config";
 import { GameView } from "../../../core/game/GameView";
 import { TransformHandler } from "../TransformHandler";
 import { Layer } from "./Layer";
diff --git a/src/client/graphics/layers/TerritoryLayer.ts b/src/client/graphics/layers/TerritoryLayer.ts
index 5eaedca87..6789e4bea 100644
--- a/src/client/graphics/layers/TerritoryLayer.ts
+++ b/src/client/graphics/layers/TerritoryLayer.ts
@@ -1,6 +1,6 @@
 import { PriorityQueue } from "@datastructures-js/priority-queue";
 import { Colord } from "colord";
-import { Theme } from "../../../core/configuration/Config";
+import { Theme } from "src/core/configuration/Theme";
 import { EventBus } from "../../../core/EventBus";
 import {
   Cell,
diff --git a/src/client/graphics/layers/UILayer.ts b/src/client/graphics/layers/UILayer.ts
index cc71ec668..4c4ff15bb 100644
--- a/src/client/graphics/layers/UILayer.ts
+++ b/src/client/graphics/layers/UILayer.ts
@@ -1,6 +1,6 @@
 import { Colord } from "colord";
+import { Theme } from "src/core/configuration/Theme";
 import { EventBus } from "../../../core/EventBus";
-import { Theme } from "../../../core/configuration/Config";
 import { UnitType } from "../../../core/game/Game";
 import { GameUpdateType } from "../../../core/game/GameUpdates";
 import { GameView, UnitView } from "../../../core/game/GameView";
diff --git a/src/client/graphics/layers/UnitLayer.ts b/src/client/graphics/layers/UnitLayer.ts
index 8ded3ee6f..e40fb4d0e 100644
--- a/src/client/graphics/layers/UnitLayer.ts
+++ b/src/client/graphics/layers/UnitLayer.ts
@@ -1,6 +1,6 @@
 import { colord, Colord } from "colord";
+import { Theme } from "src/core/configuration/Theme";
 import { EventBus } from "../../../core/EventBus";
-import { Theme } from "../../../core/configuration/Config";
 import { Cell, UnitType } from "../../../core/game/Game";
 import { TileRef } from "../../../core/game/GameMap";
 import { GameView, UnitView } from "../../../core/game/GameView";
diff --git a/src/core/AssetUrls.ts b/src/core/AssetUrls.ts
index f36bfe7f3..fb293e08a 100644
--- a/src/core/AssetUrls.ts
+++ b/src/core/AssetUrls.ts
@@ -70,16 +70,14 @@ export function buildAssetUrl(
 declare global {
   var __ASSET_MANIFEST__: AssetManifest | undefined;
   var __CDN_BASE__: string | undefined;
-
-  interface Window {
-    ASSET_MANIFEST?: AssetManifest;
-    CDN_BASE?: string;
-  }
 }
 
 export function getAssetManifest(): AssetManifest {
-  if (typeof window !== "undefined" && window.ASSET_MANIFEST !== undefined) {
-    return window.ASSET_MANIFEST;
+  if (
+    typeof window !== "undefined" &&
+    window.BOOTSTRAP_CONFIG?.assetManifest !== undefined
+  ) {
+    return window.BOOTSTRAP_CONFIG.assetManifest;
   }
   return globalThis.__ASSET_MANIFEST__ ?? {};
 }
@@ -89,8 +87,11 @@ export function getAssetManifest(): AssetManifest {
 // Without this fallback, asset fetches inside workers (e.g. map binaries)
 // would silently bypass the CDN.
 export function getCdnBase(): string {
-  if (typeof window !== "undefined" && window.CDN_BASE !== undefined) {
-    return window.CDN_BASE;
+  if (
+    typeof window !== "undefined" &&
+    window.BOOTSTRAP_CONFIG?.cdnBase !== undefined
+  ) {
+    return window.BOOTSTRAP_CONFIG.cdnBase;
   }
   return globalThis.__CDN_BASE__ ?? "";
 }
diff --git a/src/core/GameRunner.ts b/src/core/GameRunner.ts
index 7732a6eb3..0c6ced619 100644
--- a/src/core/GameRunner.ts
+++ b/src/core/GameRunner.ts
@@ -1,5 +1,5 @@
 import { placeName } from "../client/graphics/NameBoxCalculator";
-import { getGameLogicConfig } from "./configuration/ConfigLoader";
+import { Config } from "./configuration/Config";
 import { Executor } from "./execution/ExecutionManager";
 import { RecomputeRailClusterExecution } from "./execution/RecomputeRailClusterExecution";
 import { WinCheckExecution } from "./execution/WinCheckExecution";
@@ -35,7 +35,7 @@ export async function createGameRunner(
   mapLoader: GameMapLoader,
   callBack: (gu: GameUpdateViewData | ErrorUpdate) => void,
 ): Promise<GameRunner> {
-  const config = await getGameLogicConfig(gameStart.config, null);
+  const config = new Config(gameStart.config, null, false);
   const gameMap = await loadGameMap(
     gameStart.config.gameMap,
     gameStart.config.gameMapSize,
diff --git a/src/core/configuration/Config.ts b/src/core/configuration/Config.ts
index e0cacf57b..cd8774de9 100644
--- a/src/core/configuration/Config.ts
+++ b/src/core/configuration/Config.ts
@@ -1,21 +1,44 @@
-import { Colord } from "colord";
-import { JWK } from "jose";
+import { z } from "zod";
+import { AssetManifest } from "../AssetUrls";
 import {
+  Difficulty,
   Game,
+  GameMode,
+  GameType,
   Gold,
   Player,
   PlayerInfo,
-  Team,
+  PlayerType,
+  TerrainType,
   TerraNullius,
   Tick,
   UnitInfo,
   UnitType,
 } from "../game/Game";
-import { GameMap, TileRef } from "../game/GameMap";
+import { TileRef } from "../game/GameMap";
 import { PlayerView } from "../game/GameView";
 import { UserSettings } from "../game/UserSettings";
-import { GameConfig, GameID, TeamCountConfig } from "../Schemas";
+import { GameConfig, TeamCountConfig } from "../Schemas";
 import { NukeType } from "../StatsSchemas";
+import { assertNever, sigmoid, toInt, within } from "../Util";
+import { PastelTheme } from "./PastelTheme";
+import { PastelThemeDark } from "./PastelThemeDark";
+import { Theme } from "./Theme";
+
+declare global {
+  interface Window {
+    BOOTSTRAP_CONFIG?: {
+      gitCommit?: string;
+      assetManifest?: AssetManifest;
+      cdnBase?: string;
+      gameEnv?: string;
+      numWorkers?: number;
+      turnstileSiteKey?: string;
+      jwtAudience?: string;
+      instanceId?: string;
+    };
+  }
+}
 
 export enum GameEnv {
   Dev,
@@ -23,31 +46,17 @@ export enum GameEnv {
   Prod,
 }
 
-export interface ServerConfig {
-  turnstileSiteKey(): string;
-  turnIntervalMs(): number;
-  gameCreationRate(): number;
-  numWorkers(): number;
-  workerIndex(gameID: GameID): number;
-  workerPath(gameID: GameID): string;
-  workerPort(gameID: GameID): number;
-  workerPortByIndex(workerID: number): number;
-  env(): GameEnv;
-  adminToken(): string;
-  adminHeader(): string;
-  // Only available on the server
-  gitCommit(): string;
-  apiKey(): string;
-  otelEndpoint(): string;
-  otelAuthHeader(): string;
-  otelEnabled(): boolean;
-  jwtAudience(): string;
-  jwtIssuer(): string;
-  jwkPublicKey(): Promise<JWK>;
-  domain(): string;
-  subdomain(): string;
-  stripePublishableKey(): string;
-  allowedFlares(): string[] | undefined;
+export function parseGameEnv(value: string | undefined): GameEnv {
+  switch (value) {
+    case "dev":
+      return GameEnv.Dev;
+    case "staging":
+      return GameEnv.Preprod;
+    case "prod":
+      return GameEnv.Prod;
+    default:
+      throw new Error(`unsupported game env: ${value}`);
+  }
 }
 
 export interface NukeMagnitude {
@@ -55,43 +64,504 @@ export interface NukeMagnitude {
   outer: number;
 }
 
-export interface Config {
-  spawnImmunityDuration(): Tick;
-  nationSpawnImmunityDuration(): Tick;
-  hasExtendedSpawnImmunity(): boolean;
-  serverConfig(): ServerConfig;
-  gameConfig(): GameConfig;
-  theme(): Theme;
-  percentageTilesOwnedToWin(): number;
-  numBots(): number;
-  spawnNations(): boolean;
-  isUnitDisabled(unitType: UnitType): boolean;
-  bots(): number;
-  infiniteGold(): boolean;
-  donateGold(): boolean;
-  infiniteTroops(): boolean;
-  donateTroops(): boolean;
-  instantBuild(): boolean;
-  disableNavMesh(): boolean;
-  disableAlliances(): boolean;
-  waterNukes(): boolean;
-  isRandomSpawn(): boolean;
-  numSpawnPhaseTurns(): number;
-  userSettings(): UserSettings;
-  playerTeams(): TeamCountConfig;
-  goldMultiplier(): number;
-  startingGold(playerInfo: PlayerInfo): Gold;
+const DEFENSE_DEBUFF_MIDPOINT = 150_000;
+const DEFENSE_DEBUFF_DECAY_RATE = Math.LN2 / 50000;
+const DEFAULT_SPAWN_IMMUNITY_TICKS = 5 * 10;
+
+export const JwksSchema = z.object({
+  keys: z
+    .object({
+      alg: z.literal("EdDSA"),
+      crv: z.literal("Ed25519"),
+      kty: z.literal("OKP"),
+      x: z.string(),
+    })
+    .array()
+    .min(1),
+});
+
+/** SAM launcher construction duration in ticks (non-instant-build). */
+export const SAM_CONSTRUCTION_TICKS = 30 * 10;
+
+export class Config {
+  private pastelTheme: PastelTheme = new PastelTheme();
+  private pastelThemeDark: PastelThemeDark = new PastelThemeDark();
+  private unitInfoCache = new Map<UnitType, UnitInfo>();
+  constructor(
+    private _gameConfig: GameConfig,
+    private _userSettings: UserSettings | null,
+    private _isReplay: boolean,
+  ) {}
+
+  isReplay(): boolean {
+    return this._isReplay;
+  }
+
+  traitorDefenseDebuff(): number {
+    return 0.5;
+  }
+  traitorSpeedDebuff(): number {
+    return 0.8;
+  }
+  traitorDuration(): number {
+    return 30 * 10; // 30 seconds
+  }
+  spawnImmunityDuration(): Tick {
+    return (
+      this._gameConfig.spawnImmunityDuration ?? DEFAULT_SPAWN_IMMUNITY_TICKS
+    );
+  }
+  nationSpawnImmunityDuration(): Tick {
+    return DEFAULT_SPAWN_IMMUNITY_TICKS;
+  }
+  hasExtendedSpawnImmunity(): boolean {
+    return this.spawnImmunityDuration() > DEFAULT_SPAWN_IMMUNITY_TICKS;
+  }
+
+  gameConfig(): GameConfig {
+    return this._gameConfig;
+  }
+
+  userSettings(): UserSettings {
+    if (this._userSettings === null) {
+      throw new Error("userSettings is null");
+    }
+    return this._userSettings;
+  }
+
+  cityTroopIncrease(): number {
+    return 250_000;
+  }
+
+  falloutDefenseModifier(falloutRatio: number): number {
+    // falloutRatio is between 0 and 1
+    // So defense modifier is between [5, 2.5]
+    return 5 - falloutRatio * 2;
+  }
+  SAMCooldown(): number {
+    return 90;
+  }
+  SiloCooldown(): number {
+    return 90;
+  }
+
+  defensePostRange(): number {
+    return 30;
+  }
+
+  defensePostDefenseBonus(): number {
+    return 5;
+  }
+
+  defensePostSpeedBonus(): number {
+    return 3;
+  }
+
+  playerTeams(): TeamCountConfig {
+    return this._gameConfig.playerTeams ?? 0;
+  }
+
+  spawnNations(): boolean {
+    return this._gameConfig.nations !== "disabled";
+  }
+
+  isUnitDisabled(unitType: UnitType): boolean {
+    return this._gameConfig.disabledUnits?.includes(unitType) ?? false;
+  }
+
+  bots(): number {
+    return this._gameConfig.bots;
+  }
+  instantBuild(): boolean {
+    return this._gameConfig.instantBuild;
+  }
+  disableNavMesh(): boolean {
+    return this._gameConfig.disableNavMesh ?? false;
+  }
+  disableAlliances(): boolean {
+    return this._gameConfig.disableAlliances ?? false;
+  }
+  waterNukes(): boolean {
+    return this._gameConfig.waterNukes ?? false;
+  }
+  isRandomSpawn(): boolean {
+    return this._gameConfig.randomSpawn;
+  }
+  infiniteGold(): boolean {
+    return this._gameConfig.infiniteGold;
+  }
+  donateGold(): boolean {
+    return this._gameConfig.donateGold;
+  }
+  infiniteTroops(): boolean {
+    return this._gameConfig.infiniteTroops;
+  }
+  donateTroops(): boolean {
+    return this._gameConfig.donateTroops;
+  }
+  goldMultiplier(): number {
+    return this._gameConfig.goldMultiplier ?? 1;
+  }
+  startingGold(playerInfo: PlayerInfo): Gold {
+    if (playerInfo.playerType === PlayerType.Bot) {
+      return 0n;
+    }
+    return this.startingGoldFor(playerInfo);
+  }
+
+  trainSpawnRate(numPlayerFactories: number): number {
+    // hyperbolic decay, midpoint at 10 factories
+    // expected number of trains = numPlayerFactories  / trainSpawnRate(numPlayerFactories)
+    return (numPlayerFactories + 10) * 15;
+  }
+  trainGold(
+    rel: "self" | "team" | "ally" | "other",
+    citiesVisited: number,
+    player: Player | PlayerView,
+  ): Gold {
+    // No penalty for the first 10 cities.
+    citiesVisited = Math.max(0, citiesVisited - 9);
+    let baseGold: number;
+    switch (rel) {
+      case "ally":
+        baseGold = 35_000;
+        break;
+      case "team":
+      case "other":
+        baseGold = 25_000;
+        break;
+      case "self":
+        baseGold = 10_000;
+        break;
+    }
+    const distPenalty = citiesVisited * 5_000;
+    const gold = Math.max(5000, baseGold - distPenalty);
+    return toInt(gold * this.goldMultiplierFor(player));
+  }
+
+  trainStationMinRange(): number {
+    return 15;
+  }
+  trainStationMaxRange(): number {
+    return 100;
+  }
+  railroadMaxSize(): number {
+    return 120;
+  }
+
+  tradeShipGold(dist: number, player: Player | PlayerView): Gold {
+    // Sigmoid: concave start, sharp S-curve middle, linear end - heavily punishes trades under range debuff.
+    const debuff = this.tradeShipShortRangeDebuff();
+    const baseGold =
+      75_000 / (1 + Math.exp(-0.03 * (dist - debuff))) + 50 * dist;
+    return BigInt(Math.floor(baseGold * this.goldMultiplierFor(player)));
+  }
+
+  // Probability of trade ship spawn = 1 / tradeShipSpawnRate
+  tradeShipSpawnRate(
+    tradeShipSpawnRejections: number,
+    numTradeShips: number,
+  ): number {
+    const decayRate = Math.LN2 / 50;
+
+    // Approaches 0 as numTradeShips increase
+    const baseSpawnRate = 1 - sigmoid(numTradeShips, decayRate, 200);
+
+    // Pity timer: increases spawn chance after consecutive rejections
+    const rejectionModifier = 1 / (tradeShipSpawnRejections + 1);
+
+    return Math.floor((100 * rejectionModifier) / baseSpawnRate);
+  }
+
+  unitInfo(type: UnitType): UnitInfo {
+    const cached = this.unitInfoCache.get(type);
+    if (cached !== undefined) {
+      return cached;
+    }
+
+    let info: UnitInfo;
+    switch (type) {
+      case UnitType.TransportShip:
+        info = {
+          cost: () => 0n,
+        };
+        break;
+      case UnitType.Warship:
+        info = {
+          cost: this.costWrapper(
+            (numUnits: number) => Math.min(1_000_000, (numUnits + 1) * 250_000),
+            UnitType.Warship,
+          ),
+          maxHealth: 1000,
+        };
+        break;
+      case UnitType.Shell:
+        info = {
+          cost: () => 0n,
+          damage: 250,
+        };
+        break;
+      case UnitType.SAMMissile:
+        info = {
+          cost: () => 0n,
+        };
+        break;
+      case UnitType.Port:
+        info = {
+          cost: this.costWrapper(
+            (numUnits: number) =>
+              Math.min(1_000_000, Math.pow(2, numUnits) * 125_000),
+            UnitType.Port,
+            UnitType.Factory,
+          ),
+          constructionDuration: this.instantBuild() ? 0 : 5 * 10,
+          upgradable: true,
+        };
+        break;
+      case UnitType.AtomBomb:
+        info = {
+          cost: this.costWrapper(() => 750_000, UnitType.AtomBomb),
+        };
+        break;
+      case UnitType.HydrogenBomb:
+        info = {
+          cost: this.costWrapper(() => 5_000_000, UnitType.HydrogenBomb),
+        };
+        break;
+      case UnitType.MIRV:
+        info = {
+          cost: (game: Game, player: Player) => {
+            if (
+              player.type() === PlayerType.Human &&
+              this.hasInfiniteGoldFor(player)
+            ) {
+              return 0n;
+            }
+            return 25_000_000n + game.stats().numMirvsLaunched() * 15_000_000n;
+          },
+        };
+        break;
+      case UnitType.MIRVWarhead:
+        info = {
+          cost: () => 0n,
+        };
+        break;
+      case UnitType.TradeShip:
+        info = {
+          cost: () => 0n,
+        };
+        break;
+      case UnitType.MissileSilo:
+        info = {
+          cost: this.costWrapper(() => 1_000_000, UnitType.MissileSilo),
+          constructionDuration: this.instantBuild() ? 0 : 10 * 10,
+          upgradable: true,
+        };
+        break;
+      case UnitType.DefensePost:
+        info = {
+          cost: this.costWrapper(
+            (numUnits: number) => Math.min(250_000, (numUnits + 1) * 50_000),
+            UnitType.DefensePost,
+          ),
+          constructionDuration: this.instantBuild() ? 0 : 5 * 10,
+        };
+        break;
+      case UnitType.SAMLauncher:
+        info = {
+          cost: this.costWrapper(
+            (numUnits: number) =>
+              Math.min(3_000_000, (numUnits + 1) * 1_500_000),
+            UnitType.SAMLauncher,
+          ),
+          constructionDuration: this.instantBuild()
+            ? 0
+            : SAM_CONSTRUCTION_TICKS,
+          upgradable: true,
+        };
+        break;
+      case UnitType.City:
+        info = {
+          cost: this.costWrapper(
+            (numUnits: number) =>
+              Math.min(1_000_000, Math.pow(2, numUnits) * 125_000),
+            UnitType.City,
+          ),
+          constructionDuration: this.instantBuild() ? 0 : 2 * 10,
+          upgradable: true,
+        };
+        break;
+      case UnitType.Factory:
+        info = {
+          cost: this.costWrapper(
+            (numUnits: number) =>
+              Math.min(1_000_000, Math.pow(2, numUnits) * 125_000),
+            UnitType.Factory,
+            UnitType.Port,
+          ),
+          constructionDuration: this.instantBuild() ? 0 : 2 * 10,
+          upgradable: true,
+        };
+        break;
+      case UnitType.Train:
+        info = {
+          cost: () => 0n,
+        };
+        break;
+      default:
+        assertNever(type);
+    }
+
+    this.unitInfoCache.set(type, info);
+    return info;
+  }
+
+  private hasInfiniteGoldFor(player: Player | PlayerView): boolean {
+    if (this.infiniteGold()) return true;
+    const hc = this._gameConfig.hostCheats;
+    return (hc?.infiniteGold ?? false) && player.isLobbyCreator();
+  }
+
+  private hasInfiniteTroopsFor(player: Player | PlayerView): boolean {
+    if (this.infiniteTroops()) return true;
+    return (
+      (this._gameConfig.hostCheats?.infiniteTroops ?? false) &&
+      player.isLobbyCreator()
+    );
+  }
+
+  private hasInfiniteTroopsForInfo(playerInfo: PlayerInfo): boolean {
+    if (this.infiniteTroops()) return true;
+    return (
+      (this._gameConfig.hostCheats?.infiniteTroops ?? false) &&
+      playerInfo.isLobbyCreator
+    );
+  }
+
+  private goldMultiplierFor(player: Player | PlayerView): number {
+    const base = this.goldMultiplier();
+    const hc = this._gameConfig.hostCheats;
+    if (hc?.goldMultiplier && player.isLobbyCreator()) {
+      return hc.goldMultiplier;
+    }
+    return base;
+  }
+
+  public conquerGoldAmount(captured: Player): Gold {
+    if (
+      captured.type() === PlayerType.Bot ||
+      captured.type() === PlayerType.Nation
+    ) {
+      return captured.gold();
+    } else {
+      return captured.gold() / 2n;
+    }
+  }
+
+  private startingGoldFor(playerInfo: PlayerInfo): Gold {
+    const base = BigInt(this._gameConfig.startingGold ?? 0);
+    const hc = this._gameConfig.hostCheats;
+    if (hc?.startingGold && playerInfo.isLobbyCreator) {
+      return base + BigInt(hc.startingGold);
+    }
+    return base;
+  }
+
+  private costWrapper(
+    costFn: (units: number) => number,
+    ...types: UnitType[]
+  ): (g: Game, p: Player) => bigint {
+    return (game: Game, player: Player) => {
+      if (
+        player.type() === PlayerType.Human &&
+        this.hasInfiniteGoldFor(player)
+      ) {
+        return 0n;
+      }
+      const numUnits = types.reduce(
+        (acc, type) =>
+          acc +
+          Math.min(player.unitsOwned(type), player.unitsConstructed(type)),
+        0,
+      );
+      return BigInt(costFn(numUnits));
+    };
+  }
+
+  defaultDonationAmount(sender: Player): number {
+    return Math.floor(sender.troops() / 3);
+  }
+  donateCooldown(): Tick {
+    return 10 * 10;
+  }
+  embargoAllCooldown(): Tick {
+    return 10 * 10;
+  }
+  deletionMarkDuration(): Tick {
+    return 30 * 10;
+  }
+
+  deleteUnitCooldown(): Tick {
+    return 30 * 10;
+  }
+  emojiMessageDuration(): Tick {
+    return 5 * 10;
+  }
+  emojiMessageCooldown(): Tick {
+    return 5 * 10;
+  }
+  targetDuration(): Tick {
+    return 10 * 10;
+  }
+  targetCooldown(): Tick {
+    return 15 * 10;
+  }
+  allianceRequestDuration(): Tick {
+    return 20 * 10;
+  }
+  allianceRequestCooldown(): Tick {
+    return 30 * 10;
+  }
+  allianceDuration(): Tick {
+    return 300 * 10; // 5 minutes.
+  }
+  temporaryEmbargoDuration(): Tick {
+    return 300 * 10; // 5 minutes.
+  }
+  minDistanceBetweenPlayers(): number {
+    return 30;
+  }
+
+  percentageTilesOwnedToWin(): number {
+    if (this._gameConfig.gameMode === GameMode.Team) {
+      return 95;
+    }
+    return 80;
+  }
+  boatMaxNumber(): number {
+    if (this.isUnitDisabled(UnitType.TransportShip)) {
+      return 0;
+    }
+    return 3;
+  }
+  numSpawnPhaseTurns(): number {
+    if (this._gameConfig.gameType === GameType.Singleplayer) {
+      return 100;
+    }
+    if (this.isRandomSpawn()) {
+      return 150;
+    }
+    return 300;
+  }
+  numBots(): number {
+    return this.bots();
+  }
+  theme(): Theme {
+    return this.userSettings()?.darkMode()
+      ? this.pastelThemeDark
+      : this.pastelTheme;
+  }
 
-  startManpower(playerInfo: PlayerInfo): number;
-  troopIncreaseRate(player: Player | PlayerView): number;
-  goldAdditionRate(player: Player | PlayerView): Gold;
-  conquerGoldAmount(captured: Player): Gold;
-  attackTilesPerTick(
-    attckTroops: number,
-    attacker: Player,
-    defender: Player | TerraNullius,
-    numAdjacentTilesWithEnemy: number,
-  ): number;
   attackLogic(
     gm: Game,
     attackTroops: number,
@@ -102,111 +572,381 @@ export interface Config {
     attackerTroopLoss: number;
     defenderTroopLoss: number;
     tilesPerTickUsed: number;
-  };
-  attackAmount(attacker: Player, defender: Player | TerraNullius): number;
-  radiusPortSpawn(): number;
-  // When computing likelihood of trading for any given port, the X closest port
-  // are twice more likely to be selected. X is determined below.
-  proximityBonusPortsNb(totalPorts: number): number;
-  maxTroops(player: Player | PlayerView): number;
-  cityTroopIncrease(): number;
-  boatAttackAmount(attacker: Player, defender: Player | TerraNullius): number;
-  shellLifetime(): number;
-  boatMaxNumber(): number;
-  allianceDuration(): Tick;
-  allianceRequestDuration(): Tick;
-  allianceRequestCooldown(): Tick;
-  temporaryEmbargoDuration(): Tick;
-  targetDuration(): Tick;
-  targetCooldown(): Tick;
-  emojiMessageCooldown(): Tick;
-  emojiMessageDuration(): Tick;
-  donateCooldown(): Tick;
-  embargoAllCooldown(): Tick;
-  deletionMarkDuration(): Tick;
-  deleteUnitCooldown(): Tick;
-  defaultDonationAmount(sender: Player): number;
-  unitInfo(type: UnitType): UnitInfo;
-  tradeShipShortRangeDebuff(): number;
-  tradeShipGold(dist: number, player: Player | PlayerView): Gold;
-  tradeShipSpawnRate(
-    tradeShipSpawnRejections: number,
-    numTradeShips: number,
-  ): number;
-  trainGold(
-    rel: "self" | "team" | "ally" | "other",
-    citiesVisited: number,
-    player: Player | PlayerView,
-  ): Gold;
-  trainSpawnRate(numPlayerFactories: number): number;
-  trainStationMinRange(): number;
-  trainStationMaxRange(): number;
-  railroadMaxSize(): number;
-  safeFromPiratesCooldownMax(): number;
-  defensePostRange(): number;
-  SAMCooldown(): number;
-  SiloCooldown(): number;
-  minDistanceBetweenPlayers(): number;
-  defensePostDefenseBonus(): number;
-  defensePostSpeedBonus(): number;
-  falloutDefenseModifier(percentOfFallout: number): number;
-  warshipPatrolRange(): number;
-  warshipShellAttackRate(): number;
-  warshipTargettingRange(): number;
-  warshipDockingRange(): number;
-  warshipPortHealingBonusPerLevel(): number;
-  warshipRetreatHealthThreshold(): number;
-  warshipPassiveHealing(): number;
-  warshipPassiveHealingRange(): number;
-  warshipPortSwitchThreshold(): number;
-  defensePostShellAttackRate(): number;
-  defensePostTargettingRange(): number;
-  // 0-1
-  traitorDefenseDebuff(): number;
-  traitorDuration(): number;
-  nukeMagnitudes(unitType: UnitType): NukeMagnitude;
-  // Number of tiles destroyed to break an alliance
-  nukeAllianceBreakThreshold(): number;
-  defaultNukeSpeed(): number;
-  defaultNukeTargetableRange(): number;
-  defaultSamMissileSpeed(): number;
-  defaultSamRange(): number;
-  samRange(level: number): number;
-  maxSamRange(): number;
+  } {
+    let mag = 0;
+    let speed = 0;
+    const type = gm.terrainType(tileToConquer);
+    switch (type) {
+      case TerrainType.Plains:
+        mag = 80;
+        speed = 16.5;
+        break;
+      case TerrainType.Highland:
+        mag = 100;
+        speed = 20;
+        break;
+      case TerrainType.Mountain:
+        mag = 120;
+        speed = 25;
+        break;
+      default:
+        throw new Error(`terrain type ${type} not supported`);
+    }
+    if (defender.isPlayer()) {
+      for (const dp of gm.nearbyUnits(
+        tileToConquer,
+        gm.config().defensePostRange(),
+        UnitType.DefensePost,
+      )) {
+        if (dp.unit.owner() === defender) {
+          mag *= this.defensePostDefenseBonus();
+          speed *= this.defensePostSpeedBonus();
+          break;
+        }
+      }
+    }
+
+    if (gm.hasFallout(tileToConquer)) {
+      const falloutRatio = gm.numTilesWithFallout() / gm.numLandTiles();
+      mag *= this.falloutDefenseModifier(falloutRatio);
+      speed *= this.falloutDefenseModifier(falloutRatio);
+    }
+
+    if (attacker.isPlayer() && defender.isPlayer()) {
+      if (defender.isDisconnected() && attacker.isOnSameTeam(defender)) {
+        // No troop loss if defender is disconnected and on same team
+        mag = 0;
+      }
+      if (
+        (attacker.type() === PlayerType.Human ||
+          attacker.type() === PlayerType.Nation) &&
+        defender.type() === PlayerType.Bot
+      ) {
+        mag *= 0.7;
+      }
+    }
+
+    if (defender.isPlayer()) {
+      const defenseSig =
+        1 -
+        sigmoid(
+          defender.numTilesOwned(),
+          DEFENSE_DEBUFF_DECAY_RATE,
+          DEFENSE_DEBUFF_MIDPOINT,
+        );
+
+      const largeDefenderSpeedDebuff = 0.7 + 0.3 * defenseSig;
+      const largeDefenderAttackDebuff = 0.7 + 0.3 * defenseSig;
+
+      let largeAttackBonus = 1;
+      if (attacker.numTilesOwned() > 100_000) {
+        largeAttackBonus = Math.sqrt(100_000 / attacker.numTilesOwned()) ** 0.7;
+      }
+      let largeAttackerSpeedBonus = 1;
+      if (attacker.numTilesOwned() > 100_000) {
+        largeAttackerSpeedBonus = (100_000 / attacker.numTilesOwned()) ** 0.6;
+      }
+
+      const defenderTroopLoss = defender.troops() / defender.numTilesOwned();
+      const traitorMod = defender.isTraitor() ? this.traitorDefenseDebuff() : 1;
+      const currentAttackerLoss =
+        within(defender.troops() / attackTroops, 0.6, 2) *
+        mag *
+        0.8 *
+        largeDefenderAttackDebuff *
+        largeAttackBonus *
+        traitorMod;
+      const altAttackerLoss =
+        1.3 * defenderTroopLoss * (mag / 100) * traitorMod;
+      const attackerTroopLoss =
+        0.6 * currentAttackerLoss + 0.4 * altAttackerLoss;
+
+      return {
+        attackerTroopLoss,
+        defenderTroopLoss,
+        tilesPerTickUsed:
+          within(defender.troops() / (5 * attackTroops), 0.2, 1.5) *
+          speed *
+          largeDefenderSpeedDebuff *
+          largeAttackerSpeedBonus *
+          (defender.isTraitor() ? this.traitorSpeedDebuff() : 1),
+      };
+    } else {
+      return {
+        attackerTroopLoss:
+          attacker.type() === PlayerType.Bot ? mag / 10 : mag / 5,
+        defenderTroopLoss: 0,
+        tilesPerTickUsed: within(
+          (2000 * Math.max(10, speed)) / attackTroops,
+          5,
+          100,
+        ),
+      };
+    }
+  }
+
+  attackTilesPerTick(
+    attackTroops: number,
+    attacker: Player,
+    defender: Player | TerraNullius,
+    numAdjacentTilesWithEnemy: number,
+  ): number {
+    if (defender.isPlayer()) {
+      return (
+        within(((5 * attackTroops) / defender.troops()) * 2, 0.01, 0.5) *
+        numAdjacentTilesWithEnemy *
+        3
+      );
+    } else {
+      return numAdjacentTilesWithEnemy * 2;
+    }
+  }
+
+  boatAttackAmount(attacker: Player, defender: Player | TerraNullius): number {
+    return Math.floor(attacker.troops() / 5);
+  }
+
+  warshipShellLifetime(): number {
+    return 20; // in ticks (one tick is 100ms)
+  }
+
+  radiusPortSpawn() {
+    return 20;
+  }
+
+  tradeShipShortRangeDebuff(): number {
+    return 300;
+  }
+
+  proximityBonusPortsNb(totalPorts: number) {
+    return within(totalPorts / 3, 4, totalPorts);
+  }
+
+  attackAmount(attacker: Player, defender: Player | TerraNullius) {
+    if (attacker.type() === PlayerType.Bot) {
+      return attacker.troops() / 20;
+    } else {
+      return attacker.troops() / 5;
+    }
+  }
+
+  startManpower(playerInfo: PlayerInfo): number {
+    if (playerInfo.playerType === PlayerType.Bot) {
+      return 10_000;
+    }
+    if (playerInfo.playerType === PlayerType.Nation) {
+      switch (this._gameConfig.difficulty) {
+        case Difficulty.Easy:
+          return 12_500;
+        case Difficulty.Medium:
+          return 18_750;
+        case Difficulty.Hard:
+          return 25_000; // Like humans
+        case Difficulty.Impossible:
+          return 31_250;
+        default:
+          assertNever(this._gameConfig.difficulty);
+      }
+    }
+    return this.hasInfiniteTroopsForInfo(playerInfo) ? 1_000_000 : 25_000;
+  }
+
+  maxTroops(player: Player | PlayerView): number {
+    const maxTroops =
+      player.type() === PlayerType.Human && this.hasInfiniteTroopsFor(player)
+        ? 1_000_000_000
+        : 2 * (Math.pow(player.numTilesOwned(), 0.6) * 1000 + 50000) +
+          player
+            .units(UnitType.City)
+            .filter((u) => !u.isUnderConstruction())
+            .map((city) => city.level())
+            .reduce((a, b) => a + b, 0) *
+            this.cityTroopIncrease();
+
+    if (player.type() === PlayerType.Bot) {
+      return maxTroops / 3;
+    }
+
+    if (player.type() === PlayerType.Human) {
+      return maxTroops;
+    }
+
+    switch (this._gameConfig.difficulty) {
+      case Difficulty.Easy:
+        return maxTroops * 0.5;
+      case Difficulty.Medium:
+        return maxTroops * 0.75;
+      case Difficulty.Hard:
+        return maxTroops * 1; // Like humans
+      case Difficulty.Impossible:
+        return maxTroops * 1.25;
+      default:
+        assertNever(this._gameConfig.difficulty);
+    }
+  }
+
+  troopIncreaseRate(player: Player | PlayerView): number {
+    const max = this.maxTroops(player);
+
+    let toAdd = 10 + Math.pow(player.troops(), 0.73) / 4;
+
+    const ratio = 1 - player.troops() / max;
+    toAdd *= ratio;
+
+    if (player.type() === PlayerType.Bot) {
+      toAdd *= 0.5;
+    }
+
+    if (player.type() === PlayerType.Nation) {
+      switch (this._gameConfig.difficulty) {
+        case Difficulty.Easy:
+          toAdd *= 0.9;
+          break;
+        case Difficulty.Medium:
+          toAdd *= 0.95;
+          break;
+        case Difficulty.Hard:
+          toAdd *= 1; // Like humans
+          break;
+        case Difficulty.Impossible:
+          toAdd *= 1.05;
+          break;
+        default:
+          assertNever(this._gameConfig.difficulty);
+      }
+    }
+
+    return Math.min(player.troops() + toAdd, max) - player.troops();
+  }
+
+  goldAdditionRate(player: Player | PlayerView): Gold {
+    const multiplier = this.goldMultiplierFor(player);
+    let baseRate: bigint;
+    if (player.type() === PlayerType.Bot) {
+      baseRate = 50n;
+    } else {
+      baseRate = 100n;
+    }
+    return BigInt(Math.floor(Number(baseRate) * multiplier));
+  }
+
+  nukeMagnitudes(unitType: UnitType): NukeMagnitude {
+    switch (unitType) {
+      case UnitType.MIRVWarhead:
+        return { inner: 12, outer: 18 };
+      case UnitType.AtomBomb:
+        return { inner: 12, outer: 30 };
+      case UnitType.HydrogenBomb:
+        return { inner: 80, outer: 100 };
+    }
+    throw new Error(`Unknown nuke type: ${unitType}`);
+  }
+
+  nukeAllianceBreakThreshold(): number {
+    return 100;
+  }
+
+  defaultNukeSpeed(): number {
+    return 8;
+  }
+
+  defaultNukeTargetableRange(): number {
+    return 150;
+  }
+
+  defaultSamRange(): number {
+    return 70;
+  }
+
+  samRange(level: number): number {
+    // rational growth function (level 1 = 70, level 5 just above hydro range, asymptotically approaches 150)
+    return this.maxSamRange() - 480 / (level + 5);
+  }
+
+  maxSamRange(): number {
+    return 150;
+  }
+
+  defaultSamMissileSpeed(): number {
+    return 12;
+  }
+
+  // Humans can be soldiers, soldiers attacking, soldiers in boat etc.
   nukeDeathFactor(
     nukeType: NukeType,
     humans: number,
     tilesOwned: number,
     maxTroops: number,
-  ): number;
-  structureMinDist(): number;
-  isReplay(): boolean;
-  allianceExtensionPromptOffset(): number;
-}
+  ): number {
+    if (nukeType !== UnitType.MIRVWarhead) {
+      return (5 * humans) / Math.max(1, tilesOwned);
+    }
+    const targetTroops = 0.03 * maxTroops;
+    const excessTroops = Math.max(0, humans - targetTroops);
+    const scalingFactor = 500;
 
-export interface Theme {
-  teamColor(team: Team): Colord;
-  // Don't call directly, use PlayerView
-  territoryColor(playerInfo: PlayerView): Colord;
-  // Don't call directly, use PlayerView
-  structureColors(territoryColor: Colord): { light: Colord; dark: Colord };
-  // Don't call directly, use PlayerView
-  borderColor(territoryColor: Colord): Colord;
-  // Don't call directly, use PlayerView
-  defendedBorderColors(territoryColor: Colord): { light: Colord; dark: Colord };
-  focusedBorderColor(): Colord;
-  terrainColor(gm: GameMap, tile: TileRef): Colord;
-  backgroundColor(): Colord;
-  falloutColor(): Colord;
-  font(): string;
-  textColor(playerInfo: PlayerView): string;
-  // unit color for alternate view
-  selfColor(): Colord;
-  allyColor(): Colord;
-  neutralColor(): Colord;
-  enemyColor(): Colord;
-  spawnHighlightColor(): Colord;
-  spawnHighlightSelfColor(): Colord;
-  spawnHighlightTeamColor(): Colord;
-  spawnHighlightEnemyColor(): Colord;
+    const steepness = 2;
+    const normalizedExcess = excessTroops / maxTroops;
+    return scalingFactor * (1 - Math.exp(-steepness * normalizedExcess));
+  }
+
+  structureMinDist(): number {
+    return 15;
+  }
+
+  shellLifetime(): number {
+    return 50;
+  }
+
+  warshipPatrolRange(): number {
+    return 100;
+  }
+
+  warshipTargettingRange(): number {
+    return 130;
+  }
+
+  warshipShellAttackRate(): number {
+    return 20;
+  }
+
+  warshipDockingRange(): number {
+    return 5;
+  }
+
+  warshipPortHealingBonusPerLevel(): number {
+    return 5;
+  }
+
+  warshipRetreatHealthThreshold(): number {
+    return 750;
+  }
+
+  warshipPassiveHealing(): number {
+    return 1;
+  }
+
+  warshipPassiveHealingRange(): number {
+    return 150;
+  }
+
+  warshipPortSwitchThreshold(): number {
+    return 0.75;
+  }
+
+  defensePostShellAttackRate(): number {
+    return 100;
+  }
+
+  safeFromPiratesCooldownMax(): number {
+    return 20;
+  }
+
+  defensePostTargettingRange(): number {
+    return 75;
+  }
+
+  allianceExtensionPromptOffset(): number {
+    return 300; // 30 seconds before expiration
+  }
 }
diff --git a/src/core/configuration/ConfigLoader.ts b/src/core/configuration/ConfigLoader.ts
deleted file mode 100644
index abb8d3fbc..000000000
--- a/src/core/configuration/ConfigLoader.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { UserSettings } from "../game/UserSettings";
-import { GameConfig } from "../Schemas";
-import { Config, ServerConfig } from "./Config";
-import { DefaultConfig } from "./DefaultConfig";
-import { DevConfig, DevServerConfig } from "./DevConfig";
-import { Env } from "./Env";
-import { preprodConfig } from "./PreprodConfig";
-import { prodConfig } from "./ProdConfig";
-
-export enum GameLogicEnv {
-  Dev = "dev",
-  Default = "default",
-}
-
-export let cachedRuntimeClientServerConfig: ServerConfig | null = null;
-
-declare global {
-  interface Window {
-    BOOTSTRAP_CONFIG?: {
-      gameEnv?: string;
-    };
-  }
-}
-
-export async function getGameLogicConfig(
-  gameConfig: GameConfig,
-  userSettings: UserSettings | null,
-  isReplay: boolean = false,
-): Promise<Config> {
-  const gameLogicEnv = getBuildTimeGameLogicEnv();
-  const serverConfig = getServerConfigForGameLogicEnv(gameLogicEnv);
-
-  switch (gameLogicEnv) {
-    case GameLogicEnv.Dev:
-      return new DevConfig(serverConfig, gameConfig, userSettings, isReplay);
-    case GameLogicEnv.Default:
-      return new DefaultConfig(
-        serverConfig,
-        gameConfig,
-        userSettings,
-        isReplay,
-      );
-    default:
-      throw Error(`unsupported game logic environment: ${gameLogicEnv}`);
-  }
-}
-
-export function getBuildTimeGameLogicEnv(): GameLogicEnv {
-  const bundledGameEnv = process.env.GAME_ENV;
-
-  switch (bundledGameEnv) {
-    case "dev":
-      return GameLogicEnv.Dev;
-    case "staging":
-    case "prod":
-      return GameLogicEnv.Default;
-    case undefined:
-      throw new Error("Missing bundled game logic env");
-    default:
-      throw Error(`unsupported bundled game logic env: ${bundledGameEnv}`);
-  }
-}
-
-export function getServerConfigForGameLogicEnv(
-  gameLogicEnv: GameLogicEnv,
-): ServerConfig {
-  switch (gameLogicEnv) {
-    case GameLogicEnv.Dev:
-      return new DevServerConfig();
-    case GameLogicEnv.Default:
-      console.log("using default game logic config");
-      return prodConfig;
-    default:
-      throw Error(`unsupported game logic environment: ${gameLogicEnv}`);
-  }
-}
-
-export async function getRuntimeClientServerConfig(): Promise<ServerConfig> {
-  if (cachedRuntimeClientServerConfig) {
-    return cachedRuntimeClientServerConfig;
-  }
-
-  if (typeof window === "undefined") {
-    throw new Error(
-      "Runtime client server config is only available on the browser main thread",
-    );
-  }
-
-  const runtimeClientEnv = window.BOOTSTRAP_CONFIG?.gameEnv;
-  if (!runtimeClientEnv) {
-    throw new Error("Missing runtime client server config");
-  }
-
-  cachedRuntimeClientServerConfig = getServerConfig(runtimeClientEnv);
-  return cachedRuntimeClientServerConfig;
-}
-export function getServerConfigFromServer(): ServerConfig {
-  const gameEnv = Env.GAME_ENV;
-  return getServerConfig(gameEnv);
-}
-export function getServerConfig(gameEnv: string) {
-  switch (gameEnv) {
-    case "dev":
-      console.log("using dev server config");
-      return new DevServerConfig();
-    case "staging":
-      console.log("using preprod server config");
-      return preprodConfig;
-    case "prod":
-      console.log("using prod server config");
-      return prodConfig;
-    default:
-      throw Error(`unsupported server configuration: ${gameEnv}`);
-  }
-}
-
-export function clearCachedRuntimeClientServerConfig(): void {
-  cachedRuntimeClientServerConfig = null;
-}
diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts
deleted file mode 100644
index e59653365..000000000
--- a/src/core/configuration/DefaultConfig.ts
+++ /dev/null
@@ -1,1014 +0,0 @@
-import { JWK } from "jose";
-import { z } from "zod";
-import {
-  Difficulty,
-  Game,
-  GameMode,
-  GameType,
-  Gold,
-  Player,
-  PlayerInfo,
-  PlayerType,
-  TerrainType,
-  TerraNullius,
-  Tick,
-  UnitInfo,
-  UnitType,
-} from "../game/Game";
-import { TileRef } from "../game/GameMap";
-import { PlayerView } from "../game/GameView";
-import { UserSettings } from "../game/UserSettings";
-import { GameConfig, GameID, TeamCountConfig } from "../Schemas";
-import { NukeType } from "../StatsSchemas";
-import { assertNever, sigmoid, simpleHash, toInt, within } from "../Util";
-import { Config, GameEnv, NukeMagnitude, ServerConfig, Theme } from "./Config";
-import { Env } from "./Env";
-import { PastelTheme } from "./PastelTheme";
-import { PastelThemeDark } from "./PastelThemeDark";
-
-const DEFENSE_DEBUFF_MIDPOINT = 150_000;
-const DEFENSE_DEBUFF_DECAY_RATE = Math.LN2 / 50000;
-const DEFAULT_SPAWN_IMMUNITY_TICKS = 5 * 10;
-
-const JwksSchema = z.object({
-  keys: z
-    .object({
-      alg: z.literal("EdDSA"),
-      crv: z.literal("Ed25519"),
-      kty: z.literal("OKP"),
-      x: z.string(),
-    })
-    .array()
-    .min(1),
-});
-
-export abstract class DefaultServerConfig implements ServerConfig {
-  abstract turnstileSiteKey(): string;
-  allowedFlares(): string[] | undefined {
-    return;
-  }
-  stripePublishableKey(): string {
-    return Env.STRIPE_PUBLISHABLE_KEY ?? "";
-  }
-  domain(): string {
-    return Env.DOMAIN ?? "";
-  }
-  subdomain(): string {
-    return Env.SUBDOMAIN ?? "";
-  }
-
-  private publicKey: JWK;
-  abstract jwtAudience(): string;
-  jwtIssuer(): string {
-    const audience = this.jwtAudience();
-    return audience === "localhost"
-      ? "http://localhost:8787"
-      : `https://api.${audience}`;
-  }
-  async jwkPublicKey(): Promise<JWK> {
-    if (this.publicKey) return this.publicKey;
-    const jwksUrl = this.jwtIssuer() + "/.well-known/jwks.json";
-    console.log(`Fetching JWKS from ${jwksUrl}`);
-    const response = await fetch(jwksUrl);
-    const result = JwksSchema.safeParse(await response.json());
-    if (!result.success) {
-      const error = z.prettifyError(result.error);
-      console.error("Error parsing JWKS", error);
-      throw new Error("Invalid JWKS");
-    }
-    this.publicKey = result.data.keys[0];
-    return this.publicKey;
-  }
-  otelEnabled(): boolean {
-    return (
-      this.env() !== GameEnv.Dev &&
-      Boolean(this.otelEndpoint()) &&
-      Boolean(this.otelAuthHeader())
-    );
-  }
-  otelEndpoint(): string {
-    return Env.OTEL_EXPORTER_OTLP_ENDPOINT ?? "";
-  }
-  otelAuthHeader(): string {
-    return Env.OTEL_AUTH_HEADER ?? "";
-  }
-  gitCommit(): string {
-    return Env.GIT_COMMIT ?? "";
-  }
-
-  apiKey(): string {
-    return Env.API_KEY ?? "";
-  }
-
-  adminHeader(): string {
-    return "x-admin-key";
-  }
-  adminToken(): string {
-    const token = Env.ADMIN_TOKEN;
-    if (!token) {
-      throw new Error("ADMIN_TOKEN not set");
-    }
-    return token;
-  }
-  abstract numWorkers(): number;
-  abstract env(): GameEnv;
-  turnIntervalMs(): number {
-    return 100;
-  }
-  gameCreationRate(): number {
-    return 2 * 60 * 1000;
-  }
-
-  workerIndex(gameID: GameID): number {
-    return simpleHash(gameID) % this.numWorkers();
-  }
-  workerPath(gameID: GameID): string {
-    return `w${this.workerIndex(gameID)}`;
-  }
-  workerPort(gameID: GameID): number {
-    return this.workerPortByIndex(this.workerIndex(gameID));
-  }
-  workerPortByIndex(index: number): number {
-    return 3001 + index;
-  }
-}
-
-/** SAM launcher construction duration in ticks (non-instant-build). */
-export const SAM_CONSTRUCTION_TICKS = 30 * 10;
-
-export class DefaultConfig implements Config {
-  private pastelTheme: PastelTheme = new PastelTheme();
-  private pastelThemeDark: PastelThemeDark = new PastelThemeDark();
-  private unitInfoCache = new Map<UnitType, UnitInfo>();
-  constructor(
-    private _serverConfig: ServerConfig,
-    private _gameConfig: GameConfig,
-    private _userSettings: UserSettings | null,
-    private _isReplay: boolean,
-  ) {}
-
-  stripePublishableKey(): string {
-    return Env.STRIPE_PUBLISHABLE_KEY ?? "";
-  }
-
-  isReplay(): boolean {
-    return this._isReplay;
-  }
-
-  traitorDefenseDebuff(): number {
-    return 0.5;
-  }
-  traitorSpeedDebuff(): number {
-    return 0.8;
-  }
-  traitorDuration(): number {
-    return 30 * 10; // 30 seconds
-  }
-  spawnImmunityDuration(): Tick {
-    return (
-      this._gameConfig.spawnImmunityDuration ?? DEFAULT_SPAWN_IMMUNITY_TICKS
-    );
-  }
-  nationSpawnImmunityDuration(): Tick {
-    return DEFAULT_SPAWN_IMMUNITY_TICKS;
-  }
-  hasExtendedSpawnImmunity(): boolean {
-    return this.spawnImmunityDuration() > DEFAULT_SPAWN_IMMUNITY_TICKS;
-  }
-
-  gameConfig(): GameConfig {
-    return this._gameConfig;
-  }
-
-  serverConfig(): ServerConfig {
-    return this._serverConfig;
-  }
-
-  userSettings(): UserSettings {
-    if (this._userSettings === null) {
-      throw new Error("userSettings is null");
-    }
-    return this._userSettings;
-  }
-
-  cityTroopIncrease(): number {
-    return 250_000;
-  }
-
-  falloutDefenseModifier(falloutRatio: number): number {
-    // falloutRatio is between 0 and 1
-    // So defense modifier is between [5, 2.5]
-    return 5 - falloutRatio * 2;
-  }
-  SAMCooldown(): number {
-    return 90;
-  }
-  SiloCooldown(): number {
-    return 90;
-  }
-
-  defensePostRange(): number {
-    return 30;
-  }
-
-  defensePostDefenseBonus(): number {
-    return 5;
-  }
-
-  defensePostSpeedBonus(): number {
-    return 3;
-  }
-
-  playerTeams(): TeamCountConfig {
-    return this._gameConfig.playerTeams ?? 0;
-  }
-
-  spawnNations(): boolean {
-    return this._gameConfig.nations !== "disabled";
-  }
-
-  isUnitDisabled(unitType: UnitType): boolean {
-    return this._gameConfig.disabledUnits?.includes(unitType) ?? false;
-  }
-
-  bots(): number {
-    return this._gameConfig.bots;
-  }
-  instantBuild(): boolean {
-    return this._gameConfig.instantBuild;
-  }
-  disableNavMesh(): boolean {
-    return this._gameConfig.disableNavMesh ?? false;
-  }
-  disableAlliances(): boolean {
-    return this._gameConfig.disableAlliances ?? false;
-  }
-  waterNukes(): boolean {
-    return this._gameConfig.waterNukes ?? false;
-  }
-  isRandomSpawn(): boolean {
-    return this._gameConfig.randomSpawn;
-  }
-  infiniteGold(): boolean {
-    return this._gameConfig.infiniteGold;
-  }
-  donateGold(): boolean {
-    return this._gameConfig.donateGold;
-  }
-  infiniteTroops(): boolean {
-    return this._gameConfig.infiniteTroops;
-  }
-  donateTroops(): boolean {
-    return this._gameConfig.donateTroops;
-  }
-  goldMultiplier(): number {
-    return this._gameConfig.goldMultiplier ?? 1;
-  }
-  startingGold(playerInfo: PlayerInfo): Gold {
-    if (playerInfo.playerType === PlayerType.Bot) {
-      return 0n;
-    }
-    return this.startingGoldFor(playerInfo);
-  }
-
-  trainSpawnRate(numPlayerFactories: number): number {
-    // hyperbolic decay, midpoint at 10 factories
-    // expected number of trains = numPlayerFactories  / trainSpawnRate(numPlayerFactories)
-    return (numPlayerFactories + 10) * 15;
-  }
-  trainGold(
-    rel: "self" | "team" | "ally" | "other",
-    citiesVisited: number,
-    player: Player | PlayerView,
-  ): Gold {
-    // No penalty for the first 10 cities.
-    citiesVisited = Math.max(0, citiesVisited - 9);
-    let baseGold: number;
-    switch (rel) {
-      case "ally":
-        baseGold = 35_000;
-        break;
-      case "team":
-      case "other":
-        baseGold = 25_000;
-        break;
-      case "self":
-        baseGold = 10_000;
-        break;
-    }
-    const distPenalty = citiesVisited * 5_000;
-    const gold = Math.max(5000, baseGold - distPenalty);
-    return toInt(gold * this.goldMultiplierFor(player));
-  }
-
-  trainStationMinRange(): number {
-    return 15;
-  }
-  trainStationMaxRange(): number {
-    return 100;
-  }
-  railroadMaxSize(): number {
-    return 120;
-  }
-
-  tradeShipGold(dist: number, player: Player | PlayerView): Gold {
-    // Sigmoid: concave start, sharp S-curve middle, linear end - heavily punishes trades under range debuff.
-    const debuff = this.tradeShipShortRangeDebuff();
-    const baseGold =
-      75_000 / (1 + Math.exp(-0.03 * (dist - debuff))) + 50 * dist;
-    return BigInt(Math.floor(baseGold * this.goldMultiplierFor(player)));
-  }
-
-  // Probability of trade ship spawn = 1 / tradeShipSpawnRate
-  tradeShipSpawnRate(
-    tradeShipSpawnRejections: number,
-    numTradeShips: number,
-  ): number {
-    const decayRate = Math.LN2 / 50;
-
-    // Approaches 0 as numTradeShips increase
-    const baseSpawnRate = 1 - sigmoid(numTradeShips, decayRate, 200);
-
-    // Pity timer: increases spawn chance after consecutive rejections
-    const rejectionModifier = 1 / (tradeShipSpawnRejections + 1);
-
-    return Math.floor((100 * rejectionModifier) / baseSpawnRate);
-  }
-
-  unitInfo(type: UnitType): UnitInfo {
-    const cached = this.unitInfoCache.get(type);
-    if (cached !== undefined) {
-      return cached;
-    }
-
-    let info: UnitInfo;
-    switch (type) {
-      case UnitType.TransportShip:
-        info = {
-          cost: () => 0n,
-        };
-        break;
-      case UnitType.Warship:
-        info = {
-          cost: this.costWrapper(
-            (numUnits: number) => Math.min(1_000_000, (numUnits + 1) * 250_000),
-            UnitType.Warship,
-          ),
-          maxHealth: 1000,
-        };
-        break;
-      case UnitType.Shell:
-        info = {
-          cost: () => 0n,
-          damage: 250,
-        };
-        break;
-      case UnitType.SAMMissile:
-        info = {
-          cost: () => 0n,
-        };
-        break;
-      case UnitType.Port:
-        info = {
-          cost: this.costWrapper(
-            (numUnits: number) =>
-              Math.min(1_000_000, Math.pow(2, numUnits) * 125_000),
-            UnitType.Port,
-            UnitType.Factory,
-          ),
-          constructionDuration: this.instantBuild() ? 0 : 5 * 10,
-          upgradable: true,
-        };
-        break;
-      case UnitType.AtomBomb:
-        info = {
-          cost: this.costWrapper(() => 750_000, UnitType.AtomBomb),
-        };
-        break;
-      case UnitType.HydrogenBomb:
-        info = {
-          cost: this.costWrapper(() => 5_000_000, UnitType.HydrogenBomb),
-        };
-        break;
-      case UnitType.MIRV:
-        info = {
-          cost: (game: Game, player: Player) => {
-            if (
-              player.type() === PlayerType.Human &&
-              this.hasInfiniteGoldFor(player)
-            ) {
-              return 0n;
-            }
-            return 25_000_000n + game.stats().numMirvsLaunched() * 15_000_000n;
-          },
-        };
-        break;
-      case UnitType.MIRVWarhead:
-        info = {
-          cost: () => 0n,
-        };
-        break;
-      case UnitType.TradeShip:
-        info = {
-          cost: () => 0n,
-        };
-        break;
-      case UnitType.MissileSilo:
-        info = {
-          cost: this.costWrapper(() => 1_000_000, UnitType.MissileSilo),
-          constructionDuration: this.instantBuild() ? 0 : 10 * 10,
-          upgradable: true,
-        };
-        break;
-      case UnitType.DefensePost:
-        info = {
-          cost: this.costWrapper(
-            (numUnits: number) => Math.min(250_000, (numUnits + 1) * 50_000),
-            UnitType.DefensePost,
-          ),
-          constructionDuration: this.instantBuild() ? 0 : 5 * 10,
-        };
-        break;
-      case UnitType.SAMLauncher:
-        info = {
-          cost: this.costWrapper(
-            (numUnits: number) =>
-              Math.min(3_000_000, (numUnits + 1) * 1_500_000),
-            UnitType.SAMLauncher,
-          ),
-          constructionDuration: this.instantBuild()
-            ? 0
-            : SAM_CONSTRUCTION_TICKS,
-          upgradable: true,
-        };
-        break;
-      case UnitType.City:
-        info = {
-          cost: this.costWrapper(
-            (numUnits: number) =>
-              Math.min(1_000_000, Math.pow(2, numUnits) * 125_000),
-            UnitType.City,
-          ),
-          constructionDuration: this.instantBuild() ? 0 : 2 * 10,
-          upgradable: true,
-        };
-        break;
-      case UnitType.Factory:
-        info = {
-          cost: this.costWrapper(
-            (numUnits: number) =>
-              Math.min(1_000_000, Math.pow(2, numUnits) * 125_000),
-            UnitType.Factory,
-            UnitType.Port,
-          ),
-          constructionDuration: this.instantBuild() ? 0 : 2 * 10,
-          upgradable: true,
-        };
-        break;
-      case UnitType.Train:
-        info = {
-          cost: () => 0n,
-        };
-        break;
-      default:
-        assertNever(type);
-    }
-
-    this.unitInfoCache.set(type, info);
-    return info;
-  }
-
-  private hasInfiniteGoldFor(player: Player | PlayerView): boolean {
-    if (this.infiniteGold()) return true;
-    const hc = this._gameConfig.hostCheats;
-    return (hc?.infiniteGold ?? false) && player.isLobbyCreator();
-  }
-
-  private hasInfiniteTroopsFor(player: Player | PlayerView): boolean {
-    if (this.infiniteTroops()) return true;
-    return (
-      (this._gameConfig.hostCheats?.infiniteTroops ?? false) &&
-      player.isLobbyCreator()
-    );
-  }
-
-  private hasInfiniteTroopsForInfo(playerInfo: PlayerInfo): boolean {
-    if (this.infiniteTroops()) return true;
-    return (
-      (this._gameConfig.hostCheats?.infiniteTroops ?? false) &&
-      playerInfo.isLobbyCreator
-    );
-  }
-
-  private goldMultiplierFor(player: Player | PlayerView): number {
-    const base = this.goldMultiplier();
-    const hc = this._gameConfig.hostCheats;
-    if (hc?.goldMultiplier && player.isLobbyCreator()) {
-      return hc.goldMultiplier;
-    }
-    return base;
-  }
-
-  public conquerGoldAmount(captured: Player): Gold {
-    if (
-      captured.type() === PlayerType.Bot ||
-      captured.type() === PlayerType.Nation
-    ) {
-      return captured.gold();
-    } else {
-      return captured.gold() / 2n;
-    }
-  }
-
-  private startingGoldFor(playerInfo: PlayerInfo): Gold {
-    const base = BigInt(this._gameConfig.startingGold ?? 0);
-    const hc = this._gameConfig.hostCheats;
-    if (hc?.startingGold && playerInfo.isLobbyCreator) {
-      return base + BigInt(hc.startingGold);
-    }
-    return base;
-  }
-
-  private costWrapper(
-    costFn: (units: number) => number,
-    ...types: UnitType[]
-  ): (g: Game, p: Player) => bigint {
-    return (game: Game, player: Player) => {
-      if (
-        player.type() === PlayerType.Human &&
-        this.hasInfiniteGoldFor(player)
-      ) {
-        return 0n;
-      }
-      const numUnits = types.reduce(
-        (acc, type) =>
-          acc +
-          Math.min(player.unitsOwned(type), player.unitsConstructed(type)),
-        0,
-      );
-      return BigInt(costFn(numUnits));
-    };
-  }
-
-  defaultDonationAmount(sender: Player): number {
-    return Math.floor(sender.troops() / 3);
-  }
-  donateCooldown(): Tick {
-    return 10 * 10;
-  }
-  embargoAllCooldown(): Tick {
-    return 10 * 10;
-  }
-  deletionMarkDuration(): Tick {
-    return 30 * 10;
-  }
-
-  deleteUnitCooldown(): Tick {
-    return 30 * 10;
-  }
-  emojiMessageDuration(): Tick {
-    return 5 * 10;
-  }
-  emojiMessageCooldown(): Tick {
-    return 5 * 10;
-  }
-  targetDuration(): Tick {
-    return 10 * 10;
-  }
-  targetCooldown(): Tick {
-    return 15 * 10;
-  }
-  allianceRequestDuration(): Tick {
-    return 20 * 10;
-  }
-  allianceRequestCooldown(): Tick {
-    return 30 * 10;
-  }
-  allianceDuration(): Tick {
-    return 300 * 10; // 5 minutes.
-  }
-  temporaryEmbargoDuration(): Tick {
-    return 300 * 10; // 5 minutes.
-  }
-  minDistanceBetweenPlayers(): number {
-    return 30;
-  }
-
-  percentageTilesOwnedToWin(): number {
-    if (this._gameConfig.gameMode === GameMode.Team) {
-      return 95;
-    }
-    return 80;
-  }
-  boatMaxNumber(): number {
-    if (this.isUnitDisabled(UnitType.TransportShip)) {
-      return 0;
-    }
-    return 3;
-  }
-  numSpawnPhaseTurns(): number {
-    if (this._gameConfig.gameType === GameType.Singleplayer) {
-      return 100;
-    }
-    if (this.isRandomSpawn()) {
-      return 150;
-    }
-    return 300;
-  }
-  numBots(): number {
-    return this.bots();
-  }
-  theme(): Theme {
-    return this.userSettings()?.darkMode()
-      ? this.pastelThemeDark
-      : this.pastelTheme;
-  }
-
-  attackLogic(
-    gm: Game,
-    attackTroops: number,
-    attacker: Player,
-    defender: Player | TerraNullius,
-    tileToConquer: TileRef,
-  ): {
-    attackerTroopLoss: number;
-    defenderTroopLoss: number;
-    tilesPerTickUsed: number;
-  } {
-    let mag = 0;
-    let speed = 0;
-    const type = gm.terrainType(tileToConquer);
-    switch (type) {
-      case TerrainType.Plains:
-        mag = 80;
-        speed = 16.5;
-        break;
-      case TerrainType.Highland:
-        mag = 100;
-        speed = 20;
-        break;
-      case TerrainType.Mountain:
-        mag = 120;
-        speed = 25;
-        break;
-      default:
-        throw new Error(`terrain type ${type} not supported`);
-    }
-    if (defender.isPlayer()) {
-      for (const dp of gm.nearbyUnits(
-        tileToConquer,
-        gm.config().defensePostRange(),
-        UnitType.DefensePost,
-      )) {
-        if (dp.unit.owner() === defender) {
-          mag *= this.defensePostDefenseBonus();
-          speed *= this.defensePostSpeedBonus();
-          break;
-        }
-      }
-    }
-
-    if (gm.hasFallout(tileToConquer)) {
-      const falloutRatio = gm.numTilesWithFallout() / gm.numLandTiles();
-      mag *= this.falloutDefenseModifier(falloutRatio);
-      speed *= this.falloutDefenseModifier(falloutRatio);
-    }
-
-    if (attacker.isPlayer() && defender.isPlayer()) {
-      if (defender.isDisconnected() && attacker.isOnSameTeam(defender)) {
-        // No troop loss if defender is disconnected and on same team
-        mag = 0;
-      }
-      if (
-        (attacker.type() === PlayerType.Human ||
-          attacker.type() === PlayerType.Nation) &&
-        defender.type() === PlayerType.Bot
-      ) {
-        mag *= 0.7;
-      }
-    }
-
-    if (defender.isPlayer()) {
-      const defenseSig =
-        1 -
-        sigmoid(
-          defender.numTilesOwned(),
-          DEFENSE_DEBUFF_DECAY_RATE,
-          DEFENSE_DEBUFF_MIDPOINT,
-        );
-
-      const largeDefenderSpeedDebuff = 0.7 + 0.3 * defenseSig;
-      const largeDefenderAttackDebuff = 0.7 + 0.3 * defenseSig;
-
-      let largeAttackBonus = 1;
-      if (attacker.numTilesOwned() > 100_000) {
-        largeAttackBonus = Math.sqrt(100_000 / attacker.numTilesOwned()) ** 0.7;
-      }
-      let largeAttackerSpeedBonus = 1;
-      if (attacker.numTilesOwned() > 100_000) {
-        largeAttackerSpeedBonus = (100_000 / attacker.numTilesOwned()) ** 0.6;
-      }
-
-      const defenderTroopLoss = defender.troops() / defender.numTilesOwned();
-      const traitorMod = defender.isTraitor() ? this.traitorDefenseDebuff() : 1;
-      const currentAttackerLoss =
-        within(defender.troops() / attackTroops, 0.6, 2) *
-        mag *
-        0.8 *
-        largeDefenderAttackDebuff *
-        largeAttackBonus *
-        traitorMod;
-      const altAttackerLoss =
-        1.3 * defenderTroopLoss * (mag / 100) * traitorMod;
-      const attackerTroopLoss =
-        0.6 * currentAttackerLoss + 0.4 * altAttackerLoss;
-
-      return {
-        attackerTroopLoss,
-        defenderTroopLoss,
-        tilesPerTickUsed:
-          within(defender.troops() / (5 * attackTroops), 0.2, 1.5) *
-          speed *
-          largeDefenderSpeedDebuff *
-          largeAttackerSpeedBonus *
-          (defender.isTraitor() ? this.traitorSpeedDebuff() : 1),
-      };
-    } else {
-      return {
-        attackerTroopLoss:
-          attacker.type() === PlayerType.Bot ? mag / 10 : mag / 5,
-        defenderTroopLoss: 0,
-        tilesPerTickUsed: within(
-          (2000 * Math.max(10, speed)) / attackTroops,
-          5,
-          100,
-        ),
-      };
-    }
-  }
-
-  attackTilesPerTick(
-    attackTroops: number,
-    attacker: Player,
-    defender: Player | TerraNullius,
-    numAdjacentTilesWithEnemy: number,
-  ): number {
-    if (defender.isPlayer()) {
-      return (
-        within(((5 * attackTroops) / defender.troops()) * 2, 0.01, 0.5) *
-        numAdjacentTilesWithEnemy *
-        3
-      );
-    } else {
-      return numAdjacentTilesWithEnemy * 2;
-    }
-  }
-
-  boatAttackAmount(attacker: Player, defender: Player | TerraNullius): number {
-    return Math.floor(attacker.troops() / 5);
-  }
-
-  warshipShellLifetime(): number {
-    return 20; // in ticks (one tick is 100ms)
-  }
-
-  radiusPortSpawn() {
-    return 20;
-  }
-
-  tradeShipShortRangeDebuff(): number {
-    return 300;
-  }
-
-  proximityBonusPortsNb(totalPorts: number) {
-    return within(totalPorts / 3, 4, totalPorts);
-  }
-
-  attackAmount(attacker: Player, defender: Player | TerraNullius) {
-    if (attacker.type() === PlayerType.Bot) {
-      return attacker.troops() / 20;
-    } else {
-      return attacker.troops() / 5;
-    }
-  }
-
-  startManpower(playerInfo: PlayerInfo): number {
-    if (playerInfo.playerType === PlayerType.Bot) {
-      return 10_000;
-    }
-    if (playerInfo.playerType === PlayerType.Nation) {
-      switch (this._gameConfig.difficulty) {
-        case Difficulty.Easy:
-          return 12_500;
-        case Difficulty.Medium:
-          return 18_750;
-        case Difficulty.Hard:
-          return 25_000; // Like humans
-        case Difficulty.Impossible:
-          return 31_250;
-        default:
-          assertNever(this._gameConfig.difficulty);
-      }
-    }
-    return this.hasInfiniteTroopsForInfo(playerInfo) ? 1_000_000 : 25_000;
-  }
-
-  maxTroops(player: Player | PlayerView): number {
-    const maxTroops =
-      player.type() === PlayerType.Human && this.hasInfiniteTroopsFor(player)
-        ? 1_000_000_000
-        : 2 * (Math.pow(player.numTilesOwned(), 0.6) * 1000 + 50000) +
-          player
-            .units(UnitType.City)
-            .filter((u) => !u.isUnderConstruction())
-            .map((city) => city.level())
-            .reduce((a, b) => a + b, 0) *
-            this.cityTroopIncrease();
-
-    if (player.type() === PlayerType.Bot) {
-      return maxTroops / 3;
-    }
-
-    if (player.type() === PlayerType.Human) {
-      return maxTroops;
-    }
-
-    switch (this._gameConfig.difficulty) {
-      case Difficulty.Easy:
-        return maxTroops * 0.5;
-      case Difficulty.Medium:
-        return maxTroops * 0.75;
-      case Difficulty.Hard:
-        return maxTroops * 1; // Like humans
-      case Difficulty.Impossible:
-        return maxTroops * 1.25;
-      default:
-        assertNever(this._gameConfig.difficulty);
-    }
-  }
-
-  troopIncreaseRate(player: Player): number {
-    const max = this.maxTroops(player);
-
-    let toAdd = 10 + Math.pow(player.troops(), 0.73) / 4;
-
-    const ratio = 1 - player.troops() / max;
-    toAdd *= ratio;
-
-    if (player.type() === PlayerType.Bot) {
-      toAdd *= 0.5;
-    }
-
-    if (player.type() === PlayerType.Nation) {
-      switch (this._gameConfig.difficulty) {
-        case Difficulty.Easy:
-          toAdd *= 0.9;
-          break;
-        case Difficulty.Medium:
-          toAdd *= 0.95;
-          break;
-        case Difficulty.Hard:
-          toAdd *= 1; // Like humans
-          break;
-        case Difficulty.Impossible:
-          toAdd *= 1.05;
-          break;
-        default:
-          assertNever(this._gameConfig.difficulty);
-      }
-    }
-
-    return Math.min(player.troops() + toAdd, max) - player.troops();
-  }
-
-  goldAdditionRate(player: Player): Gold {
-    const multiplier = this.goldMultiplierFor(player);
-    let baseRate: bigint;
-    if (player.type() === PlayerType.Bot) {
-      baseRate = 50n;
-    } else {
-      baseRate = 100n;
-    }
-    return BigInt(Math.floor(Number(baseRate) * multiplier));
-  }
-
-  nukeMagnitudes(unitType: UnitType): NukeMagnitude {
-    switch (unitType) {
-      case UnitType.MIRVWarhead:
-        return { inner: 12, outer: 18 };
-      case UnitType.AtomBomb:
-        return { inner: 12, outer: 30 };
-      case UnitType.HydrogenBomb:
-        return { inner: 80, outer: 100 };
-    }
-    throw new Error(`Unknown nuke type: ${unitType}`);
-  }
-
-  nukeAllianceBreakThreshold(): number {
-    return 100;
-  }
-
-  defaultNukeSpeed(): number {
-    return 8;
-  }
-
-  defaultNukeTargetableRange(): number {
-    return 150;
-  }
-
-  defaultSamRange(): number {
-    return 70;
-  }
-
-  samRange(level: number): number {
-    // rational growth function (level 1 = 70, level 5 just above hydro range, asymptotically approaches 150)
-    return this.maxSamRange() - 480 / (level + 5);
-  }
-
-  maxSamRange(): number {
-    return 150;
-  }
-
-  defaultSamMissileSpeed(): number {
-    return 12;
-  }
-
-  // Humans can be soldiers, soldiers attacking, soldiers in boat etc.
-  nukeDeathFactor(
-    nukeType: NukeType,
-    humans: number,
-    tilesOwned: number,
-    maxTroops: number,
-  ): number {
-    if (nukeType !== UnitType.MIRVWarhead) {
-      return (5 * humans) / Math.max(1, tilesOwned);
-    }
-    const targetTroops = 0.03 * maxTroops;
-    const excessTroops = Math.max(0, humans - targetTroops);
-    const scalingFactor = 500;
-
-    const steepness = 2;
-    const normalizedExcess = excessTroops / maxTroops;
-    return scalingFactor * (1 - Math.exp(-steepness * normalizedExcess));
-  }
-
-  structureMinDist(): number {
-    return 15;
-  }
-
-  shellLifetime(): number {
-    return 50;
-  }
-
-  warshipPatrolRange(): number {
-    return 100;
-  }
-
-  warshipTargettingRange(): number {
-    return 130;
-  }
-
-  warshipShellAttackRate(): number {
-    return 20;
-  }
-
-  warshipDockingRange(): number {
-    return 5;
-  }
-
-  warshipPortHealingBonusPerLevel(): number {
-    return 5;
-  }
-
-  warshipRetreatHealthThreshold(): number {
-    return 750;
-  }
-
-  warshipPassiveHealing(): number {
-    return 1;
-  }
-
-  warshipPassiveHealingRange(): number {
-    return 150;
-  }
-
-  warshipPortSwitchThreshold(): number {
-    return 0.75;
-  }
-
-  defensePostShellAttackRate(): number {
-    return 100;
-  }
-
-  safeFromPiratesCooldownMax(): number {
-    return 20;
-  }
-
-  defensePostTargettingRange(): number {
-    return 75;
-  }
-
-  allianceExtensionPromptOffset(): number {
-    return 300; // 30 seconds before expiration
-  }
-}
diff --git a/src/core/configuration/DevConfig.ts b/src/core/configuration/DevConfig.ts
deleted file mode 100644
index 8ead8c8e5..000000000
--- a/src/core/configuration/DevConfig.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { UserSettings } from "../game/UserSettings";
-import { GameConfig } from "../Schemas";
-import { GameEnv, ServerConfig } from "./Config";
-import { DefaultConfig, DefaultServerConfig } from "./DefaultConfig";
-
-export class DevServerConfig extends DefaultServerConfig {
-  turnstileSiteKey(): string {
-    return "1x00000000000000000000AA";
-  }
-
-  adminToken(): string {
-    return "WARNING_DEV_ADMIN_KEY_DO_NOT_USE_IN_PRODUCTION";
-  }
-
-  apiKey(): string {
-    return "WARNING_DEV_API_KEY_DO_NOT_USE_IN_PRODUCTION";
-  }
-
-  env(): GameEnv {
-    return GameEnv.Dev;
-  }
-
-  gameCreationRate(): number {
-    return 5 * 1000;
-  }
-
-  numWorkers(): number {
-    return 2;
-  }
-  jwtAudience(): string {
-    return "localhost";
-  }
-  gitCommit(): string {
-    return "DEV";
-  }
-
-  domain(): string {
-    return "localhost";
-  }
-
-  subdomain(): string {
-    return "";
-  }
-}
-
-export class DevConfig extends DefaultConfig {
-  constructor(
-    sc: ServerConfig,
-    gc: GameConfig,
-    us: UserSettings | null,
-    isReplay: boolean,
-  ) {
-    super(sc, gc, us, isReplay);
-  }
-}
diff --git a/src/core/configuration/Env.ts b/src/core/configuration/Env.ts
index b5dfe2111..e8d473abf 100644
--- a/src/core/configuration/Env.ts
+++ b/src/core/configuration/Env.ts
@@ -86,4 +86,16 @@ export const Env = {
   get ADMIN_TOKEN() {
     return getEnv("ADMIN_TOKEN");
   },
+  get NUM_WORKERS() {
+    return getEnv("NUM_WORKERS");
+  },
+  get TURNSTILE_SITE_KEY() {
+    return getEnv("TURNSTILE_SITE_KEY");
+  },
+  get JWT_AUDIENCE() {
+    return getEnv("JWT_AUDIENCE");
+  },
+  get ALLOWED_FLARES() {
+    return getEnv("ALLOWED_FLARES");
+  },
 };
diff --git a/src/core/configuration/PastelTheme.ts b/src/core/configuration/PastelTheme.ts
index 23ae4e653..a4be6a1c7 100644
--- a/src/core/configuration/PastelTheme.ts
+++ b/src/core/configuration/PastelTheme.ts
@@ -5,7 +5,7 @@ import { GameMap, TileRef } from "../game/GameMap";
 import { PlayerView } from "../game/GameView";
 import { ColorAllocator } from "./ColorAllocator";
 import { botColors, fallbackColors, humanColors, nationColors } from "./Colors";
-import { Theme } from "./Config";
+import { Theme } from "./Theme";
 
 export class PastelTheme implements Theme {
   private rand = new PseudoRandom(123);
diff --git a/src/core/configuration/PreprodConfig.ts b/src/core/configuration/PreprodConfig.ts
deleted file mode 100644
index e9346cc26..000000000
--- a/src/core/configuration/PreprodConfig.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { GameEnv } from "./Config";
-import { DefaultServerConfig } from "./DefaultConfig";
-
-export const preprodConfig = new (class extends DefaultServerConfig {
-  env(): GameEnv {
-    return GameEnv.Preprod;
-  }
-  numWorkers(): number {
-    return 2;
-  }
-  turnstileSiteKey(): string {
-    return "0x4AAAAAAB7QetxHwRCKw-aP";
-  }
-  jwtAudience(): string {
-    return "openfront.dev";
-  }
-  allowedFlares(): string[] | undefined {
-    return undefined;
-    // TODO: Uncomment this after testing.
-    // Allow access without login for now to test
-    // the new login flow.
-    // return [
-    //   // "access:openfront.dev"
-    // ];
-  }
-})();
diff --git a/src/core/configuration/ProdConfig.ts b/src/core/configuration/ProdConfig.ts
deleted file mode 100644
index 198dd8007..000000000
--- a/src/core/configuration/ProdConfig.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { GameEnv } from "./Config";
-import { DefaultServerConfig } from "./DefaultConfig";
-
-export const prodConfig = new (class extends DefaultServerConfig {
-  numWorkers(): number {
-    return 20;
-  }
-  env(): GameEnv {
-    return GameEnv.Prod;
-  }
-  jwtAudience(): string {
-    return "openfront.io";
-  }
-  turnstileSiteKey(): string {
-    return "0x4AAAAAACFLkaecN39lS8sk";
-  }
-})();
diff --git a/src/core/configuration/Theme.ts b/src/core/configuration/Theme.ts
new file mode 100644
index 000000000..788c41c73
--- /dev/null
+++ b/src/core/configuration/Theme.ts
@@ -0,0 +1,31 @@
+import { Colord } from "colord";
+import { Team } from "../game/Game";
+import { GameMap, TileRef } from "../game/GameMap";
+import { PlayerView } from "../game/GameView";
+
+export interface Theme {
+  teamColor(team: Team): Colord;
+  // Don't call directly, use PlayerView
+  territoryColor(playerInfo: PlayerView): Colord;
+  // Don't call directly, use PlayerView
+  structureColors(territoryColor: Colord): { light: Colord; dark: Colord };
+  // Don't call directly, use PlayerView
+  borderColor(territoryColor: Colord): Colord;
+  // Don't call directly, use PlayerView
+  defendedBorderColors(territoryColor: Colord): { light: Colord; dark: Colord };
+  focusedBorderColor(): Colord;
+  terrainColor(gm: GameMap, tile: TileRef): Colord;
+  backgroundColor(): Colord;
+  falloutColor(): Colord;
+  font(): string;
+  textColor(playerInfo: PlayerView): string;
+  // unit color for alternate view
+  selfColor(): Colord;
+  allyColor(): Colord;
+  neutralColor(): Colord;
+  enemyColor(): Colord;
+  spawnHighlightColor(): Colord;
+  spawnHighlightSelfColor(): Colord;
+  spawnHighlightTeamColor(): Colord;
+  spawnHighlightEnemyColor(): Colord;
+}
diff --git a/src/core/worker/Worker.worker.ts b/src/core/worker/Worker.worker.ts
index 8edb630cf..b86efd654 100644
--- a/src/core/worker/Worker.worker.ts
+++ b/src/core/worker/Worker.worker.ts
@@ -1,7 +1,7 @@
 import { assetUrl } from "../AssetUrls";
-import { createGameRunner, GameRunner } from "../GameRunner";
 import { FetchGameMapLoader } from "../game/FetchGameMapLoader";
 import { ErrorUpdate, GameUpdateViewData } from "../game/GameUpdates";
+import { createGameRunner, GameRunner } from "../GameRunner";
 import {
   AttackClusteredPositionsResultMessage,
   InitializedMessage,
diff --git a/src/server/Archive.ts b/src/server/Archive.ts
index 1721f9f33..4970e8379 100644
--- a/src/server/Archive.ts
+++ b/src/server/Archive.ts
@@ -1,5 +1,4 @@
 import z from "zod";
-import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
 import { GameType } from "../core/game/Game";
 import {
   GameID,
@@ -10,8 +9,7 @@ import {
 } from "../core/Schemas";
 import { replacer } from "../core/Util";
 import { logger } from "./Logger";
-
-const config = getServerConfigFromServer();
+import { ServerEnv } from "./ServerEnv";
 
 const log = logger.child({ component: "Archive" });
 
@@ -31,13 +29,13 @@ export async function archive(
       });
       return;
     }
-    const url = `${config.jwtIssuer()}/game/${gameRecord.info.gameID}`;
+    const url = `${ServerEnv.jwtIssuer()}/game/${gameRecord.info.gameID}`;
     const response = await fetch(url, {
       method: "POST",
       body: JSON.stringify(gameRecord, replacer),
       headers: {
         "Content-Type": "application/json",
-        "x-api-key": config.apiKey(),
+        "x-api-key": ServerEnv.apiKey(),
       },
     });
     if (!response.ok) {
@@ -62,12 +60,12 @@ export async function readGameRecord(
       log.error(`invalid game ID: ${gameId}`);
       return null;
     }
-    const url = `${config.jwtIssuer()}/game/${gameId}`;
+    const url = `${ServerEnv.jwtIssuer()}/game/${gameId}`;
     const response = await fetch(url, {
       method: "GET",
       headers: {
         "Content-Type": "application/json",
-        "x-api-key": config.apiKey(),
+        "x-api-key": ServerEnv.apiKey(),
       },
     });
     const record = await response.json();
@@ -91,9 +89,9 @@ export function finalizeGameRecord(
 ): GameRecord {
   return {
     ...clientRecord,
-    gitCommit: config.gitCommit(),
-    subdomain: config.subdomain(),
-    domain: config.domain(),
+    gitCommit: ServerEnv.gitCommit(),
+    subdomain: ServerEnv.subdomain(),
+    domain: ServerEnv.domain(),
   };
 }
 
diff --git a/src/server/GameManager.ts b/src/server/GameManager.ts
index 05b218a09..72065a206 100644
--- a/src/server/GameManager.ts
+++ b/src/server/GameManager.ts
@@ -1,6 +1,5 @@
 import { Logger } from "winston";
 import WebSocket from "ws";
-import { ServerConfig } from "../core/configuration/Config";
 import {
   Difficulty,
   GameMapSize,
@@ -15,10 +14,7 @@ import { GamePhase, GameServer } from "./GameServer";
 export class GameManager {
   private games: Map<GameID, GameServer> = new Map();
 
-  constructor(
-    private config: ServerConfig,
-    private log: Logger,
-  ) {
+  constructor(private log: Logger) {
     setInterval(() => this.tick(), 1000);
   }
 
@@ -69,7 +65,6 @@ export class GameManager {
       id,
       this.log,
       Date.now(),
-      this.config,
       {
         donateGold: false,
         donateTroops: false,
diff --git a/src/server/GamePreviewRoute.ts b/src/server/GamePreviewRoute.ts
index c67551060..66a00fde5 100644
--- a/src/server/GamePreviewRoute.ts
+++ b/src/server/GamePreviewRoute.ts
@@ -4,7 +4,6 @@ import { parse } from "node-html-parser";
 import path from "path";
 import type { Logger } from "winston";
 import { z } from "zod";
-import type { ServerConfig } from "../core/configuration/Config";
 import { GAME_ID_REGEX, GameInfo } from "../core/Schemas";
 import { replacer } from "../core/Util";
 import type { GameManager } from "./GameManager";
@@ -16,17 +15,19 @@ import {
 } from "./GamePreviewBuilder";
 import { setNoStoreHeaders } from "./NoStoreHeaders";
 import { getAppShellContent, setHtmlNoCacheHeaders } from "./RenderHtml";
+import { ServerEnv } from "./ServerEnv";
 
-const requestOrigin = (req: Request, config: ServerConfig): string => {
+const requestOrigin = (req: Request): string => {
   const protoHeader = (req.headers["x-forwarded-proto"] as string) ?? "";
   const proto = protoHeader.split(",")[0]?.trim() || req.protocol || "https";
-  const host = req.get("host") ?? `${config.subdomain()}.${config.domain()}`;
+  const host =
+    req.get("host") ?? `${ServerEnv.subdomain()}.${ServerEnv.domain()}`;
 
   // Force https only for the configured public domain (and its subdomains).
   // This avoids hardcoding hostnames while ensuring we don't force https on
   // localhost or arbitrary custom hosts.
   const hostname = host.split(":")[0].toLowerCase();
-  const domain = config.domain().toLowerCase();
+  const domain = ServerEnv.domain().toLowerCase();
   const forceHttps = hostname === domain || hostname.endsWith(`.${domain}`);
 
   return `${forceHttps ? "https" : proto}://${host}`;
@@ -35,12 +36,11 @@ const requestOrigin = (req: Request, config: ServerConfig): string => {
 export function registerGamePreviewRoute(opts: {
   app: Express;
   gm: GameManager;
-  config: ServerConfig;
   workerId: number;
   log: Logger;
   baseDir: string;
 }) {
-  const { app, gm, config, log, baseDir } = opts;
+  const { app, gm, log, baseDir } = opts;
 
   const gameIDSchema = z.string().regex(GAME_ID_REGEX);
 
@@ -52,11 +52,11 @@ export function registerGamePreviewRoute(opts: {
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), 1500);
     try {
-      const apiDomain = config.jwtIssuer();
+      const apiDomain = ServerEnv.jwtIssuer();
       const encodedID = encodeURIComponent(gameID);
       const response = await fetch(`${apiDomain}/game/${encodedID}`, {
         headers: {
-          "x-api-key": config.apiKey(),
+          "x-api-key": ServerEnv.apiKey(),
         },
         signal: controller.signal,
       });
@@ -99,11 +99,11 @@ export function registerGamePreviewRoute(opts: {
         return res.redirect(302, "/");
       }
 
-      const origin = requestOrigin(req, config);
+      const origin = requestOrigin(req);
       const meta = await buildPreview(
         gameID,
         origin,
-        config.workerPath(gameID),
+        ServerEnv.workerPath(gameID),
         lobby,
         publicInfo,
       );
diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts
index 21f3a4418..9d5d2cfd2 100644
--- a/src/server/GameServer.ts
+++ b/src/server/GameServer.ts
@@ -3,7 +3,7 @@ import { Logger } from "winston";
 import WebSocket from "ws";
 import { z } from "zod";
 import { isAdminRole } from "../core/ApiSchemas";
-import { GameEnv, ServerConfig } from "../core/configuration/Config";
+import { GameEnv } from "../core/configuration/Config";
 import { GameType } from "../core/game/Game";
 import {
   ClientID,
@@ -28,6 +28,7 @@ import { createPartialGameRecord } from "../core/Util";
 import { archive, finalizeGameRecord } from "./Archive";
 import { Client } from "./Client";
 import { ClientMsgRateLimiter } from "./ClientMsgRateLimiter";
+import { ServerEnv } from "./ServerEnv";
 export enum GamePhase {
   Lobby = "LOBBY",
   Active = "ACTIVE",
@@ -96,7 +97,6 @@ export class GameServer {
     public readonly id: string,
     readonly log_: Logger,
     public readonly createdAt: number,
-    private config: ServerConfig,
     public gameConfig: GameConfig,
     private creatorPersistentID?: string,
     private startsAt?: number,
@@ -236,7 +236,7 @@ export class GameServer {
       return "rejected";
     }
 
-    if (this.config.env() === GameEnv.Prod) {
+    if (ServerEnv.env() === GameEnv.Prod) {
       // Prevent multiple clients from using the same account in prod
       const conflicting = this.activeClients.find(
         (c) =>
@@ -751,7 +751,7 @@ export class GameServer {
 
     this.endTurnIntervalID = setInterval(
       () => this.endTurn(),
-      this.config.turnIntervalMs(),
+      ServerEnv.turnIntervalMs(),
     );
     this.activeClients.forEach((c) => {
       this.log.info("sending start message", {
diff --git a/src/server/Logger.ts b/src/server/Logger.ts
index 6a47b9ead..4ef5c917d 100644
--- a/src/server/Logger.ts
+++ b/src/server/Logger.ts
@@ -7,12 +7,10 @@ import {
 import { OpenTelemetryTransportV3 } from "@opentelemetry/winston-transport";
 import * as dotenv from "dotenv";
 import winston from "winston";
-import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
 import { getOtelResource } from "./OtelResource";
+import { ServerEnv } from "./ServerEnv";
 dotenv.config();
 
-const config = getServerConfigFromServer();
-
 const resource = getOtelResource();
 
 // Initialize the OpenTelemetry Logger Provider
@@ -20,14 +18,14 @@ const loggerProvider = new LoggerProvider({
   resource,
 });
 
-if (config.otelEnabled()) {
+if (ServerEnv.otelEnabled()) {
   console.log("OTEL enabled");
   // Configure OpenTelemetry endpoint with basic auth (if provided)
   const headers: Record<string, string> = {};
-  headers["Authorization"] = "Basic " + config.otelAuthHeader();
+  headers["Authorization"] = "Basic " + ServerEnv.otelAuthHeader();
   // Add OTLP exporter for logs
   const logExporter = new OTLPLogExporter({
-    url: `${config.otelEndpoint()}/v1/logs`,
+    url: `${ServerEnv.otelEndpoint()}/v1/logs`,
     headers,
   });
 
diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts
index 5386a5834..7d736e6d9 100644
--- a/src/server/MapPlaylist.ts
+++ b/src/server/MapPlaylist.ts
@@ -1,4 +1,4 @@
-import { SAM_CONSTRUCTION_TICKS } from "../core/configuration/DefaultConfig";
+import { SAM_CONSTRUCTION_TICKS } from "../core/configuration/Config";
 import {
   Difficulty,
   Duos,
diff --git a/src/server/Master.ts b/src/server/Master.ts
index 0a1472842..db96fc225 100644
--- a/src/server/Master.ts
+++ b/src/server/Master.ts
@@ -6,15 +6,14 @@ import http from "http";
 import path from "path";
 import { fileURLToPath } from "url";
 import { GameEnv } from "../core/configuration/Config";
-import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
 import { logger } from "./Logger";
 import { MapPlaylist } from "./MapPlaylist";
 import { MasterLobbyService } from "./MasterLobbyService";
 import { setNoStoreHeaders } from "./NoStoreHeaders";
 import { renderAppShell } from "./RenderHtml";
+import { ServerEnv } from "./ServerEnv";
 import { applyStaticAssetCacheControl } from "./StaticAssetCache";
 
-const config = getServerConfigFromServer();
 const playlist = new MapPlaylist();
 let lobbyService: MasterLobbyService;
 
@@ -79,16 +78,16 @@ export async function startMaster() {
   }
 
   log.info(`Primary ${process.pid} is running`);
-  log.info(`Setting up ${config.numWorkers()} workers...`);
+  log.info(`Setting up ${ServerEnv.numWorkers()} workers...`);
 
-  lobbyService = new MasterLobbyService(config, playlist, log);
+  lobbyService = new MasterLobbyService(playlist, log);
 
   // Generate admin token for worker authentication
   const ADMIN_TOKEN = crypto.randomBytes(16).toString("hex");
   process.env.ADMIN_TOKEN = ADMIN_TOKEN;
 
   const INSTANCE_ID =
-    config.env() === GameEnv.Dev
+    ServerEnv.env() === GameEnv.Dev
       ? "DEV_ID"
       : crypto.randomBytes(4).toString("hex");
   process.env.INSTANCE_ID = INSTANCE_ID;
@@ -96,7 +95,7 @@ export async function startMaster() {
   log.info(`Instance ID: ${INSTANCE_ID}`);
 
   // Fork workers
-  for (let i = 0; i < config.numWorkers(); i++) {
+  for (let i = 0; i < ServerEnv.numWorkers(); i++) {
     const worker = cluster.fork({
       WORKER_ID: i,
       ADMIN_TOKEN,
@@ -151,12 +150,6 @@ app.get("/api/health", (_req, res) => {
   }
 });
 
-app.get("/api/instance", (_req, res) => {
-  res.json({
-    instanceId: process.env.INSTANCE_ID ?? "undefined",
-  });
-});
-
 // SPA fallback route
 app.get("/{*splat}", async function (_req, res) {
   try {
diff --git a/src/server/MasterLobbyService.ts b/src/server/MasterLobbyService.ts
index 9285b8a91..25e4d23df 100644
--- a/src/server/MasterLobbyService.ts
+++ b/src/server/MasterLobbyService.ts
@@ -1,6 +1,5 @@
 import { Worker } from "cluster";
 import winston from "winston";
-import { ServerConfig } from "../core/configuration/Config";
 import { PublicGameInfo, PublicGameType } from "../core/Schemas";
 import { generateID } from "../core/Util";
 import {
@@ -12,9 +11,9 @@ import {
 import { logger } from "./Logger";
 import { MapPlaylist } from "./MapPlaylist";
 import { startPolling } from "./PollingLoop";
+import { ServerEnv } from "./ServerEnv";
 
 export interface MasterLobbyServiceOptions {
-  config: ServerConfig;
   playlist: MapPlaylist;
   log: typeof logger;
 }
@@ -27,7 +26,6 @@ export class MasterLobbyService {
   private started = false;
 
   constructor(
-    private config: ServerConfig,
     private playlist: MapPlaylist,
     private log: winston.Logger,
   ) {}
@@ -63,16 +61,16 @@ export class MasterLobbyService {
   isHealthy(): boolean {
     // We consider the lobby service healthy if at least half of the workers are ready.
     // This allows for some leeway if a worker crashes.
-    const minWorkers = Math.max(this.config.numWorkers() / 2, 1);
+    const minWorkers = Math.max(ServerEnv.numWorkers() / 2, 1);
     return this.started && this.readyWorkers.size >= minWorkers;
   }
 
   private handleWorkerReady(workerId: number) {
     this.readyWorkers.add(workerId);
     this.log.info(
-      `Worker ${workerId} is ready. (${this.readyWorkers.size}/${this.config.numWorkers()} ready)`,
+      `Worker ${workerId} is ready. (${this.readyWorkers.size}/${ServerEnv.numWorkers()} ready)`,
     );
-    if (this.readyWorkers.size === this.config.numWorkers() && !this.started) {
+    if (this.readyWorkers.size === ServerEnv.numWorkers() && !this.started) {
       this.started = true;
       this.log.info("All workers ready, starting game scheduling");
       startPolling(async () => this.broadcastLobbies(), 500);
@@ -145,7 +143,7 @@ export class MasterLobbyService {
         this.sendMessageToWorker({
           type: "updateLobby",
           gameID: nextLobby.gameID,
-          startsAt: Date.now() + this.config.gameCreationRate(),
+          startsAt: Date.now() + ServerEnv.gameCreationRate(),
         });
       }
 
@@ -163,7 +161,7 @@ export class MasterLobbyService {
   }
 
   private sendMessageToWorker(msg: MasterCreateGame | MasterUpdateGame): void {
-    const workerId = this.config.workerIndex(msg.gameID);
+    const workerId = ServerEnv.workerIndex(msg.gameID);
     const worker = this.workers.get(workerId);
     if (!worker) {
       this.log.error(`Worker ${workerId} not found`);
diff --git a/src/server/OtelResource.ts b/src/server/OtelResource.ts
index 6fd7f0025..a74f8fc64 100644
--- a/src/server/OtelResource.ts
+++ b/src/server/OtelResource.ts
@@ -3,9 +3,7 @@ import {
   ATTR_SERVICE_NAME,
   ATTR_SERVICE_VERSION,
 } from "@opentelemetry/semantic-conventions";
-import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
-
-const config = getServerConfigFromServer();
+import { ServerEnv } from "./ServerEnv";
 
 export function getOtelResource() {
   return resourceFromAttributes({
@@ -18,7 +16,7 @@ export function getOtelResource() {
 export function getPromLabels() {
   return {
     "service.instance.id": process.env.HOSTNAME,
-    "openfront.environment": config.env(),
+    "openfront.environment": ServerEnv.env(),
     "openfront.host": process.env.HOST,
     "openfront.domain": process.env.DOMAIN,
     "openfront.subdomain": process.env.SUBDOMAIN,
diff --git a/src/server/RenderHtml.ts b/src/server/RenderHtml.ts
index f2706ca6f..76db6ff7c 100644
--- a/src/server/RenderHtml.ts
+++ b/src/server/RenderHtml.ts
@@ -24,6 +24,10 @@ export async function renderHtmlContent(htmlPath: string): Promise<string> {
     // refs to use this placeholder.
     cdnBaseRaw: cdnBase,
     gameEnv: JSON.stringify(process.env.GAME_ENV ?? "dev"),
+    numWorkers: JSON.stringify(parseInt(process.env.NUM_WORKERS ?? "", 10)),
+    turnstileSiteKey: JSON.stringify(process.env.TURNSTILE_SITE_KEY ?? ""),
+    jwtAudience: JSON.stringify(process.env.JWT_AUDIENCE ?? ""),
+    instanceId: JSON.stringify(process.env.INSTANCE_ID ?? ""),
     manifestHref: buildAssetUrl("manifest.json", assetManifest, cdnBase),
     faviconHref: buildAssetUrl("images/Favicon.svg", assetManifest, cdnBase),
     gameplayScreenshotUrl: buildAssetUrl(
diff --git a/src/server/ServerEnv.ts b/src/server/ServerEnv.ts
new file mode 100644
index 000000000..8aa136eee
--- /dev/null
+++ b/src/server/ServerEnv.ts
@@ -0,0 +1,146 @@
+import { JWK } from "jose";
+import { z } from "zod";
+import { GameEnv, parseGameEnv } from "../core/configuration/Config";
+import { Env } from "../core/configuration/Env";
+import { GameID } from "../core/Schemas";
+import { simpleHash } from "../core/Util";
+
+const JwksSchema = z.object({
+  keys: z
+    .object({
+      alg: z.literal("EdDSA"),
+      crv: z.literal("Ed25519"),
+      kty: z.literal("OKP"),
+      x: z.string(),
+    })
+    .array()
+    .min(1),
+});
+
+export class ServerEnv {
+  private static readonly gameEnv: GameEnv = parseGameEnv(process.env.GAME_ENV);
+  private static publicKey: JWK | null = null;
+
+  // Values that also flow to the client via index.html, but on the server
+  // are read from process.env directly. Server code never reaches into
+  // ClientEnv — that's reserved for the browser/worker hydrated path.
+  //
+  // TODO: the following methods are duplicated on ClientEnv. The two classes
+  // read from different sources (process.env vs window.BOOTSTRAP_CONFIG) but
+  // the derived logic is identical. Consolidate into a shared helper that
+  // takes a source so we don't have to keep them in sync by hand.
+  static env(): GameEnv {
+    return ServerEnv.gameEnv;
+  }
+  static numWorkers(): number {
+    const raw = process.env.NUM_WORKERS;
+    if (!raw) {
+      throw new Error("NUM_WORKERS not set");
+    }
+    const n = parseInt(raw, 10);
+    if (!Number.isFinite(n) || n <= 0) {
+      throw new Error(`Invalid NUM_WORKERS: ${raw}`);
+    }
+    return n;
+  }
+  static turnstileSiteKey(): string {
+    const v = process.env.TURNSTILE_SITE_KEY;
+    if (!v) {
+      throw new Error("TURNSTILE_SITE_KEY not set");
+    }
+    return v;
+  }
+  static jwtAudience(): string {
+    const v = process.env.JWT_AUDIENCE;
+    if (!v) {
+      throw new Error("JWT_AUDIENCE not set");
+    }
+    return v;
+  }
+  static instanceId(): string {
+    return process.env.INSTANCE_ID ?? "";
+  }
+  static jwtIssuer(): string {
+    const audience = ServerEnv.jwtAudience();
+    return audience === "localhost"
+      ? "http://localhost:8787"
+      : `https://api.${audience}`;
+  }
+  static async jwkPublicKey(): Promise<JWK> {
+    if (ServerEnv.publicKey) return ServerEnv.publicKey;
+    const jwksUrl = ServerEnv.jwtIssuer() + "/.well-known/jwks.json";
+    console.log(`Fetching JWKS from ${jwksUrl}`);
+    const response = await fetch(jwksUrl);
+    const result = JwksSchema.safeParse(await response.json());
+    if (!result.success) {
+      const error = z.prettifyError(result.error);
+      console.error("Error parsing JWKS", error);
+      throw new Error("Invalid JWKS");
+    }
+    ServerEnv.publicKey = result.data.keys[0];
+    return ServerEnv.publicKey;
+  }
+  static turnIntervalMs(): number {
+    return 100;
+  }
+  static gameCreationRate(): number {
+    return ServerEnv.gameEnv === GameEnv.Dev ? 5 * 1000 : 2 * 60 * 1000;
+  }
+  static workerIndex(gameID: GameID): number {
+    return simpleHash(gameID) % ServerEnv.numWorkers();
+  }
+  static workerPath(gameID: GameID): string {
+    return `w${ServerEnv.workerIndex(gameID)}`;
+  }
+  static workerPort(gameID: GameID): number {
+    return ServerEnv.workerPortByIndex(ServerEnv.workerIndex(gameID));
+  }
+  static workerPortByIndex(index: number): number {
+    return 3001 + index;
+  }
+
+  // Server-only env values
+  static domain(): string {
+    return Env.DOMAIN ?? "";
+  }
+  static subdomain(): string {
+    return Env.SUBDOMAIN ?? "";
+  }
+  static otelEnabled(): boolean {
+    return (
+      ServerEnv.gameEnv !== GameEnv.Dev &&
+      Boolean(ServerEnv.otelEndpoint()) &&
+      Boolean(ServerEnv.otelAuthHeader())
+    );
+  }
+  static otelEndpoint(): string {
+    return Env.OTEL_EXPORTER_OTLP_ENDPOINT ?? "";
+  }
+  static otelAuthHeader(): string {
+    return Env.OTEL_AUTH_HEADER ?? "";
+  }
+  static gitCommit(): string {
+    return Env.GIT_COMMIT ?? "";
+  }
+  static apiKey(): string {
+    return Env.API_KEY ?? "";
+  }
+  static adminHeader(): string {
+    return "x-admin-key";
+  }
+  static adminToken(): string {
+    const token = Env.ADMIN_TOKEN;
+    if (!token) {
+      throw new Error("ADMIN_TOKEN not set");
+    }
+    return token;
+  }
+  static allowedFlares(): string[] | undefined {
+    const raw = Env.ALLOWED_FLARES;
+    if (!raw) return undefined;
+    return raw
+      .split(",")
+      .map((s: string) => s.trim())
+      .filter((s: string) => s.length > 0);
+  }
+}
diff --git a/src/server/Turnstile.ts b/src/server/Turnstile.ts
index 4ab5f1d1c..4e18128dd 100644
--- a/src/server/Turnstile.ts
+++ b/src/server/Turnstile.ts
@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { ServerConfig } from "../core/configuration/Config";
+import { ServerEnv } from "./ServerEnv";
 
 const TurnstileVerdictSchema = z.discriminatedUnion("status", [
   z.object({ status: z.literal("approved") }),
@@ -15,7 +15,6 @@ export type TurnstileResponse =
 export async function verifyTurnstileToken(
   ip: string,
   turnstileToken: string | null,
-  config: ServerConfig,
 ): Promise<TurnstileResponse> {
   if (!turnstileToken) {
     return { status: "rejected", reason: "No turnstile token provided" };
@@ -25,11 +24,11 @@ export async function verifyTurnstileToken(
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), 3000);
 
-    const response = await fetch(`${config.jwtIssuer()}/turnstile`, {
+    const response = await fetch(`${ServerEnv.jwtIssuer()}/turnstile`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        "x-api-key": config.apiKey(),
+        "x-api-key": ServerEnv.apiKey(),
       },
       body: JSON.stringify({ ip, token: turnstileToken }),
       signal: controller.signal,
diff --git a/src/server/Worker.ts b/src/server/Worker.ts
index 13cf1f32c..40ca40986 100644
--- a/src/server/Worker.ts
+++ b/src/server/Worker.ts
@@ -7,7 +7,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { WebSocket, WebSocketServer } from "ws";
 import { z } from "zod";
-import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
+import { GameEnv } from "../core/configuration/Config";
 import { GameType } from "../core/game/Game";
 import {
   ClientMessageSchema,
@@ -24,18 +24,16 @@ import { registerGamePreviewRoute } from "./GamePreviewRoute";
 import { getUserMe, verifyClientToken } from "./jwt";
 import { logger } from "./Logger";
 
-import { GameEnv } from "../core/configuration/Config";
 import { MapPlaylist } from "./MapPlaylist";
 import { setNoStoreHeaders } from "./NoStoreHeaders";
 import { startPolling } from "./PollingLoop";
 import { PrivilegeRefresher } from "./PrivilegeRefresher";
+import { ServerEnv } from "./ServerEnv";
 import { applyStaticAssetCacheControl } from "./StaticAssetCache";
 import { verifyTurnstileToken } from "./Turnstile";
 import { WorkerLobbyService } from "./WorkerLobbyService";
 import { initWorkerMetrics } from "./WorkerMetrics";
 
-const config = getServerConfigFromServer();
-
 const workerId = parseInt(process.env.WORKER_ID ?? "0");
 const log = logger.child({ comp: `w_${workerId}` });
 const playlist = new MapPlaylist();
@@ -55,7 +53,7 @@ export async function startWorker() {
     maxPayload: 1024 * 1024, // 1MB
   });
 
-  const gm = new GameManager(config, log);
+  const gm = new GameManager(log);
 
   // Initialize lobby service (handles WebSocket upgrade routing)
   const lobbyService = new WorkerLobbyService(server, wss, gm, log);
@@ -67,14 +65,14 @@ export async function startWorker() {
     1000 + Math.random() * 2000,
   );
 
-  if (config.otelEnabled()) {
+  if (ServerEnv.otelEnabled()) {
     initWorkerMetrics(gm);
   }
 
   const privilegeRefresher = new PrivilegeRefresher(
-    config.jwtIssuer() + "/cosmetics.json",
-    config.jwtIssuer() + "/profane_words_game_server",
-    config.apiKey(),
+    ServerEnv.jwtIssuer() + "/cosmetics.json",
+    ServerEnv.jwtIssuer() + "/profane_words_game_server",
+    ServerEnv.apiKey(),
     log,
   );
   privilegeRefresher.start();
@@ -150,7 +148,7 @@ export async function startWorker() {
     const authHeader = req.headers.authorization;
     if (authHeader?.startsWith("Bearer ")) {
       const token = authHeader.substring("Bearer ".length);
-      const result = await verifyClientToken(token, config);
+      const result = await verifyClientToken(token);
       if (result.type === "success") {
         creatorPersistentID = result.persistentId;
       } else {
@@ -158,7 +156,7 @@ export async function startWorker() {
         return res.status(401).json({ error: "Invalid creator token" });
       }
     } else if (
-      !req.headers[config.adminHeader()] // Public games use admin token instead
+      !req.headers[ServerEnv.adminHeader()] // Public games use admin token instead
     ) {
       return res
         .status(400)
@@ -180,7 +178,7 @@ export async function startWorker() {
     const gc = result.data;
     if (
       gc?.gameType === GameType.Public &&
-      req.headers[config.adminHeader()] !== config.adminToken()
+      req.headers[ServerEnv.adminHeader()] !== ServerEnv.adminToken()
     ) {
       log.warn(
         `cannot create public game ${id}, ip ${ipAnonymize(clientIP)} incorrect admin token`,
@@ -189,7 +187,7 @@ export async function startWorker() {
     }
 
     // Double-check this worker should host this game
-    const expectedWorkerId = config.workerIndex(id);
+    const expectedWorkerId = ServerEnv.workerIndex(id);
     if (expectedWorkerId !== workerId) {
       log.warn(
         `This game ${id} should be on worker ${expectedWorkerId}, but this is worker ${workerId}`,
@@ -229,7 +227,6 @@ export async function startWorker() {
   registerGamePreviewRoute({
     app,
     gm,
-    config,
     workerId,
     log,
     baseDir: __dirname,
@@ -316,7 +313,7 @@ export async function startWorker() {
         }
 
         // Verify this worker should handle this game
-        const expectedWorkerId = config.workerIndex(clientMsg.gameID);
+        const expectedWorkerId = ServerEnv.workerIndex(clientMsg.gameID);
         if (expectedWorkerId !== workerId) {
           log.warn(
             `Worker mismatch: Game ${clientMsg.gameID} should be on worker ${expectedWorkerId}, but this is worker ${workerId}`,
@@ -325,7 +322,7 @@ export async function startWorker() {
         }
 
         // Verify token signature
-        const result = await verifyClientToken(clientMsg.token, config);
+        const result = await verifyClientToken(clientMsg.token);
         if (result.type === "error") {
           log.warn(`Invalid token: ${result.message}`, {
             gameID: clientMsg.gameID,
@@ -381,7 +378,7 @@ export async function startWorker() {
 
         let flares: string[] | undefined;
 
-        const allowedFlares = config.allowedFlares();
+        const allowedFlares = ServerEnv.allowedFlares();
         if (claims === null) {
           if (allowedFlares !== undefined) {
             log.warn("Unauthorized: Anonymous user attempted to join game");
@@ -390,7 +387,7 @@ export async function startWorker() {
           }
         } else {
           // Verify token and get player permissions
-          const result = await getUserMe(clientMsg.token, config);
+          const result = await getUserMe(clientMsg.token);
           if (result.type === "error") {
             log.warn(`Unauthorized: ${result.message}`, {
               persistentID: persistentId,
@@ -428,11 +425,10 @@ export async function startWorker() {
           return;
         }
 
-        if (config.env() !== GameEnv.Dev) {
+        if (ServerEnv.env() !== GameEnv.Dev) {
           const turnstileResult = await verifyTurnstileToken(
             ip,
             clientMsg.turnstileToken,
-            config,
           );
           switch (turnstileResult.status) {
             case "approved":
@@ -511,7 +507,7 @@ export async function startWorker() {
   });
 
   // The load balancer will handle routing to this server based on path
-  const PORT = config.workerPortByIndex(workerId);
+  const PORT = ServerEnv.workerPortByIndex(workerId);
   server.listen(PORT, () => {
     log.info(`running on http://localhost:${PORT}`);
     log.info(`Handling requests with path prefix /w${workerId}/`);
@@ -540,7 +536,7 @@ async function startMatchmakingPolling(gm: GameManager) {
   startPolling(
     async () => {
       try {
-        const url = `${config.jwtIssuer() + "/matchmaking/checkin"}`;
+        const url = `${ServerEnv.jwtIssuer() + "/matchmaking/checkin"}`;
         const gameId = generateGameIdForWorker();
         if (gameId === null) {
           log.warn(`Failed to generate game ID for worker ${workerId}`);
@@ -553,7 +549,7 @@ async function startMatchmakingPolling(gm: GameManager) {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
-            "x-api-key": config.apiKey(),
+            "x-api-key": ServerEnv.apiKey(),
           },
           body: JSON.stringify({
             id: workerId,
@@ -605,7 +601,7 @@ function generateGameIdForWorker(): GameID | null {
   let attempts = 1000;
   while (attempts > 0) {
     const gameId = generateID();
-    if (workerId === config.workerIndex(gameId)) {
+    if (workerId === ServerEnv.workerIndex(gameId)) {
       return gameId;
     }
     attempts--;
diff --git a/src/server/WorkerMetrics.ts b/src/server/WorkerMetrics.ts
index 0beabd099..80ff9c59c 100644
--- a/src/server/WorkerMetrics.ts
+++ b/src/server/WorkerMetrics.ts
@@ -4,28 +4,25 @@ import {
   PeriodicExportingMetricReader,
 } from "@opentelemetry/sdk-metrics";
 import * as dotenv from "dotenv";
-import { getServerConfigFromServer } from "../core/configuration/ConfigLoader";
 import { GameManager } from "./GameManager";
 import { getOtelResource, getPromLabels } from "./OtelResource";
+import { ServerEnv } from "./ServerEnv";
 
 dotenv.config();
 
 export function initWorkerMetrics(gameManager: GameManager): void {
-  // Get server configuration
-  const config = getServerConfigFromServer();
-
   // Create resource with worker information
   const resource = getOtelResource();
 
   // Configure auth headers
   const headers: Record<string, string> = {};
-  if (config.otelEnabled()) {
-    headers["Authorization"] = "Basic " + config.otelAuthHeader();
+  if (ServerEnv.otelEnabled()) {
+    headers["Authorization"] = "Basic " + ServerEnv.otelAuthHeader();
   }
 
   // Create metrics exporter
   const metricExporter = new OTLPMetricExporter({
-    url: `${config.otelEndpoint()}/v1/metrics`,
+    url: `${ServerEnv.otelEndpoint()}/v1/metrics`,
     headers,
   });
 
diff --git a/src/server/jwt.ts b/src/server/jwt.ts
index 1a05baaa8..3f699b813 100644
--- a/src/server/jwt.ts
+++ b/src/server/jwt.ts
@@ -6,8 +6,9 @@ import {
   UserMeResponse,
   UserMeResponseSchema,
 } from "../core/ApiSchemas";
-import { GameEnv, ServerConfig } from "../core/configuration/Config";
+import { GameEnv } from "../core/configuration/Config";
 import { PersistentIdSchema } from "../core/Schemas";
+import { ServerEnv } from "./ServerEnv";
 
 type TokenVerificationResult =
   | {
@@ -19,10 +20,9 @@ type TokenVerificationResult =
 
 export async function verifyClientToken(
   token: string,
-  config: ServerConfig,
 ): Promise<TokenVerificationResult> {
   if (PersistentIdSchema.safeParse(token).success) {
-    if (config.env() === GameEnv.Dev) {
+    if (ServerEnv.env() === GameEnv.Dev) {
       return { type: "success", persistentId: token, claims: null };
     } else {
       return {
@@ -32,9 +32,9 @@ export async function verifyClientToken(
     }
   }
   try {
-    const issuer = config.jwtIssuer();
-    const audience = config.jwtAudience();
-    const key = await config.jwkPublicKey();
+    const issuer = ServerEnv.jwtIssuer();
+    const audience = ServerEnv.jwtAudience();
+    const key = await ServerEnv.jwkPublicKey();
     const { payload } = await jwtVerify(token, key, {
       algorithms: ["EdDSA"],
       issuer,
@@ -64,17 +64,16 @@ export async function verifyClientToken(
 
 export async function getUserMe(
   token: string,
-  config: ServerConfig,
 ): Promise<
   | { type: "success"; response: UserMeResponse }
   | { type: "error"; message: string }
 > {
   try {
     // Get the user object
-    const response = await fetch(config.jwtIssuer() + "/users/@me", {
+    const response = await fetch(ServerEnv.jwtIssuer() + "/users/@me", {
       headers: {
         authorization: `Bearer ${token}`,
-        "x-api-key": config.apiKey(),
+        "x-api-key": ServerEnv.apiKey(),
       },
     });
     if (response.status !== 200) {
diff --git a/tests/client/clan/ClanModalTestUtils.ts b/tests/client/clan/ClanModalTestUtils.ts
index b95de2e24..5c005dbaa 100644
--- a/tests/client/clan/ClanModalTestUtils.ts
+++ b/tests/client/clan/ClanModalTestUtils.ts
@@ -130,7 +130,7 @@ export function authMockFactory() {
 
 export function configLoaderMockFactory() {
   return {
-    getRuntimeClientServerConfig: vi.fn(() => ({})),
+    ClientEnv: vi.fn(() => ({})),
   };
 }
 
diff --git a/tests/core/configuration/ConfigLoader.test.ts b/tests/core/configuration/ConfigLoader.test.ts
index e0e1a0629..3fc12a506 100644
--- a/tests/core/configuration/ConfigLoader.test.ts
+++ b/tests/core/configuration/ConfigLoader.test.ts
@@ -1,44 +1,29 @@
+import { ClientEnv } from "src/client/ClientEnv";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { GameEnv } from "../../../src/core/configuration/Config";
-import {
-  clearCachedRuntimeClientServerConfig,
-  GameLogicEnv,
-  getBuildTimeGameLogicEnv,
-  getGameLogicConfig,
-  getRuntimeClientServerConfig,
-  getServerConfigForGameLogicEnv,
-} from "../../../src/core/configuration/ConfigLoader";
-
-describe("ConfigLoader", () => {
-  const originalGameEnv = process.env.GAME_ENV;
 
+describe("ClientEnv", () => {
   beforeEach(() => {
     vi.restoreAllMocks();
     window.BOOTSTRAP_CONFIG = undefined;
-    process.env.GAME_ENV = originalGameEnv;
-    clearCachedRuntimeClientServerConfig();
+    ClientEnv.reset();
   });
 
-  test("uses runtime bootstrap config without fetching /api/env", async () => {
-    window.BOOTSTRAP_CONFIG = { gameEnv: "staging" };
+  test("reads from window.BOOTSTRAP_CONFIG without fetching", () => {
+    window.BOOTSTRAP_CONFIG = {
+      gameEnv: "staging",
+      numWorkers: 4,
+      turnstileSiteKey: "test-key",
+      jwtAudience: "openfront.dev",
+      instanceId: "TEST_ID",
+    };
     const fetchSpy = vi.spyOn(globalThis, "fetch");
 
-    const config = await getRuntimeClientServerConfig();
-
-    expect(config.env()).toBe(GameEnv.Preprod);
+    expect(ClientEnv.env()).toBe(GameEnv.Preprod);
+    expect(ClientEnv.numWorkers()).toBe(4);
+    expect(ClientEnv.turnstileSiteKey()).toBe("test-key");
+    expect(ClientEnv.jwtAudience()).toBe("openfront.dev");
+    expect(ClientEnv.instanceId()).toBe("TEST_ID");
     expect(fetchSpy).not.toHaveBeenCalled();
   });
-
-  test("maps staging builds to the default game logic config", async () => {
-    process.env.GAME_ENV = "staging";
-
-    expect(getBuildTimeGameLogicEnv()).toBe(GameLogicEnv.Default);
-    expect(getServerConfigForGameLogicEnv(GameLogicEnv.Default).env()).toBe(
-      GameEnv.Prod,
-    );
-
-    const config = await getGameLogicConfig({} as any, null);
-
-    expect(config.serverConfig().env()).toBe(GameEnv.Prod);
-  });
 });
diff --git a/tests/core/game/TrainStation.test.ts b/tests/core/game/TrainStation.test.ts
index f15d3ada1..84ac77601 100644
--- a/tests/core/game/TrainStation.test.ts
+++ b/tests/core/game/TrainStation.test.ts
@@ -1,6 +1,6 @@
 import { GameUpdateType } from "src/core/game/GameUpdates";
 import { vi, type Mocked } from "vitest";
-import { DefaultConfig } from "../../../src/core/configuration/DefaultConfig";
+import { Config } from "../../../src/core/configuration/Config";
 import { TrainExecution } from "../../../src/core/execution/TrainExecution";
 import {
   Difficulty,
@@ -16,7 +16,6 @@ import {
 import { Cluster, TrainStation } from "../../../src/core/game/TrainStation";
 import { UserSettings } from "../../../src/core/game/UserSettings";
 import { GameConfig } from "../../../src/core/Schemas";
-import { TestServerConfig } from "../../util/TestServerConfig";
 
 vi.mock("../../../src/core/game/Game");
 vi.mock("../../../src/core/execution/TrainExecution");
@@ -206,12 +205,11 @@ describe("TrainStation", () => {
   });
 });
 
-describe("DefaultConfig.trainGold trade stop penalty", () => {
-  let config: DefaultConfig;
+describe("Config.trainGold trade stop penalty", () => {
+  let config: Config;
   let mockPlayer: Player;
 
   beforeEach(() => {
-    const serverConfig = new TestServerConfig();
     const gameConfig: GameConfig = {
       gameMap: GameMapType.Asia,
       gameMapSize: GameMapSize.Normal,
@@ -228,12 +226,7 @@ describe("DefaultConfig.trainGold trade stop penalty", () => {
       disableNavMesh: false,
       randomSpawn: false,
     };
-    config = new DefaultConfig(
-      serverConfig,
-      gameConfig,
-      new UserSettings(),
-      false,
-    );
+    config = new Config(gameConfig, new UserSettings(), false);
     mockPlayer = { isLobbyCreator: () => false } as unknown as Player;
   });
 
diff --git a/tests/core/pathfinding/_fixtures.ts b/tests/core/pathfinding/_fixtures.ts
index c372dfdae..7615746f2 100644
--- a/tests/core/pathfinding/_fixtures.ts
+++ b/tests/core/pathfinding/_fixtures.ts
@@ -13,7 +13,6 @@ import { GameMapImpl } from "../../../src/core/game/GameMap";
 import { UserSettings } from "../../../src/core/game/UserSettings";
 import { GameConfig } from "../../../src/core/Schemas";
 import { TestConfig } from "../../util/TestConfig";
-import { TestServerConfig } from "../../util/TestServerConfig";
 
 export const W = "W"; // Water
 export const L = "L"; // Land
@@ -131,7 +130,6 @@ export function createGame(data: TestMapData): Game {
     miniNumLand,
   );
 
-  const serverConfig = new TestServerConfig();
   const gameConfig: GameConfig = {
     gameMap: GameMapType.Asia,
     gameMapSize: GameMapSize.Normal,
@@ -148,12 +146,7 @@ export function createGame(data: TestMapData): Game {
     disableNavMesh: false,
     randomSpawn: false,
   };
-  const config = new TestConfig(
-    serverConfig,
-    gameConfig,
-    new UserSettings(),
-    false,
-  );
+  const config = new TestConfig(gameConfig, new UserSettings(), false);
 
   return createGameImpl([], [], gameMap, miniGameMap, config);
 }
diff --git a/tests/pathfinding/utils.ts b/tests/pathfinding/utils.ts
index ed9ee771a..b65a2e553 100644
--- a/tests/pathfinding/utils.ts
+++ b/tests/pathfinding/utils.ts
@@ -255,9 +255,7 @@ export async function setupFromPath(
   const gameMap = await genTerrainFromBin(manifest.map, mapBinBuffer);
   const miniGameMap = await genTerrainFromBin(manifest.map4x, miniMapBinBuffer);
 
-  // Configure the game
   const config = new TestConfig(
-    new (await import("../util/TestServerConfig")).TestServerConfig(),
     {
       gameMap: GameMapType.Asia,
       gameMapSize: GameMapSize.Normal,
diff --git a/tests/server/Archive.test.ts b/tests/server/Archive.test.ts
index 4f1561652..626d7af4d 100644
--- a/tests/server/Archive.test.ts
+++ b/tests/server/Archive.test.ts
@@ -1,13 +1,13 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-vi.mock("../../src/core/configuration/ConfigLoader", () => ({
-  getServerConfigFromServer: () => ({
+vi.mock("../../src/server/ServerEnv", () => ({
+  ServerEnv: {
     jwtIssuer: () => "https://archive.test.invalid",
     apiKey: () => "test-key",
     gitCommit: () => "DEV",
     subdomain: () => "test",
     domain: () => "test",
-  }),
+  },
 }));
 
 vi.mock("../../src/server/Logger", () => ({
diff --git a/tests/server/GameLifecycle.test.ts b/tests/server/GameLifecycle.test.ts
index 067492617..64f073d44 100644
--- a/tests/server/GameLifecycle.test.ts
+++ b/tests/server/GameLifecycle.test.ts
@@ -1,15 +1,12 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 vi.mock("../../src/core/configuration/ConfigLoader", () => ({
-  getServerConfigFromServer: () => ({
+  ClientEnv: () => ({
     otelEnabled: () => false,
     otelAuthHeader: () => "",
     otelEndpoint: () => "",
     env: () => 0, // GameEnv.Dev
   }),
-  getServerConfig: () => ({
-    otelEnabled: () => false,
-  }),
 }));
 
 vi.mock("../../src/core/Schemas", async () => {
diff --git a/tests/server/KickPlayerAuthorization.test.ts b/tests/server/KickPlayerAuthorization.test.ts
index e5a1c698e..ab10f2b3f 100644
--- a/tests/server/KickPlayerAuthorization.test.ts
+++ b/tests/server/KickPlayerAuthorization.test.ts
@@ -1,15 +1,12 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 vi.mock("../../src/core/configuration/ConfigLoader", () => ({
-  getServerConfigFromServer: () => ({
+  ClientEnv: () => ({
     otelEnabled: () => false,
     otelAuthHeader: () => "",
     otelEndpoint: () => "",
     env: () => 0, // GameEnv.Dev
   }),
-  getServerConfig: () => ({
-    otelEnabled: () => false,
-  }),
 }));
 
 vi.mock("../../src/core/Schemas", async () => {
@@ -69,7 +66,6 @@ function makeClient(
 
 describe("GameServer - kick_player authorization", () => {
   let mockLogger: any;
-  let mockConfig: any;
 
   beforeEach(() => {
     vi.useFakeTimers();
@@ -79,11 +75,6 @@ describe("GameServer - kick_player authorization", () => {
       warn: vi.fn(),
       error: vi.fn(),
     };
-    mockConfig = {
-      turnIntervalMs: () => 100,
-      gameCreationRate: () => 1000,
-      env: () => 0,
-    };
   });
 
   afterEach(() => {
@@ -96,7 +87,6 @@ describe("GameServer - kick_player authorization", () => {
       "test-game",
       mockLogger,
       Date.now(),
-      mockConfig,
       { gameType: GameType.Private } as any,
       creatorPersistentID,
     );
diff --git a/tests/server/MasterLobbyServiceHealth.test.ts b/tests/server/MasterLobbyServiceHealth.test.ts
index fe5800eac..d29fcce75 100644
--- a/tests/server/MasterLobbyServiceHealth.test.ts
+++ b/tests/server/MasterLobbyServiceHealth.test.ts
@@ -1,7 +1,7 @@
 import EventEmitter from "events";
 import { describe, expect, it, vi } from "vitest";
 import { MasterLobbyService } from "../../src/server/MasterLobbyService";
-import { TestServerConfig } from "../util/TestServerConfig";
+import { ServerEnv } from "../../src/server/ServerEnv";
 
 vi.mock("../../src/server/Logger", () => ({
   logger: {
@@ -27,10 +27,9 @@ function sendWorkerReady(worker: EventEmitter, workerId: number) {
 }
 
 function createService(numWorkers: number): MasterLobbyService {
-  const config = new TestServerConfig();
-  vi.spyOn(config, "numWorkers").mockReturnValue(numWorkers);
+  vi.spyOn(ServerEnv, "numWorkers").mockReturnValue(numWorkers);
   const log = { info: vi.fn(), error: vi.fn() } as any;
-  return new MasterLobbyService(config, {} as any, log);
+  return new MasterLobbyService({} as any, log);
 }
 
 function startAllWorkers(
diff --git a/tests/util/Setup.ts b/tests/util/Setup.ts
index 95f5182bb..dedd1459d 100644
--- a/tests/util/Setup.ts
+++ b/tests/util/Setup.ts
@@ -18,7 +18,6 @@ import {
 import { UserSettings } from "../../src/core/game/UserSettings";
 import { GameConfig } from "../../src/core/Schemas";
 import { TestConfig } from "./TestConfig";
-import { TestServerConfig } from "./TestServerConfig";
 
 export async function setup(
   mapName: string,
@@ -53,8 +52,6 @@ export async function setup(
   const gameMap = await genTerrainFromBin(manifest.map, mapBinBuffer);
   const miniGameMap = await genTerrainFromBin(manifest.map4x, miniMapBinBuffer);
 
-  // Configure the game
-  const serverConfig = new TestServerConfig();
   const gameConfig: GameConfig = {
     gameMap: GameMapType.Asia,
     gameMapSize: GameMapSize.Normal,
@@ -71,12 +68,7 @@ export async function setup(
     randomSpawn: false,
     ..._gameConfig,
   };
-  const config = new ConfigClass(
-    serverConfig,
-    gameConfig,
-    new UserSettings(),
-    false,
-  );
+  const config = new ConfigClass(gameConfig, new UserSettings(), false);
 
   return createGame(humans, [], gameMap, miniGameMap, config);
 }
diff --git a/tests/util/TestConfig.ts b/tests/util/TestConfig.ts
index 8681c5b02..6f04e587f 100644
--- a/tests/util/TestConfig.ts
+++ b/tests/util/TestConfig.ts
@@ -1,5 +1,4 @@
-import { NukeMagnitude } from "../../src/core/configuration/Config";
-import { DefaultConfig } from "../../src/core/configuration/DefaultConfig";
+import { Config, NukeMagnitude } from "../../src/core/configuration/Config";
 import {
   Game,
   Player,
@@ -9,7 +8,7 @@ import {
 } from "../../src/core/game/Game";
 import { TileRef } from "../../src/core/game/GameMap";
 
-export class TestConfig extends DefaultConfig {
+export class TestConfig extends Config {
   private _proximityBonusPortsNb: number = 0;
   private _defaultNukeSpeed: number = 4;
   private _spawnImmunityDuration: number = 0;
@@ -100,7 +99,6 @@ export class TestConfig extends DefaultConfig {
   }
 }
 export class UseRealAttackLogic extends TestConfig {
-  // Override to use DefaultConfig's real attackLogic
   attackLogic(
     gm: Game,
     attackTroops: number,
@@ -112,7 +110,7 @@ export class UseRealAttackLogic extends TestConfig {
     defenderTroopLoss: number;
     tilesPerTickUsed: number;
   } {
-    return DefaultConfig.prototype.attackLogic.call(
+    return Config.prototype.attackLogic.call(
       this,
       gm,
       attackTroops,
diff --git a/tests/util/TestServerConfig.ts b/tests/util/TestServerConfig.ts
deleted file mode 100644
index c213b1709..000000000
--- a/tests/util/TestServerConfig.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { JWK } from "jose";
-import { GameEnv, ServerConfig } from "../../src/core/configuration/Config";
-import { PublicGameModifiers } from "../../src/core/game/Game";
-import { GameID } from "../../src/core/Schemas";
-
-export class TestServerConfig implements ServerConfig {
-  turnstileSiteKey(): string {
-    throw new Error("Method not implemented.");
-  }
-  apiKey(): string {
-    throw new Error("Method not implemented.");
-  }
-  allowedFlares(): string[] | undefined {
-    throw new Error("Method not implemented.");
-  }
-  stripePublishableKey(): string {
-    throw new Error("Method not implemented.");
-  }
-  domain(): string {
-    throw new Error("Method not implemented.");
-  }
-  subdomain(): string {
-    throw new Error("Method not implemented.");
-  }
-  jwtAudience(): string {
-    throw new Error("Method not implemented.");
-  }
-  jwtIssuer(): string {
-    throw new Error("Method not implemented.");
-  }
-  jwkPublicKey(): Promise<JWK> {
-    throw new Error("Method not implemented.");
-  }
-  otelEnabled(): boolean {
-    throw new Error("Method not implemented.");
-  }
-  otelEndpoint(): string {
-    throw new Error("Method not implemented.");
-  }
-  otelAuthHeader(): string {
-    throw new Error("Method not implemented.");
-  }
-  turnIntervalMs(): number {
-    throw new Error("Method not implemented.");
-  }
-  gameCreationRate(): number {
-    throw new Error("Method not implemented.");
-  }
-  async lobbyMaxPlayers(): Promise<number> {
-    throw new Error("Method not implemented.");
-  }
-  numWorkers(): number {
-    throw new Error("Method not implemented.");
-  }
-  workerIndex(gameID: GameID): number {
-    throw new Error("Method not implemented.");
-  }
-  workerPath(gameID: GameID): string {
-    throw new Error("Method not implemented.");
-  }
-  workerPort(gameID: GameID): number {
-    throw new Error("Method not implemented.");
-  }
-  workerPortByIndex(workerID: number): number {
-    throw new Error("Method not implemented.");
-  }
-  env(): GameEnv {
-    throw new Error("Method not implemented.");
-  }
-  adminToken(): string {
-    throw new Error("Method not implemented.");
-  }
-  adminHeader(): string {
-    throw new Error("Method not implemented.");
-  }
-  gitCommit(): string {
-    throw new Error("Method not implemented.");
-  }
-  getRandomPublicGameModifiers(): PublicGameModifiers {
-    return {
-      isCompact: false,
-      isRandomSpawn: false,
-      isCrowded: false,
-      isHardNations: false,
-      isAlliancesDisabled: false,
-    };
-  }
-  async supportsCompactMapForTeams(): Promise<boolean> {
-    throw new Error("Method not implemented.");
-  }
-}
diff --git a/vite.config.ts b/vite.config.ts
index e0fb13f7e..02b784d9a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -66,6 +66,12 @@ export default defineConfig(({ mode }) => {
     assetManifest: JSON.stringify(assetManifest),
     cdnBase: JSON.stringify(cdnBase),
     gameEnv: JSON.stringify(env.GAME_ENV ?? "dev"),
+    numWorkers: JSON.stringify(parseInt(env.NUM_WORKERS ?? "2", 10)),
+    turnstileSiteKey: JSON.stringify(
+      env.TURNSTILE_SITE_KEY ?? "1x00000000000000000000AA",
+    ),
+    jwtAudience: JSON.stringify(env.JWT_AUDIENCE ?? "localhost"),
+    instanceId: JSON.stringify(env.INSTANCE_ID ?? "DEV_ID"),
     manifestHref: buildAssetUrl("manifest.json", assetManifest, cdnBase),
     faviconHref: buildAssetUrl("images/Favicon.svg", assetManifest, cdnBase),
     gameplayScreenshotUrl: buildAssetUrl(