diff --git a/compose.yml b/compose.yml
index ac9706c..20bb9d3 100644
--- a/compose.yml
+++ b/compose.yml
@@ -8,4 +8,6 @@ services:
     environment:
       - PORT=7200
       - DB_PATH=/app/data/prod/claude-remote.db
+      - CLAUDE_REMOTE_SECRET
+      - CLAUDE_REMOTE_DEVICE_NAME
     restart: unless-stopped
diff --git a/src/server.ts b/src/server.ts
index 780713c..6cfbac6 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -4,6 +4,7 @@ import type { ServerWebSocket } from "bun";
 import { ansiToHtml } from "./ansi";
 import {
   appendOutput,
+  createDevice,
   createPrompt,
   createSession,
   endSession,
@@ -81,6 +82,17 @@ function broadcastSSE(event: SSEEvent): void {
 const port = Number.parseInt(process.env.PORT || "7200", 10);
 initDb();
 
+// Auto-seed device from env if configured
+const envSecret = process.env.CLAUDE_REMOTE_SECRET;
+if (envSecret) {
+  const existing = getDeviceBySecret(envSecret);
+  if (!existing) {
+    const name = process.env.CLAUDE_REMOTE_DEVICE_NAME || "default";
+    createDevice(envSecret, name);
+    console.log(`Auto-seeded device: ${name}`);
+  }
+}
+
 // Start server
 const server = Bun.serve<SessionData>({
   port,