diff --git a/site/src/api/api.ts b/site/src/api/api.ts
index a1aeeca8a9e59..ede6f90a0133b 100644
--- a/site/src/api/api.ts
+++ b/site/src/api/api.ts
@@ -2374,6 +2374,18 @@ class ApiMethods {
 				);
 		}
 	};
+
+	getAgentContainers = async (agentId: string, labels?: string[]) => {
+		const params = new URLSearchParams(
+			labels?.map((label) => ["label", label]),
+		);
+
+		const res =
+			await this.axios.get<TypesGen.WorkspaceAgentListContainersResponse>(
+				`/api/v2/workspaceagents/${agentId}/containers?${params.toString()}`,
+			);
+		return res.data;
+	};
 }
 
 // This is a hard coded CSRF token/cookie pair for local development. In prod,
diff --git a/site/src/modules/resources/AgentDevcontainerCard.tsx b/site/src/modules/resources/AgentDevcontainerCard.tsx
new file mode 100644
index 0000000000000..fc58c21f95bcb
--- /dev/null
+++ b/site/src/modules/resources/AgentDevcontainerCard.tsx
@@ -0,0 +1,74 @@
+import Link from "@mui/material/Link";
+import type { Workspace, WorkspaceAgentDevcontainer } from "api/typesGenerated";
+import { ExternalLinkIcon } from "lucide-react";
+import type { FC } from "react";
+import { portForwardURL } from "utils/portForward";
+import { AgentButton } from "./AgentButton";
+import { AgentDevcontainerSSHButton } from "./SSHButton/SSHButton";
+import { TerminalLink } from "./TerminalLink/TerminalLink";
+
+type AgentDevcontainerCardProps = {
+	container: WorkspaceAgentDevcontainer;
+	workspace: Workspace;
+	wildcardHostname: string;
+	agentName: string;
+};
+
+export const AgentDevcontainerCard: FC<AgentDevcontainerCardProps> = ({
+	container,
+	workspace,
+	agentName,
+	wildcardHostname,
+}) => {
+	return (
+		<section
+			className="border border-border border-dashed rounded p-6 "
+			key={container.id}
+		>
+			<header className="flex justify-between">
+				<h3 className="m-0 text-xs font-medium text-content-secondary">
+					{container.name}
+				</h3>
+
+				<AgentDevcontainerSSHButton
+					workspace={workspace.name}
+					container={container.name}
+				/>
+			</header>
+
+			<h4 className="m-0 text-xl font-semibold">Forwarded ports</h4>
+
+			<div className="flex gap-4 flex-wrap mt-4">
+				<TerminalLink
+					workspaceName={workspace.name}
+					agentName={agentName}
+					containerName={container.name}
+					userName={workspace.owner_name}
+				/>
+				{wildcardHostname !== "" &&
+					container.ports.map((port) => {
+						return (
+							<Link
+								key={port.port}
+								color="inherit"
+								component={AgentButton}
+								underline="none"
+								startIcon={<ExternalLinkIcon className="size-icon-sm" />}
+								href={portForwardURL(
+									wildcardHostname,
+									port.port,
+									agentName,
+									workspace.name,
+									workspace.owner_name,
+									location.protocol === "https" ? "https" : "http",
+								)}
+							>
+								{port.process_name ||
+									`${port.port}/${port.network.toUpperCase()}`}
+							</Link>
+						);
+					})}
+			</div>
+		</section>
+	);
+};
diff --git a/site/src/modules/resources/AgentRow.tsx b/site/src/modules/resources/AgentRow.tsx
index 9e5caed677ee1..1b9761f28ea40 100644
--- a/site/src/modules/resources/AgentRow.tsx
+++ b/site/src/modules/resources/AgentRow.tsx
@@ -3,6 +3,7 @@ import Button from "@mui/material/Button";
 import Collapse from "@mui/material/Collapse";
 import Divider from "@mui/material/Divider";
 import Skeleton from "@mui/material/Skeleton";
