diff --git a/backend/src/ee/routes/v1/ssh-host-router.ts b/backend/src/ee/routes/v1/ssh-host-router.ts
index aae79ad35..f8dda656e 100644
--- a/backend/src/ee/routes/v1/ssh-host-router.ts
+++ b/backend/src/ee/routes/v1/ssh-host-router.ts
@@ -193,7 +193,7 @@ export const registerSshHostRouter = async (server: FastifyZodProvider) => {
             message: "Alias must be a valid slug"
           })
           .optional()
-          .describe(SSH_HOSTS.CREATE.alias),
+          .describe(SSH_HOSTS.UPDATE.alias),
         userCertTtl: z
           .string()
           .refine((val) => ms(val) > 0, "TTL must be a positive number")
diff --git a/docs/cli/commands/ssh.mdx b/docs/cli/commands/ssh.mdx
index b0988afca..bb7017135 100644
--- a/docs/cli/commands/ssh.mdx
+++ b/docs/cli/commands/ssh.mdx
@@ -34,7 +34,7 @@ This command enables you to obtain SSH credentials used to access a remote host.
         The path to write the SSH credentials to such as `~/.ssh`, `./some_folder`, `./some_folder/id_rsa-cert.pub`. If not provided, the credentials will be added to the SSH agent and used to establish an interactive SSH connection.
     </Accordion>
     <Accordion title="--token">
-        An authenticated token to use to authenticate with Infisical.
+        Use a machine identity access token
     </Accordion>
 
 </Accordion>
@@ -56,6 +56,9 @@ This command enables you to obtain SSH credentials used to access a remote host.
     <Accordion title="--hostname">
         Hostname of the SSH host (required)
     </Accordion>
+    <Accordion title="--alias">
+        Alias for the SSH host (optional)
+    </Accordion>
     <Accordion title="--write-user-ca-to-file">
         Write User CA public key to `/etc/ssh/infisical_user_ca.pub`
 
diff --git a/frontend/src/pages/ssh/SshHostsPage/components/SshHostModal.tsx b/frontend/src/pages/ssh/SshHostsPage/components/SshHostModal.tsx
index fd0737e32..0c90518f4 100644
--- a/frontend/src/pages/ssh/SshHostsPage/components/SshHostModal.tsx
+++ b/frontend/src/pages/ssh/SshHostsPage/components/SshHostModal.tsx
@@ -35,8 +35,8 @@ type Props = {
 
 const schema = z
   .object({
-    hostname: z.string(),
-    alias: z.string(),
+    hostname: z.string().trim(),
+    alias: z.string().trim(),
     userCertTtl: z
       .string()
       .trim()