diff --git a/Dockerfile b/Dockerfile
index a418cb1..b8bc1f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ COPY --from=builder --chown=nodejs:nodejs /app/dist ./dist
 COPY --from=builder --chown=nodejs:nodejs /app/node_modules ./node_modules
 COPY --from=builder --chown=nodejs:nodejs /app/package*.json ./
 
-# Generate SSH host key if not mounted
+# Ensure ssh-keys mount point exists with correct ownership
 RUN mkdir -p /app/ssh-keys && \
     chown nodejs:nodejs /app/ssh-keys
 
diff --git a/k8s/app/base/deployment.yaml b/k8s/app/base/deployment.yaml
index d566919..2305112 100644
--- a/k8s/app/base/deployment.yaml
+++ b/k8s/app/base/deployment.yaml
@@ -14,6 +14,8 @@ spec:
       labels:
         app: memory
     spec:
+      securityContext:
+        fsGroup: 1001
       containers:
         - name: memory
           image: ghcr.io/berget-ai/memory:1.0.0
@@ -67,6 +69,6 @@ spec:
         - name: ssh-host-key
           secret:
             secretName: memory-ssh-host-key
-            defaultMode: 0600
+            defaultMode: 0640
       imagePullSecrets:
         - name: regcred
diff --git a/src/ssh-server.ts b/src/ssh-server.ts
index 368c42c..1b38e60 100644
--- a/src/ssh-server.ts
+++ b/src/ssh-server.ts
@@ -1,7 +1,6 @@
 import { Server } from "ssh2";
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
+import { readFileSync, existsSync } from "fs";
 import { join } from "path";
-import { generateKeyPairSync } from "crypto";
 
 interface SSHConfig {
   port: number;
@@ -69,34 +68,18 @@ function generatePrompt(session: SessionState): string {
 }
 
 export function createSSHServer(config: SSHConfig): Server {
-  // Try mounted secret first, fallback to writable directory
-  const mountedKeyPath = join(process.cwd(), "ssh-keys", "ssh_host_ed25519_key");
-  const generatedKeysDir = join(process.cwd(), "data", "ssh-keys");
-  const generatedKeyPath = join(generatedKeysDir, "ssh_host_rsa_key");
-  
-  let hostKey: Buffer;
-
-  if (existsSync(mountedKeyPath)) {
-    console.log("[SSH] Using mounted host key");
-    hostKey = readFileSync(mountedKeyPath);
-  } else if (existsSync(generatedKeyPath)) {
-    console.log("[SSH] Using generated host key");
-    hostKey = readFileSync(generatedKeyPath);
-  } else {
-    console.log("[SSH] Generating host key...");
-    if (!existsSync(generatedKeysDir)) {
-      mkdirSync(generatedKeysDir, { recursive: true });
-    }
-    const { privateKey } = generateKeyPairSync("rsa", {
-      modulusLength: 2048,
-      publicKeyEncoding: { type: "pkcs1", format: "pem" },
-      privateKeyEncoding: { type: "pkcs1", format: "pem" },
-    });
-    writeFileSync(generatedKeyPath, privateKey, { mode: 0o600 });
-    hostKey = Buffer.from(privateKey);
-    console.log("[SSH] Host key generated");
+  const hostKeyPath = join(process.cwd(), "ssh-keys", "ssh_host_ed25519_key");
+
+  if (!existsSync(hostKeyPath)) {
+    throw new Error(
+      `SSH host key not found at ${hostKeyPath}. ` +
+      `Ensure secret 'memory-ssh-host-key' is mounted at /app/ssh-keys`
+    );
   }
 
+  console.log("[SSH] Using mounted host key");
+  const hostKey = readFileSync(hostKeyPath);
+
   const server = new Server(
     {
       hostKeys: [hostKey],