diff --git a/.github/workflows/build-server.yml b/.github/workflows/build-server.yml
index 8aa83a2..7c6a12d 100644
--- a/.github/workflows/build-server.yml
+++ b/.github/workflows/build-server.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: "24"
+          node-version-file: ./mapsync-server/.nvmrc
           cache: "pnpm"
           cache-dependency-path: ./mapsync-server/pnpm-lock.yaml
 
diff --git a/Dockerfile b/Dockerfile
index fcfdc16..102e69b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # base is shared between build/test and deploy
-FROM node:24-alpine AS base
+FROM node:25-alpine AS base
 
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
diff --git a/mapsync-server/.editorconfig b/mapsync-server/.editorconfig
index cfc8f3e..ddbc084 100644
--- a/mapsync-server/.editorconfig
+++ b/mapsync-server/.editorconfig
@@ -1,4 +1,7 @@
 # https://editorconfig.org
 
+[.nvmrc]
+insert_final_newline = false
+
 [*.{ts,json}]
 indent_style = space
diff --git a/mapsync-server/.nvmrc b/mapsync-server/.nvmrc
index a45fd52..410b14d 100644
--- a/mapsync-server/.nvmrc
+++ b/mapsync-server/.nvmrc
@@ -1 +1 @@
-24
+25
\ No newline at end of file
diff --git a/mapsync-server/package.json b/mapsync-server/package.json
index 8228fb0..910b623 100644
--- a/mapsync-server/package.json
+++ b/mapsync-server/package.json
@@ -12,7 +12,7 @@
         "format": "prettier -w .",
         "test": "true",
         "start": "node -r source-map-support/register dist/main.js",
-        "start:dev": "node --inspect -r source-map-support/register dist/main.js"
+        "start:dev": "tsc && node --inspect -r source-map-support/register dist/main.js"
     },
     "dependencies": {
         "async-mutex": "0.5.0",
@@ -34,7 +34,7 @@
         "bufferutil": "4.1.0"
     },
     "engines": {
-        "node": "24.x"
+        "node": "25.x"
     },
     "prettier": {
         "useTabs": false,
diff --git a/mapsync-server/pnpm-workspace.yaml b/mapsync-server/pnpm-workspace.yaml
index fc26b9c..c08bae2 100644
--- a/mapsync-server/pnpm-workspace.yaml
+++ b/mapsync-server/pnpm-workspace.yaml
@@ -2,12 +2,12 @@ allowBuilds:
   better-sqlite3: true
   bufferutil: true
 
-blockExoticSubdeps: true
-# prevent packages newer than 1 day old from being installed
-minimumReleaseAge: 1440
-# https://pnpm.io/settings#trustpolicy
 onlyBuiltDependencies:
   - better-sqlite3
   - bufferutil
 
+blockExoticSubdeps: true
+# prevent packages newer than 1 day old from being installed
+minimumReleaseAge: 1440
+# https://pnpm.io/settings#trustpolicy
 trustPolicy: no-downgrade