diff --git a/crates/remote/src/ssh_session.rs b/crates/remote/src/ssh_session.rs
index b6c7b6875fabeb59a8b7d5fa979fee7408e36db4..c607f0a0ec32167b929a84e750d2ae6aecc63e2e 100644
--- a/crates/remote/src/ssh_session.rs
+++ b/crates/remote/src/ssh_session.rs
@@ -1553,9 +1553,13 @@ impl SshRemoteConnection {
                 "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
             ))?,
         };
-        let arch = if arch.starts_with("arm") || arch.starts_with("aarch64") {
+        // exclude armv5,6,7 as they are 32-bit.
+        let arch = if arch.starts_with("armv8")
+            || arch.starts_with("armv9")
+            || arch.starts_with("aarch64")
+        {
             "aarch64"
-        } else if arch.starts_with("x86") || arch.starts_with("i686") {
+        } else if arch.starts_with("x86") {
             "x86_64"
         } else {
             Err(anyhow!(