+import { API } from "api/api";
 import { xrayScan } from "api/queries/integrations";
 import type {
 	Template,
@@ -25,6 +26,7 @@ import {
 import { useQuery } from "react-query";
 import AutoSizer from "react-virtualized-auto-sizer";
 import type { FixedSizeList as List, ListOnScrollProps } from "react-window";
+import { AgentDevcontainerCard } from "./AgentDevcontainerCard";
 import { AgentLatency } from "./AgentLatency";
 import { AGENT_LOG_LINE_HEIGHT } from "./AgentLogs/AgentLogLine";
 import { AgentLogs } from "./AgentLogs/AgentLogs";
@@ -35,7 +37,7 @@ import { AgentVersion } from "./AgentVersion";
 import { AppLink } from "./AppLink/AppLink";
 import { DownloadAgentLogsButton } from "./DownloadAgentLogsButton";
 import { PortForwardButton } from "./PortForwardButton";
-import { SSHButton } from "./SSHButton/SSHButton";
+import { AgentSSHButton } from "./SSHButton/SSHButton";
 import { TerminalLink } from "./TerminalLink/TerminalLink";
 import { VSCodeDesktopButton } from "./VSCodeDesktopButton/VSCodeDesktopButton";
 import { XRayScanAlert } from "./XRayScanAlert";
@@ -152,6 +154,18 @@ export const AgentRow: FC<AgentRowProps> = ({
 		setBottomOfLogs(distanceFromBottom < AGENT_LOG_LINE_HEIGHT);
 	}, []);
 
+	const { data: containers } = useQuery({
+		queryKey: ["agents", agent.id, "containers"],
+		queryFn: () =>
+			// Only return devcontainers
+			API.getAgentContainers(agent.id, [
+				"devcontainer.config_file=",
+				"devcontainer.local_folder=",
+			]),
+		enabled: agent.status === "connected",
+		select: (res) => res.containers.filter((c) => c.status === "running"),
+	});
+
 	return (
 		<Stack
 			key={agent.id}
@@ -191,14 +205,13 @@ export const AgentRow: FC<AgentRowProps> = ({
 				{showBuiltinApps && (
 					<div css={{ display: "flex" }}>
 						{!hideSSHButton && agent.display_apps.includes("ssh_helper") && (
-							<SSHButton
+							<AgentSSHButton
 								workspaceName={workspace.name}
 								agentName={agent.name}
 								sshPrefix={sshPrefix}
 							/>
 						)}
-						{proxy.preferredWildcardHostname &&
-							proxy.preferredWildcardHostname !== "" &&
+						{proxy.preferredWildcardHostname !== "" &&
 							agent.display_apps.includes("port_forwarding_helper") && (
 								<PortForwardButton
 									host={proxy.preferredWildcardHostname}
@@ -267,6 +280,22 @@ export const AgentRow: FC<AgentRowProps> = ({
 					</section>
 				)}
 
+				{containers && containers.length > 0 && (
+					<section className="flex flex-col gap-4">
+						{containers.map((container) => {
+							return (
+								<AgentDevcontainerCard
+									key={container.id}
+									container={container}
+									workspace={workspace}
+									wildcardHostname={proxy.preferredWildcardHostname}
+									agentName={agent.name}
+								/>
+							);
+						})}
+					</section>
+				)}
+
 				<AgentMetadata
 					storybookMetadata={storybookAgentMetadata}
 					agent={agent}
diff --git a/site/src/modules/resources/SSHButton/SSHButton.stories.tsx b/site/src/modules/resources/SSHButton/SSHButton.stories.tsx
index 9dbd340a7ef1b..09e79dfdb611a 100644
--- a/site/src/modules/resources/SSHButton/SSHButton.stories.tsx
+++ b/site/src/modules/resources/SSHButton/SSHButton.stories.tsx
@@ -2,15 +2,15 @@ import type { Meta, StoryObj } from "@storybook/react";
 import { userEvent, within } from "@storybook/test";
 import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities";
 import { withDesktopViewport } from "testHelpers/storybook";
-import { SSHButton } from "./SSHButton";
+import { AgentSSHButton } from "./SSHButton";
 
-const meta: Meta<typeof SSHButton> = {
-	title: "modules/resources/SSHButton",
-	component: SSHButton,
+const meta: Meta<typeof AgentSSHButton> = {
+	title: "modules/resources/AgentSSHButton",
+	component: AgentSSHButton,
 };
 
 export default meta;
-type Story = StoryObj<typeof SSHButton>;
+type Story = StoryObj<typeof AgentSSHButton>;
 
 export const Closed: Story = {
 	args: {
diff --git a/site/src/modules/resources/SSHButton/SSHButton.tsx b/site/src/modules/resources/SSHButton/SSHButton.tsx
index 3d94b33375c0b..d5351a3ff5466 100644
--- a/site/src/modules/resources/SSHButton/SSHButton.tsx
+++ b/site/src/modules/resources/SSHButton/SSHButton.tsx
@@ -17,13 +17,13 @@ import { type ClassName, useClassName } from "hooks/useClassName";
 import type { FC } from "react";
 import { docs } from "utils/docs";
 
-export interface SSHButtonProps {
+export interface AgentSSHButtonProps {
 	workspaceName: string;
 	agentName: string;
 	sshPrefix?: string;
 }
 
-export const SSHButton: FC<SSHButtonProps> = ({
+export const AgentSSHButton: FC<AgentSSHButtonProps> = ({
 	workspaceName,
 	agentName,
 	sshPrefix,
@@ -82,6 +82,56 @@ export const SSHButton: FC<SSHButtonProps> = ({
 	);
 };
 
+export interface AgentDevcontainerSSHButtonProps {
+	workspace: string;
+	container: string;
+}
+
+export const AgentDevcontainerSSHButton: FC<
+	AgentDevcontainerSSHButtonProps
+> = ({ workspace, container }) => {
+	const paper = useClassName(classNames.paper, []);
+
+	return (
+		<Popover>
+			<PopoverTrigger>
+				<Button
+					size="small"
+					variant="text"
+					endIcon={<KeyboardArrowDown />}
+					css={{ fontSize: 13, padding: "8px 12px" }}
+				>
+					Connect via SSH
+				</Button>
+			</PopoverTrigger>
+
+			<PopoverContent horizontal="right" classes={{ paper }}>
+				<HelpTooltipText>
+					Run the following commands to connect with SSH:
+				</HelpTooltipText>
+
+				<ol style={{ margin: 0, padding: 0 }}>
+					<Stack spacing={0.5} css={styles.codeExamples}>
+						<SSHStep
+							helpText="Connect to the container:"
+							codeExample={`coder ssh ${workspace} -c ${container}`}
+						/>
+					</Stack>
+				</ol>
+
+				<HelpTooltipLinksGroup>
+					<HelpTooltipLink href={docs("/install")}>
+						Install Coder CLI
+					</HelpTooltipLink>
+					<HelpTooltipLink href={docs("/user-guides/workspace-access#ssh")}>
+						SSH configuration
+					</HelpTooltipLink>
+				</HelpTooltipLinksGroup>
+			</PopoverContent>
+		</Popover>
+	);
+};
+
 interface SSHStepProps {
 	helpText: string;
 	codeExample: string;
diff --git a/site/src/modules/resources/TerminalLink/TerminalLink.tsx b/site/src/modules/resources/TerminalLink/TerminalLink.tsx
index 4d709dc482e70..f7a07131e4cd0 100644
--- a/site/src/modules/resources/TerminalLink/TerminalLink.tsx
+++ b/site/src/modules/resources/TerminalLink/TerminalLink.tsx
@@ -11,9 +11,10 @@ export const Language = {
 };
 
 export interface TerminalLinkProps {
-	agentName?: TypesGen.WorkspaceAgent["name"];
-	userName?: TypesGen.User["username"];
-	workspaceName: TypesGen.Workspace["name"];
+	workspaceName: string;
+	agentName?: string;
+	userName?: string;
+	containerName?: string;
 }
 
 /**
@@ -27,11 +28,16 @@ export const TerminalLink: FC<TerminalLinkProps> = ({
 	agentName,
 	userName = "me",
 	workspaceName,
+	containerName,
 }) => {
+	const params = new URLSearchParams();
+	if (containerName) {
+		params.append("container", containerName);
+	}
 	// Always use the primary for the terminal link. This is a relative link.
 	const href = `/@${userName}/${workspaceName}${
 		agentName ? `.${agentName}` : ""
-	}/terminal`;
+	}/terminal?${params.toString()}`;
 
 	return (
 		<Link

<!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/16800.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/16800.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/16800.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/16800.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>