diff --git a/docs/get-started/index.md b/docs/get-started/index.md
index f81ae6aff2b40..221dee2f895c2 100644
--- a/docs/get-started/index.md
+++ b/docs/get-started/index.md
@@ -220,7 +220,8 @@ This section includes some of the quicker ways to install Coder. For more detail
Templates define what's in your development environment. The template builder
guides you through creating one without writing any Terraform.
-1. Select **Templates** > **New Template**. The template builder opens.
+1. Coder opens the template builder after initial setup.
+ To open it again later, select **Templates** > **New Template**.
1. Select the **Docker** base template from the list.
diff --git a/site/e2e/setup/addUsersAndLicense.spec.ts b/site/e2e/setup/addUsersAndLicense.spec.ts
index 03a6afeb11521..0e18650243b81 100644
--- a/site/e2e/setup/addUsersAndLicense.spec.ts
+++ b/site/e2e/setup/addUsersAndLicense.spec.ts
@@ -19,8 +19,10 @@ test("setup deployment", async ({ page }) => {
await page.getByLabel("Password").fill(users.owner.password);
await page.getByTestId("create").click();
- await expectUrl(page).toHavePathName("/templates");
- await page.getByTestId("button-select-template").isVisible();
+ await expectUrl(page).toHavePathName("/templates/new/builder");
+ await expect(
+ page.getByRole("heading", { name: "Create new template" }),
+ ).toBeVisible();
for (const user of Object.values(users)) {
// Already created as first user
diff --git a/site/src/pages/SetupPage/SetupPage.test.tsx b/site/src/pages/SetupPage/SetupPage.test.tsx
index e29128541346b..f3122e42707e2 100644
--- a/site/src/pages/SetupPage/SetupPage.test.tsx
+++ b/site/src/pages/SetupPage/SetupPage.test.tsx
@@ -71,7 +71,7 @@ describe("Setup Page", () => {
await waitFor(() => screen.findByText("Password is too short"));
});
- it("redirects to the app when setup is successful", async () => {
+ it("redirects to the template builder when setup is successful", async () => {
let userHasBeenCreated = false;
server.use(
@@ -110,8 +110,8 @@ describe("Setup Page", () => {
element: ,
},
{
- path: "/templates",
- element:
Templates
,
+ path: "/templates/new/builder",
+ element:
Template Builder
,
},
],
{ initialEntries: ["/setup"] },
@@ -119,7 +119,7 @@ describe("Setup Page", () => {
);
await waitForLoaderToBeRemoved();
await fillForm();
- await waitFor(() => screen.findByText("Templates"));
+ await waitFor(() => screen.findByText("Template Builder"));
});
it("calls sendBeacon with telemetry", async () => {
diff --git a/site/src/pages/SetupPage/SetupPage.tsx b/site/src/pages/SetupPage/SetupPage.tsx
index b1bac76c5a862..b6ff18fdcc05c 100644
--- a/site/src/pages/SetupPage/SetupPage.tsx
+++ b/site/src/pages/SetupPage/SetupPage.tsx
@@ -41,7 +41,7 @@ export const SetupPage: FC = () => {
// If the user is logged in, navigate to the app
if (isSignedIn) {
return setupRequired.current ? (
-
+
) : (
);
diff --git a/site/src/pages/SetupPage/SetupPageView.tsx b/site/src/pages/SetupPage/SetupPageView.tsx
index 2bd0a31c5f73b..3ebb2b41d336b 100644
--- a/site/src/pages/SetupPage/SetupPageView.tsx
+++ b/site/src/pages/SetupPage/SetupPageView.tsx
@@ -210,7 +210,11 @@ export const SetupPageView: FC = ({
{authMethods?.github.enabled && (
<>