diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0488f32c..f49d0e77 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openrouter/spawn",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "type": "module",
   "bin": {
     "spawn": "cli.js"
diff --git a/packages/cli/src/__tests__/custom-flag.test.ts b/packages/cli/src/__tests__/custom-flag.test.ts
index 237f335f..b0df88af 100644
--- a/packages/cli/src/__tests__/custom-flag.test.ts
+++ b/packages/cli/src/__tests__/custom-flag.test.ts
@@ -146,9 +146,10 @@ describe("Hetzner --custom prompts", () => {
     restoreEnv("HETZNER_LOCATION", savedLocation);
   });
 
-  it("promptServerType should return default without --custom", async () => {
+  it("promptServerType should return default in non-interactive mode", async () => {
     delete process.env.HETZNER_SERVER_TYPE;
     delete process.env.SPAWN_CUSTOM;
+    process.env.SPAWN_NON_INTERACTIVE = "1";
     const { promptServerType, DEFAULT_SERVER_TYPE } = await import("../hetzner/hetzner");
     const result = await promptServerType();
     expect(result).toBe(DEFAULT_SERVER_TYPE);
diff --git a/packages/cli/src/hetzner/hetzner.ts b/packages/cli/src/hetzner/hetzner.ts
index 98393c4f..c086a0ab 100644
--- a/packages/cli/src/hetzner/hetzner.ts
+++ b/packages/cli/src/hetzner/hetzner.ts
@@ -276,32 +276,32 @@ export interface ServerTypeTier {
 
 export const SERVER_TYPES: ServerTypeTier[] = [
   {
-    id: "cx22",
-    label: "2 vCPU \u00b7 4 GB RAM \u00b7 40 GB (~\u20AC3.29/mo)",
+    id: "cx23",
+    label: "cx23 \u00b7 2 vCPU \u00b7 4 GB \u00b7 40 GB (~\u20AC3.49/mo, EU only)",
   },
   {
-    id: "cx32",
-    label: "4 vCPU \u00b7 8 GB RAM \u00b7 80 GB (~\u20AC5.39/mo)",
+    id: "cx33",
+    label: "cx33 \u00b7 4 vCPU \u00b7 8 GB \u00b7 80 GB (~\u20AC6.49/mo, EU only)",
   },
   {
-    id: "cx42",
-    label: "8 vCPU \u00b7 16 GB RAM \u00b7 160 GB (~\u20AC14.49/mo)",
+    id: "cx43",
+    label: "cx43 \u00b7 8 vCPU \u00b7 16 GB \u00b7 160 GB (~\u20AC14.49/mo, EU only)",
   },
   {
-    id: "cx52",
-    label: "16 vCPU \u00b7 32 GB RAM \u00b7 320 GB (~\u20AC28.49/mo)",
+    id: "cx53",
+    label: "cx53 \u00b7 16 vCPU \u00b7 32 GB \u00b7 320 GB (~\u20AC28.49/mo, EU only)",
   },
   {
-    id: "cpx21",
-    label: "3 AMD vCPU \u00b7 4 GB RAM \u00b7 80 GB (~\u20AC4.35/mo)",
+    id: "cpx22",
+    label: "cpx22 \u00b7 3 AMD vCPU \u00b7 4 GB \u00b7 80 GB (~\u20AC5.49/mo)",
   },
   {
-    id: "cpx31",
-    label: "4 AMD vCPU \u00b7 8 GB RAM \u00b7 160 GB (~\u20AC7.59/mo)",
+    id: "cpx32",
+    label: "cpx32 \u00b7 4 AMD vCPU \u00b7 8 GB \u00b7 160 GB (~\u20AC9.49/mo)",
   },
 ];
 
-export const DEFAULT_SERVER_TYPE = "cx22";
+export const DEFAULT_SERVER_TYPE = "cx23";
 
 // ─── Location Options ────────────────────────────────────────────────────────
 
@@ -343,10 +343,6 @@ export async function promptServerType(): Promise<string> {
     return process.env.HETZNER_SERVER_TYPE;
   }
 
-  if (process.env.SPAWN_CUSTOM !== "1") {
-    return DEFAULT_SERVER_TYPE;
-  }
-
   if (process.env.SPAWN_NON_INTERACTIVE === "1") {
     return DEFAULT_SERVER_TYPE;
   }
diff --git a/packages/cli/src/shared/agent-setup.ts b/packages/cli/src/shared/agent-setup.ts
index 42fcc198..c066a905 100644
--- a/packages/cli/src/shared/agent-setup.ts
+++ b/packages/cli/src/shared/agent-setup.ts
@@ -381,8 +381,11 @@ export async function setupZeroclawConfig(runner: CloudRunner, _apiKey: string):
     `source ~/.spawnrc 2>/dev/null; export PATH="$HOME/.cargo/bin:$PATH"; zeroclaw onboard --api-key "\${OPENROUTER_API_KEY}" --provider openrouter`,
   );
 
-  // Write autonomy config — equivalent to Claude Code's dangerouslySkipPermissions
-  const config = `[security]
+  // Patch autonomy settings into the config generated by `zeroclaw onboard`.
+  // We append rather than overwrite so we keep the fields onboard wrote
+  // (api_key, default_provider, default_model, default_temperature, etc.).
+  const patch = `
+[security]
 autonomy = "full"
 supervised = false
 allow_destructive = true
@@ -390,7 +393,8 @@ allow_destructive = true
 [shell]
 policy = "allow_all"
 `;
-  await uploadConfigFile(runner, config, "$HOME/.zeroclaw/config.toml");
+  const patchB64 = Buffer.from(patch).toString("base64");
+  await runner.runServer(`printf '%s' '${patchB64}' | base64 -d >> ~/.zeroclaw/config.toml`);
   logInfo("ZeroClaw configured for autonomous operation");
 }
 
diff --git a/sh/test/fixtures/hetzner/_env.sh b/sh/test/fixtures/hetzner/_env.sh
index 66fa9083..6a25f0c0 100644
--- a/sh/test/fixtures/hetzner/_env.sh
+++ b/sh/test/fixtures/hetzner/_env.sh
@@ -1,4 +1,4 @@
 export HCLOUD_TOKEN="test-token-hetzner"
 export HETZNER_SERVER_NAME="test-srv"
-export HETZNER_SERVER_TYPE="cx22"
+export HETZNER_SERVER_TYPE="cx23"
 export HETZNER_LOCATION="fsn1"