diff --git a/packages/cli/src/digitalocean/digitalocean.ts b/packages/cli/src/digitalocean/digitalocean.ts
index c6a857cf..be8e024f 100644
--- a/packages/cli/src/digitalocean/digitalocean.ts
+++ b/packages/cli/src/digitalocean/digitalocean.ts
@@ -570,6 +570,11 @@ export async function ensureDoToken(): Promise<boolean> {
 export async function ensureSshKey(): Promise<void> {
   const selectedKeys = await ensureSshKeys();
 
+  // Fetch registered keys once before the loop to avoid N+1 API calls
+  const keysText = await doApi("GET", "/account/keys");
+  const data = parseJsonObj(keysText);
+  const keys = toObjectArray(data?.ssh_keys);
+
   for (const key of selectedKeys) {
     const fingerprint = getSshFingerprint(key.pubPath);
     if (!fingerprint) {
@@ -577,11 +582,6 @@ export async function ensureSshKey(): Promise<void> {
       continue;
     }
 
-    // Check if key is registered with DigitalOcean
-    const keysText = await doApi("GET", "/account/keys");
-    const data = parseJsonObj(keysText);
-    const keys = toObjectArray(data?.ssh_keys);
-
     const found = keys.some((k: Record<string, unknown>) => {
       const fp = k.fingerprint || "";
       return fp === fingerprint;
diff --git a/packages/cli/src/hetzner/hetzner.ts b/packages/cli/src/hetzner/hetzner.ts
index 476fdad7..a1ee624f 100644
--- a/packages/cli/src/hetzner/hetzner.ts
+++ b/packages/cli/src/hetzner/hetzner.ts
@@ -182,15 +182,15 @@ export async function ensureHcloudToken(): Promise<void> {
 export async function ensureSshKey(): Promise<void> {
   const selectedKeys = await ensureSshKeys();
 
+  // Fetch registered keys once before the loop to avoid N+1 API calls
+  const resp = await hetznerApi("GET", "/ssh_keys");
+  const data = parseJsonObj(resp);
+  const sshKeys = toObjectArray(data?.ssh_keys);
+
   for (const key of selectedKeys) {
     const fingerprint = getSshFingerprint(key.pubPath);
     const pubKey = readFileSync(key.pubPath, "utf-8").trim();
 
-    // Check if key is already registered
-    const resp = await hetznerApi("GET", "/ssh_keys");
-    const data = parseJsonObj(resp);
-    const sshKeys = toObjectArray(data?.ssh_keys);
-
     const alreadyRegistered = sshKeys.some((k) => fingerprint && k.fingerprint === fingerprint);
 
     if (alreadyRegistered) {