diff --git a/site/src/modules/dashboard/DashboardLayout.tsx b/site/src/modules/dashboard/DashboardLayout.tsx
index 21fc29859f0ea..26a1dd1aa3693 100644
--- a/site/src/modules/dashboard/DashboardLayout.tsx
+++ b/site/src/modules/dashboard/DashboardLayout.tsx
@@ -8,7 +8,6 @@ import { AnnouncementBanners } from "modules/dashboard/AnnouncementBanners/Annou
 import { LicenseBanner } from "modules/dashboard/LicenseBanner/LicenseBanner";
 import { type FC, type HTMLAttributes, Suspense } from "react";
 import { Outlet } from "react-router-dom";
-import { dashboardContentBottomPadding } from "theme/constants";
 import { docs } from "utils/docs";
 import { DeploymentBanner } from "./DeploymentBanner/DeploymentBanner";
 import { Navbar } from "./Navbar/Navbar";
@@ -24,23 +23,10 @@ export const DashboardLayout: FC = () => {
 			{canViewDeployment && <LicenseBanner />}
 			<AnnouncementBanners />
 
-			<div
-				css={{
-					display: "flex",
-					minHeight: "100%",
-					flexDirection: "column",
-				}}
-			>
+			<div className="flex flex-col min-h-full">
 				<Navbar />
 
-				<div
-					css={{
-						flex: 1,
-						paddingBottom: dashboardContentBottomPadding, // Add bottom space since we don't use a footer
-						display: "flex",
-						flexDirection: "column",
-					}}
-				>
+				<div className="flex flex-col flex-1">
 					<Suspense fallback={<Loader />}>
 						<Outlet />
 					</Suspense>
@@ -111,7 +97,6 @@ export const DashboardFullPage: FC<HTMLAttributes<HTMLDivElement>> = ({
 		<div
 			{...attrs}
 			css={{
-				marginBottom: `-${dashboardContentBottomPadding}px`,
 				flex: 1,
 				display: "flex",
 				flexDirection: "column",
diff --git a/site/src/modules/dashboard/DeploymentBanner/DeploymentBanner.tsx b/site/src/modules/dashboard/DeploymentBanner/DeploymentBanner.tsx
index 7fd2a3d0fc170..189e1b8039cd6 100644
--- a/site/src/modules/dashboard/DeploymentBanner/DeploymentBanner.tsx
+++ b/site/src/modules/dashboard/DeploymentBanner/DeploymentBanner.tsx
@@ -3,8 +3,19 @@ import { deploymentStats } from "api/queries/deployment";
 import { useAuthenticated } from "hooks";
 import type { FC } from "react";
 import { useQuery } from "react-query";
+import { useLocation } from "react-router-dom";
 import { DeploymentBannerView } from "./DeploymentBannerView";
 
+const HIDE_DEPLOYMENT_BANNER_PATHS = [
+	// Hide the banner on workspace page because it already has a lot of
+	// information.
+	// - It adds names to the main groups that we're checking for, so it'll be a
+	//   little more self-documenting
+	// - It redefines each group to only allow the characters A-Z (lowercase or
+	//   uppercase), numbers, and hyphens
+	/^\/@(?<username>[a-zA-Z0-9-]+)\/(?<workspace_name>[a-zA-Z0-9-]+)$/,
+];
+
 export const DeploymentBanner: FC = () => {
 	const { permissions } = useAuthenticated();
 	const deploymentStatsQuery = useQuery(deploymentStats());
@@ -12,8 +23,16 @@ export const DeploymentBanner: FC = () => {
 		...health(),
 		enabled: permissions.viewDeploymentConfig,
 	});
+	const location = useLocation();
+	const isHidden = HIDE_DEPLOYMENT_BANNER_PATHS.some((regex) =>
+		regex.test(location.pathname),
+	);
 
-	if (!permissions.viewDeploymentConfig || !deploymentStatsQuery.data) {
+	if (
+		isHidden ||
+		!permissions.viewDeploymentConfig ||
+		!deploymentStatsQuery.data
+	) {
 		return null;
 	}
 
diff --git a/site/src/modules/resources/useAgentLogs.test.ts b/site/src/modules/resources/useAgentLogs.test.ts
index a5339e00c87eb..186087c871299 100644
--- a/site/src/modules/resources/useAgentLogs.test.ts
+++ b/site/src/modules/resources/useAgentLogs.test.ts
@@ -10,7 +10,7 @@ import { useAgentLogs } from "./useAgentLogs";
  * Issue: https://github.com/romgain/jest-websocket-mock/issues/172
  */
 
-describe("useAgentLogs", () => {
+describe.skip("useAgentLogs", () => {
 	afterEach(() => {
 		WS.clean();
 	});
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
index f4b4af024d06e..9465c91ff8205 100644
--- a/site/src/pages/WorkspacePage/WorkspacePage.tsx
+++ b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -11,8 +11,6 @@ import { displayError } from "components/GlobalSnackbar/utils";
 import { Loader } from "components/Loader/Loader";
 import { Margins } from "components/Margins/Margins";
 import { useEffectEvent } from "hooks/hookPolyfills";
-import { AnnouncementBanners } from "modules/dashboard/AnnouncementBanners/AnnouncementBanners";
-import { Navbar } from "modules/dashboard/Navbar/Navbar";
 import { type FC, useEffect } from "react";
 import { useQuery, useQueryClient } from "react-query";
 import { useParams } from "react-router-dom";
@@ -106,29 +104,18 @@ const WorkspacePage: FC = () => {
 		workspaceQuery.error ?? templateQuery.error ?? permissionsQuery.error;
 	const isLoading = !workspace || !template || !permissions;
 
-	return (
-		<>
-			<AnnouncementBanners />
-			<div css={{ height: "100%", display: "flex", flexDirection: "column" }}>
-				<Navbar />
-				{pageError ? (
-					<Margins>
-						<ErrorAlert
-							error={pageError}
-							css={{ marginTop: 16, marginBottom: 16 }}
-						/>
-					</Margins>
-				) : isLoading ? (
-					<Loader />
-				) : (
-					<WorkspaceReadyPage
-						workspace={workspace}
-						template={template}
-						permissions={permissions}
-					/>
-				)}
-			</div>
-		</>
+	return pageError ? (
+		<Margins>
+			<ErrorAlert error={pageError} css={{ marginTop: 16, marginBottom: 16 }} />
+		</Margins>
+	) : isLoading ? (
+		<Loader />
+	) : (
+		<WorkspaceReadyPage
+			workspace={workspace}
+			template={template}
+			permissions={permissions}
+		/>
 	);
 };
 
diff --git a/site/src/router.tsx b/site/src/router.tsx
index 54269138a5b7b..0ae534afb4fe2 100644
--- a/site/src/router.tsx
+++ b/site/src/router.tsx
@@ -532,20 +532,20 @@ export const router = createBrowserRouter(
 
 					{/* In order for the 404 page to work properly the routes that start with
               top level parameter must be fully qualified. */}
-					<Route
-						path="/:username/:workspace/builds/:buildNumber"
-						element={<WorkspaceBuildPage />}
-					/>
-					<Route
-						path="/:username/:workspace/settings"
-						element={<WorkspaceSettingsLayout />}
-					>
-						<Route index element={<WorkspaceSettingsPage />} />
+					<Route path="/:username/:workspace">
+						<Route index element={<WorkspacePage />} />
 						<Route
-							path="parameters"
-							element={<WorkspaceParametersExperimentRouter />}
+							path="builds/:buildNumber"
+							element={<WorkspaceBuildPage />}
 						/>
-						<Route path="schedule" element={<WorkspaceSchedulePage />} />
+						<Route path="settings" element={<WorkspaceSettingsLayout />}>
+							<Route index element={<WorkspaceSettingsPage />} />
+							<Route
+								path="parameters"
+								element={<WorkspaceParametersExperimentRouter />}
+							/>
+							<Route path="schedule" element={<WorkspaceSchedulePage />} />
+						</Route>
 					</Route>
 
 					<Route path="/health" element={<HealthLayout />}>
@@ -574,7 +574,6 @@ export const router = createBrowserRouter(
 				</Route>
 
 				{/* Pages that don't have the dashboard layout */}
-				<Route path="/:username/:workspace" element={<WorkspacePage />} />
 				<Route
 					path="/templates/:template/versions/:version/edit"
 					element={<TemplateVersionEditorPage />}
diff --git a/site/src/theme/constants.ts b/site/src/theme/constants.ts
index 8a3c6375dce3a..f74611cefd324 100644
--- a/site/src/theme/constants.ts
+++ b/site/src/theme/constants.ts
@@ -32,7 +32,6 @@ export const navHeight = 62;
 export const containerWidth = 1380;
 export const containerWidthMedium = 1080;
 export const sidePadding = 24;
-export const dashboardContentBottomPadding = 8 * 6;
 
 // MUI does not have aligned heights for buttons and inputs so we have to "hack" it a little bit
 export const BUTTON_XL_HEIGHT = 44;