diff --git a/cli/configssh.go b/cli/configssh.go
index e3e168d2b198c..cfea6b377f6ee 100644
--- a/cli/configssh.go
+++ b/cli/configssh.go
@@ -235,7 +235,7 @@ func (r *RootCmd) configSSH() *serpent.Command {
 	cmd := &serpent.Command{
 		Annotations: workspaceCommand,
 		Use:         "config-ssh",
-		Short:       "Add an SSH Host entry for your workspaces \"ssh coder.workspace\"",
+		Short:       "Add an SSH Host entry for your workspaces \"ssh workspace.coder\"",
 		Long: FormatExamples(
 			Example{
 				Description: "You can use -o (or --ssh-option) so set SSH options to be used for all your workspaces",
diff --git a/cli/testdata/coder_--help.golden b/cli/testdata/coder_--help.golden
index f3c6f56a7a191..1b2dbcf25056b 100644
--- a/cli/testdata/coder_--help.golden
+++ b/cli/testdata/coder_--help.golden
@@ -18,7 +18,7 @@ SUBCOMMANDS:
     completion        Install or update shell completion scripts for the
                       detected or chosen shell.
     config-ssh        Add an SSH Host entry for your workspaces "ssh
-                      coder.workspace"
+                      workspace.coder"
     create            Create a workspace
     delete            Delete a workspace
     dotfiles          Personalize your workspace by applying a canonical
diff --git a/cli/testdata/coder_config-ssh_--help.golden b/cli/testdata/coder_config-ssh_--help.golden
index 86f38db99e84a..e2b03164d9513 100644
--- a/cli/testdata/coder_config-ssh_--help.golden
+++ b/cli/testdata/coder_config-ssh_--help.golden
@@ -3,7 +3,7 @@ coder v0.0.0-devel
 USAGE:
   coder config-ssh [flags]
 
-  Add an SSH Host entry for your workspaces "ssh coder.workspace"
+  Add an SSH Host entry for your workspaces "ssh workspace.coder"
 
     - You can use -o (or --ssh-option) so set SSH options to be used for all
   your
diff --git a/docs/manifest.json b/docs/manifest.json
index b113a48b6cb15..4064725498128 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -1091,7 +1091,7 @@
 						},
 						{
 							"title": "config-ssh",
-							"description": "Add an SSH Host entry for your workspaces \"ssh coder.workspace\"",
+							"description": "Add an SSH Host entry for your workspaces \"ssh workspace.coder\"",
 							"path": "reference/cli/config-ssh.md"
 						},
 						{
diff --git a/docs/reference/cli/config-ssh.md b/docs/reference/cli/config-ssh.md
index c9250523b6c28..607aa86849dd2 100644
--- a/docs/reference/cli/config-ssh.md
+++ b/docs/reference/cli/config-ssh.md
@@ -1,7 +1,7 @@
 <!-- DO NOT EDIT | GENERATED CONTENT -->
 # config-ssh
 
-Add an SSH Host entry for your workspaces "ssh coder.workspace"
+Add an SSH Host entry for your workspaces "ssh workspace.coder"
 
 ## Usage
 
diff --git a/docs/reference/cli/index.md b/docs/reference/cli/index.md
index 2106374eba150..d72790fc3bfdb 100644
--- a/docs/reference/cli/index.md
+++ b/docs/reference/cli/index.md
@@ -41,7 +41,7 @@ Coder — A tool for provisioning self-hosted development environments with Terr
 | [<code>users</code>](./users.md)                   | Manage users                                                                                          |
 | [<code>version</code>](./version.md)               | Show coder version                                                                                    |
 | [<code>autoupdate</code>](./autoupdate.md)         | Toggle auto-update policy for a workspace                                                             |
-| [<code>config-ssh</code>](./config-ssh.md)         | Add an SSH Host entry for your workspaces "ssh coder.workspace"                                       |
+| [<code>config-ssh</code>](./config-ssh.md)         | Add an SSH Host entry for your workspaces "ssh workspace.coder"                                       |
 | [<code>create</code>](./create.md)                 | Create a workspace                                                                                    |
 | [<code>delete</code>](./delete.md)                 | Delete a workspace                                                                                    |
 | [<code>favorite</code>](./favorite.md)             | Add a workspace to your favorites                                                                     |
diff --git a/docs/tutorials/testing-templates.md b/docs/tutorials/testing-templates.md
index 45250a6a71aac..1ab617161d319 100644
--- a/docs/tutorials/testing-templates.md
+++ b/docs/tutorials/testing-templates.md
@@ -103,9 +103,8 @@ jobs:
       - name: Create a test workspace and run some example commands
         run: |
           coder create -t $TEMPLATE_NAME --template-version ${{ steps.name.outputs.version_name }} test-${{ steps.name.outputs.version_name }} --yes
-          coder config-ssh --yes
           # run some example commands
-          ssh coder.test-${{ steps.name.outputs.version_name }} -- make build
+          coder ssh test-${{ steps.name.outputs.version_name }} -- make build
 
       - name: Delete the test workspace
         if: always()
diff --git a/site/src/modules/resources/AgentRow.tsx b/site/src/modules/resources/AgentRow.tsx
index 407c8c1bd84c6..7687339ae0e97 100644
--- a/site/src/modules/resources/AgentRow.tsx
+++ b/site/src/modules/resources/AgentRow.tsx
@@ -196,6 +196,7 @@ export const AgentRow: FC<AgentRowProps> = ({
 						<AgentSSHButton
 							workspaceName={workspace.name}
 							agentName={agent.name}
+							workspaceOwnerUsername={workspace.owner_name}
 						/>
 					)}
 					{proxy.preferredWildcardHostname !== "" &&
diff --git a/site/src/modules/resources/SSHButton/SSHButton.tsx b/site/src/modules/resources/SSHButton/SSHButton.tsx
index 5b21ff079fe13..bf1ef33520de3 100644
--- a/site/src/modules/resources/SSHButton/SSHButton.tsx
+++ b/site/src/modules/resources/SSHButton/SSHButton.tsx
@@ -22,15 +22,17 @@ import { docs } from "utils/docs";
 interface AgentSSHButtonProps {
 	workspaceName: string;
 	agentName: string;
+	workspaceOwnerUsername: string;
 }
 
 export const AgentSSHButton: FC<AgentSSHButtonProps> = ({
 	workspaceName,
 	agentName,
+	workspaceOwnerUsername,
 }) => {
 	const paper = useClassName(classNames.paper, []);
 	const { data } = useQuery(deploymentSSHConfig());
-	const sshPrefix = data?.hostname_prefix;
+	const sshSuffix = data?.hostname_suffix;
 
 	return (
 		<Popover>
@@ -58,7 +60,7 @@ export const AgentSSHButton: FC<AgentSSHButtonProps> = ({
 						/>
 						<SSHStep
 							helpText="Connect to the agent:"
-							codeExample={`ssh ${sshPrefix}${workspaceName}.${agentName}`}
+							codeExample={`ssh ${workspaceName}.${agentName}.${workspaceOwnerUsername}.${sshSuffix}`}
 						/>
 					</Stack>
 				</ol>

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/18085.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/18085.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/18085.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/18085.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>