From 6ea07ba2ee58c23fb56a7e8a069791fc061fc08e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Weberru=C3=9F?= <lukas@klue.de>
Date: Tue, 27 Oct 2026 09:33:36 +0000
Subject: [PATCH 1/2] fix(configurator): keep a single template drafts editor

---
 .../apps/web/src/components/Applications.tsx  |   5 +-
 .../apps/web/src/components/CommonEditor.tsx  |  89 +++++--------
 .../app/apps/web/src/locales/en.ts            |   3 +
 .../app/apps/web/src/main.tsx                 |  86 ++++++++++--
 .../app/apps/web/src/navigation.ts            |  68 +++++-----
 .../e2e/application-access-transition.spec.ts |  24 ++--
 .../app/e2e/cloud-catalogues.spec.ts          |  33 ++---
 .../app/e2e/common-editor.spec.ts             | 124 +++++++++++-------
 .../app/e2e/configurator.spec.ts              |  34 ++---
 .../app/e2e/editor-navigation.ts              |  40 ++++++
 .../app/e2e/federation.spec.ts                |  14 +-
 .../app/e2e/organisation.spec.ts              |  22 ++--
 .../app/e2e/template-parameters.spec.ts       |  66 +++-------
 .../docs/common-editor.de.md                  |   6 +-
 .../docs/common-editor.md                     |   7 +-
 .../docs/development.de.md                    |   2 +
 landing-zone-configurator/docs/development.md |   7 +-
 .../docs/project-template-drafts.de.md        |   4 +-
 .../docs/project-template-drafts.md           |   4 +-
 19 files changed, 375 insertions(+), 263 deletions(-)
 create mode 100644 landing-zone-configurator/app/e2e/editor-navigation.ts

diff --git a/landing-zone-configurator/app/apps/web/src/components/Applications.tsx b/landing-zone-configurator/app/apps/web/src/components/Applications.tsx
index f39a76ce..6ecb8e05 100644
--- a/landing-zone-configurator/app/apps/web/src/components/Applications.tsx
+++ b/landing-zone-configurator/app/apps/web/src/components/Applications.tsx
@@ -2397,8 +2397,11 @@ export function Applications({
   if (!session)
     return (
       <section>
-        <h2>{t("Anmeldung erforderlich")}</h2>
+        <h2>
+          {t(templateEditor ? "Template-Entwürfe" : "Anmeldung erforderlich")}
+        </h2>
         <p>{t("Bitte melde dich für Application Landing Zones an.")}</p>
+        {templateEditor}
       </section>
     );
 
diff --git a/landing-zone-configurator/app/apps/web/src/components/CommonEditor.tsx b/landing-zone-configurator/app/apps/web/src/components/CommonEditor.tsx
index 33463bbe..dab47356 100644
--- a/landing-zone-configurator/app/apps/web/src/components/CommonEditor.tsx
+++ b/landing-zone-configurator/app/apps/web/src/components/CommonEditor.tsx
@@ -22,13 +22,11 @@ import {
 import { useState } from "react";
 import { t } from "../i18n";
 import type { EditorStep } from "../navigation";
-import type { Session } from "./Account";
 import { useObservabilityCatalogue } from "./CloudCatalogues";
 import { ComponentPicker } from "./ComponentPicker";
 import { FederatedIdentityEditor } from "./FederatedIdentityEditor";
 import { labelFor } from "./feature-labels";
 import { NetworkEditor } from "./NetworkEditor";
-import { ProjectTemplates } from "./ProjectTemplates";
 import { projectTemplateSummary } from "./project-template-summary";
 import { StructuredField } from "./StructuredField";
 import { Topology } from "./Topology";
@@ -87,22 +85,20 @@ const steps: { id: EditorStep; title: string; inputs: string[] }[] = [
 
 export function CommonEditor({
   draft,
-  session = null,
-  savedConfigurationId = null,
   onChange,
   step,
   onStepChange,
   onOpenStorage,
   onCreatePlatformCopy,
+  onOpenTemplates,
 }: {
   draft: CommonConfiguration;
-  session?: Session | null;
-  savedConfigurationId?: string | null;
   onChange: (draft: CommonConfiguration) => void;
   step: EditorStep;
   onStepChange: (step: EditorStep) => void;
   onOpenStorage: () => void;
   onCreatePlatformCopy?: () => void;
+  onOpenTemplates: () => void;
 }) {
   const [error, setError] = useState("");
   const [notice, setNotice] = useState("");
@@ -110,24 +106,12 @@ export function CommonEditor({
     "public",
   );
   const [newKey, setNewKey] = useState("");
-  const [selectedTemplateId, setSelectedTemplateId] = useState<string | null>(
-    null,
-  );
   const platformDraft = draft.projectTemplates !== undefined;
-  const selectedTemplate =
-    draft.projectTemplates?.find(
-      (template) => template.id === selectedTemplateId,
-    ) ?? draft.projectTemplates?.[0];
-  const selectTemplate = (id: string) => {
-    setSelectedTemplateId(id);
-    onStepChange("projects");
-  };
+  const visibleSteps = steps.filter(
+    (item) => !platformDraft || item.id !== "projects",
+  );
   const stepTitle = (id: EditorStep, title: string) =>
-    id === "projects"
-      ? platformDraft
-        ? "Template-Entwürfe"
-        : "Projekte (Bestand)"
-      : title;
+    id === "projects" ? "Projekte (Bestand)" : title;
   const values = compileCommonConfiguration(draft);
   const projects = commonProjects(draft);
   const areas = commonNetworkAreas(draft);
@@ -158,7 +142,8 @@ export function CommonEditor({
       )
       .map((finding) => ({ field: finding.path, message: finding.message })),
   ];
-  const active = steps.find((item) => item.id === step) ?? steps[0];
+  const active =
+    visibleSteps.find((item) => item.id === step) ?? visibleSteps[0];
   const perform = (action: () => CommonConfiguration) => {
     try {
       onChange(action());
@@ -257,11 +242,25 @@ export function CommonEditor({
           {t("Konfigurationen →")}
         </button>
       </div>
+      {platformDraft && (
+        <p className="info-banner">
+          {t(
+            "Template-Entwürfe bearbeitest du unter Application Landing Zones. Sie werden weiterhin mit dieser Konfiguration gespeichert.",
+          )}{" "}
+          <button
+            type="button"
+            className="text-button"
+            onClick={onOpenTemplates}
+          >
+            {t("Zu den Application Landing Zones →")}
+          </button>
+        </p>
+      )}
       <nav
         aria-label={t("Konfigurationsschritte")}
         className="steps shared-steps"
       >
-        {steps.map((item, index) => (
+        {visibleSteps.map((item, index) => (
           <button
             type="button"
             key={item.id}
@@ -313,16 +312,6 @@ export function CommonEditor({
                 )}
               </p>
             )}
-          {step === "projects" && platformDraft && (
-            <ProjectTemplates
-              session={session}
-              savedConfigurationId={savedConfigurationId}
-              draft={draft}
-              onChange={onChange}
-              selectedTemplateId={selectedTemplate?.id ?? null}
-              onSelectTemplate={selectTemplate}
-            />
-          )}
           {step === "projects" && !platformDraft && (
             <>
               <p className="info-banner">
@@ -816,10 +805,10 @@ export function CommonEditor({
                 className="button secondary"
                 onClick={() =>
                   onStepChange(
-                    steps[
+                    visibleSteps[
                       Math.max(
                         0,
-                        steps.findIndex((item) => item.id === step) - 1,
+                        visibleSteps.findIndex((item) => item.id === step) - 1,
                       )
                     ]?.id ?? "basics",
                   )
@@ -834,8 +823,9 @@ export function CommonEditor({
                 className="button primary"
                 onClick={() =>
                   onStepChange(
-                    steps[steps.findIndex((item) => item.id === step) + 1]
-                      ?.id ?? "review",
+                    visibleSteps[
+                      visibleSteps.findIndex((item) => item.id === step) + 1
+                    ]?.id ?? "review",
                   )
                 }
               >
@@ -845,12 +835,7 @@ export function CommonEditor({
           </div>
         </section>
         <div className="editor-previews">
-          <Topology
-            values={values}
-            projectTemplates={draft.projectTemplates}
-            selectedTemplateId={selectedTemplate?.id}
-            onSelectTemplate={selectTemplate}
-          />
+          <Topology values={values} projectTemplates={draft.projectTemplates} />
           {areas.length > 0 && (
             <figure className="topology network-topology">
               <figcaption>{t("Netzwerkzuordnung")}</figcaption>
@@ -888,20 +873,8 @@ export function CommonEditor({
                             )
                             .map((template) => (
                               <li key={template.id}>
-                                <button
-                                  type="button"
-                                  className="text-button"
-                                  aria-pressed={
-                                    selectedTemplate?.id === template.id
-                                  }
-                                  onClick={() => selectTemplate(template.id)}
-                                >
-                                  {t("Template ·")}{" "}
-                                  {
-                                    projectTemplateSummary(template, values)
-                                      .name
-                                  }
-                                </button>
+                                {t("Template ·")}{" "}
+                                {projectTemplateSummary(template, values).name}
                               </li>
                             ))}
                         </ul>
diff --git a/landing-zone-configurator/app/apps/web/src/locales/en.ts b/landing-zone-configurator/app/apps/web/src/locales/en.ts
index d34ee599..8822657e 100644
--- a/landing-zone-configurator/app/apps/web/src/locales/en.ts
+++ b/landing-zone-configurator/app/apps/web/src/locales/en.ts
@@ -1,4 +1,7 @@
 export const englishMessages: Record<string, string> = {
+  "Template-Entwürfe bearbeitest du unter Application Landing Zones. Sie werden weiterhin mit dieser Konfiguration gespeichert.":
+    "Edit template drafts under Application Landing Zones. They are still saved with this configuration.",
+  "Zu den Application Landing Zones →": "Go to Application Landing Zones →",
   "Assistant für Template-Entwürfe": "Assistant for template drafts",
   "Der Assistant verwendet die geöffnete Plattformkonfiguration einschließlich ihrer Template-Entwürfe. Nenne das gewünschte Template und prüfe die vorgeschlagenen Änderungen vor der Übernahme. Speichere sie anschließend ausdrücklich; eine Veröffentlichung erfolgt separat.":
     "The Assistant uses the open platform configuration, including its template drafts. Name the template you want to change and review the proposed changes before accepting them. Then save explicitly; publication is a separate step.",
diff --git a/landing-zone-configurator/app/apps/web/src/main.tsx b/landing-zone-configurator/app/apps/web/src/main.tsx
index bb3e68c8..5e4407e6 100644
--- a/landing-zone-configurator/app/apps/web/src/main.tsx
+++ b/landing-zone-configurator/app/apps/web/src/main.tsx
@@ -1,6 +1,7 @@
 import { assistantValuesEqual } from "@lzc/contracts";
 import {
   type CommonConfiguration,
+  commonNetworkAreas,
   compileCommonConfiguration,
   createEditorConfiguration,
   createPlatformDraftCopy,
@@ -8,6 +9,7 @@ import {
   isCommonDraft,
   objectValue,
   readEditorDraft,
+  textValue,
   upgradeEditorDraft,
 } from "@lzc/domain";
 import {
@@ -42,6 +44,7 @@ import { ForkWorkspace } from "./components/ForkWorkspace";
 import { InvitationAcceptance } from "./components/Invitations";
 import { Organisation } from "./components/Organisation";
 import { ProjectTemplates } from "./components/ProjectTemplates";
+import { projectTemplateSummary } from "./components/project-template-summary";
 import { TemplateAdvice } from "./components/TemplateAdvice";
 import { Topology } from "./components/Topology";
 import { currentLanguage, setLanguage, t } from "./i18n";
@@ -71,15 +74,64 @@ function TemplateDraftEditor({
   const selected =
     draft.projectTemplates?.find((template) => template.id === selectedId) ??
     draft.projectTemplates?.[0];
+  const values = compileCommonConfiguration(draft);
+  const areas = commonNetworkAreas(draft);
   return (
-    <ProjectTemplates
-      draft={draft}
-      session={session}
-      savedConfigurationId={savedConfigurationId}
-      onChange={onChange}
-      selectedTemplateId={selected?.id ?? null}
-      onSelectTemplate={setSelectedId}
-    />
+    <div className="editor-layout">
+      <section className="panel">
+        <ProjectTemplates
+          draft={draft}
+          session={session}
+          savedConfigurationId={savedConfigurationId}
+          onChange={onChange}
+          selectedTemplateId={selected?.id ?? null}
+          onSelectTemplate={setSelectedId}
+        />
+      </section>
+      <div className="editor-previews">
+        <Topology
+          values={values}
+          projectTemplates={draft.projectTemplates}
+          selectedTemplateId={selected?.id}
+          onSelectTemplate={setSelectedId}
+        />
+        {areas.length > 0 && (
+          <figure className="topology network-topology">
+            <figcaption>{t("Netzwerkzuordnung")}</figcaption>
+            {areas.map((area) => (
+              <section key={area.id}>
+                <h3>
+                  {area.region} · {textValue(area.settings.name) || area.key}
+                </h3>
+                <ul>
+                  {draft.projectTemplates
+                    ?.filter(
+                      (template) =>
+                        template.kind === "corporate" &&
+                        template.region === area.region &&
+                        (textValue(template.settings.network_area_key) ||
+                          "default") === area.key,
+                    )
+                    .map((template) => (
+                      <li key={template.id}>
+                        <button
+                          type="button"
+                          className="text-button"
+                          aria-pressed={selected?.id === template.id}
+                          onClick={() => setSelectedId(template.id)}
+                        >
+                          {t("Template ·")}{" "}
+                          {projectTemplateSummary(template, values).name}
+                        </button>
+                      </li>
+                    ))}
+                </ul>
+              </section>
+            ))}
+          </figure>
+        )}
+      </div>
+    </div>
   );
 }
 
@@ -126,6 +178,17 @@ function App() {
     draft &&
       (!savedDraft || !assistantValuesEqual(draft, JSON.parse(savedDraft))),
   );
+  useEffect(() => {
+    if (
+      platformAccess &&
+      view === "editor" &&
+      step === "projects" &&
+      draft &&
+      isCommonDraft(draft) &&
+      draft.projectTemplates !== undefined
+    )
+      setView("applications", undefined, true);
+  }, [platformAccess, view, step, draft, setView]);
   const finishLogin = useCallback(() => {
     if (draft) return;
     setReturningFromLogin(true);
@@ -340,7 +403,7 @@ function App() {
       );
       setDraftEpoch((value) => value + 1);
       setConfigurationBinding(null);
-      setView("editor", "projects");
+      setView("applications");
       setLoginError("");
     } catch {
       setLoginError(
@@ -811,7 +874,7 @@ function App() {
             )}
             {platformAccess && (
               <>
-                <div hidden={view !== "editor"}>
+                <div hidden={view !== "editor" && view !== "applications"}>
                   <CloudCataloguePanel
                     session={session}
                     key={credentialRevision}
@@ -1083,11 +1146,10 @@ function App() {
                   draft &&
                   (isCommonDraft(draft) ? (
                     <CommonEditor
-                      session={session}
-                      savedConfigurationId={configurationBinding?.id ?? null}
                       draft={draft}
                       onChange={setDraft}
                       onCreatePlatformCopy={copyPlatform}
+                      onOpenTemplates={() => setView("applications")}
                       step={step}
                       onStepChange={(next) => setView("editor", next)}
                       onOpenStorage={() => setView("repositories")}
diff --git a/landing-zone-configurator/app/apps/web/src/navigation.ts b/landing-zone-configurator/app/apps/web/src/navigation.ts
index 6ee41439..55e4112a 100644
--- a/landing-zone-configurator/app/apps/web/src/navigation.ts
+++ b/landing-zone-configurator/app/apps/web/src/navigation.ts
@@ -96,37 +96,41 @@ export function useNavigation(restoreEditor: boolean) {
     window.addEventListener("popstate", update);
     return () => window.removeEventListener("popstate", update);
   }, [restoreEditor]);
-  const navigate = useCallback((view: View, detail?: string) => {
-    const path =
-      view === "preview"
-        ? `/templates/${detail ?? "standalone"}`
-        : view === "applications"
-          ? "/applications"
-          : view === "editor"
-            ? `/configurations/edit/${detail ?? "basics"}`
-            : view === "organisation"
-              ? "/organisation"
-              : view === "history"
-                ? "/deployments/history"
-                : view === "deployments"
-                  ? detail === "plan" || detail === "apply"
-                    ? `/deployments/${detail}`
-                    : "/deployments"
-                  : view === "credentials"
-                    ? "/credentials"
-                    : view === "repositories"
-                      ? "/configurations"
-                      : view === "workspaces"
-                        ? "/workspaces"
-                        : "/templates";
-    if (
-      window.location.pathname !== path ||
-      window.location.search ||
-      window.location.hash
-    ) {
-      window.history.pushState(null, "", path);
-      setRoute(readRoute());
-    }
-  }, []);
+  const navigate = useCallback(
+    (view: View, detail?: string, replace = false) => {
+      const path =
+        view === "preview"
+          ? `/templates/${detail ?? "standalone"}`
+          : view === "applications"
+            ? "/applications"
+            : view === "editor"
+              ? `/configurations/edit/${detail ?? "basics"}`
+              : view === "organisation"
+                ? "/organisation"
+                : view === "history"
+                  ? "/deployments/history"
+                  : view === "deployments"
+                    ? detail === "plan" || detail === "apply"
+                      ? `/deployments/${detail}`
+                      : "/deployments"
+                    : view === "credentials"
+                      ? "/credentials"
+                      : view === "repositories"
+                        ? "/configurations"
+                        : view === "workspaces"
+                          ? "/workspaces"
+                          : "/templates";
+      if (
+        window.location.pathname !== path ||
+        window.location.search ||
+        window.location.hash
+      ) {
+        if (replace) window.history.replaceState(null, "", path);
+        else window.history.pushState(null, "", path);
+        setRoute(readRoute());
+      }
+    },
+    [],
+  );
   return { ...route, navigate };
 }
diff --git a/landing-zone-configurator/app/e2e/application-access-transition.spec.ts b/landing-zone-configurator/app/e2e/application-access-transition.spec.ts
index 48744eec..7abdcc4a 100644
--- a/landing-zone-configurator/app/e2e/application-access-transition.spec.ts
+++ b/landing-zone-configurator/app/e2e/application-access-transition.spec.ts
@@ -5,6 +5,11 @@ import {
   editCommonInput,
 } from "@lzc/domain";
 import { legacyAccessTemplate } from "../tests/fixtures/application-access-transition";
+import {
+  mockEmptyApplicationLists,
+  openConfigurationStep,
+  openTemplateDrafts,
+} from "./editor-navigation";
 import type { Page } from "./fixtures";
 import { expect, test } from "./fixtures";
 
@@ -116,12 +121,14 @@ async function setup(page: Page, initial: CommonConfiguration) {
       exact: true,
     })
     .click();
-  await page
-    .getByRole("button", { name: "5 Template-Entwürfe", exact: true })
-    .click();
+  await openTemplateDrafts(page);
   return { mutations, saved: () => stored };
 }
 
+test.beforeEach(async ({ page }) => {
+  await mockEmptyApplicationLists(page);
+});
+
 test("legacy access rules require reviewed atomic replacement and cancel leaves the draft unchanged", async ({
   page,
 }) => {
@@ -286,7 +293,8 @@ for (const verified of [true, false])
     expect(state.saved().projectTemplates?.[0]?.accessProfile).toEqual(
       defaultApplicationAccessProfile("manual@example.test"),
     );
-    expect(reads.sort()).toEqual(["identity", "profiles"]);
+    // The template owner chooser and platform binding each read credential metadata.
+    expect(reads.sort()).toEqual(["identity", "profiles", "profiles"]);
   });
 
 test("late owner metadata never replaces or disables a focused manual email", async ({
@@ -366,13 +374,11 @@ test("old scoped profile responses cannot repopulate choices after the configura
   });
   await setup(page, configuration(true));
   await seen;
-  await page.getByRole("button", { name: "1 Grundlagen", exact: true }).click();
+  await openConfigurationStep(page, "Grundlagen");
   await page
     .getByLabel("STACKIT Organisations-ID", { exact: true })
     .fill(nextOrg);
-  await page
-    .getByRole("button", { name: "5 Template-Entwürfe", exact: true })
-    .click();
+  await openTemplateDrafts(page);
   const source = page.getByLabel("Quelle für den initialen Projekt-Owner", {
     exact: true,
   });
@@ -402,7 +408,7 @@ test("old scoped profile responses cannot repopulate choices after the configura
   );
   await expect(owner).toHaveValue("human@example.test");
   await expect(owner).toBeEditable();
-  expect(reads).toBe(2);
+  expect(reads).toBe(4);
 });
 
 for (const context of ["configuration", "inline templates"] as const) {
diff --git a/landing-zone-configurator/app/e2e/cloud-catalogues.spec.ts b/landing-zone-configurator/app/e2e/cloud-catalogues.spec.ts
index 78b472d0..f04c81f4 100644
--- a/landing-zone-configurator/app/e2e/cloud-catalogues.spec.ts
+++ b/landing-zone-configurator/app/e2e/cloud-catalogues.spec.ts
@@ -1,5 +1,14 @@
+import {
+  mockEmptyApplicationLists,
+  openConfigurationStep,
+  openTemplateDrafts,
+} from "./editor-navigation";
 import { expect, test } from "./fixtures";
 
+test.beforeEach(async ({ page }) => {
+  await mockEmptyApplicationLists(page);
+});
+
 for (const kind of ["personal", "organisation"]) {
   test(`automatic technical catalogues require no additional editor setup in ${kind}`, async ({
     page,
@@ -98,9 +107,7 @@ for (const kind of ["personal", "organisation"]) {
     await expect(
       page.getByPlaceholder("UUID eines vorhandenen STACKIT-Projekts"),
     ).toHaveCount(0);
-    await page
-      .getByRole("button", { name: "4 Plattform", exact: true })
-      .click();
+    await openConfigurationStep(page, "Plattform");
     await page
       .getByRole("button", { name: "Komponente hinzufügen", exact: true })
       .click();
@@ -203,12 +210,7 @@ for (const kind of ["personal", "organisation"]) {
     await page
       .getByLabel("Dienst-Leistungsklasse", { exact: true })
       .selectOption("Observability-Monitoring-Medium-EU01");
-    await page
-      .getByRole("button", {
-        name: "5 Template-Entwürfe",
-        exact: true,
-      })
-      .click();
+    await openTemplateDrafts(page);
     const template = page.locator("section.project-card").first();
     await template
       .getByText("STACKIT Observability · Fest vorgegeben", { exact: true })
@@ -272,9 +274,7 @@ for (const kind of ["personal", "organisation"]) {
         .getByRole("button", { name: "Konfigurationen", exact: true })
         .click();
 
-      await page
-        .getByRole("button", { name: "4 Plattform", exact: true })
-        .click();
+      await openConfigurationStep(page, "Plattform");
       await page
         .locator("summary")
         .filter({ hasText: /^Git-Service/ })
@@ -416,7 +416,7 @@ test("product choices preserve imported values and restore manual fields when ca
   await page
     .getByRole("button", { name: "Konfiguration erstellen", exact: true })
     .click();
-  await page.getByRole("button", { name: "4 Plattform", exact: true }).click();
+  await openConfigurationStep(page, "Plattform");
   await page
     .getByRole("button", { name: "Komponente hinzufügen", exact: true })
     .click();
@@ -633,12 +633,7 @@ test("product choices preserve imported values and restore manual fields when ca
   await monitoring
     .getByLabel("Dienst-Leistungsklasse", { exact: true })
     .selectOption("Observability-Starter-EU01");
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openTemplateDrafts(page);
   const template = page.locator("section.project-card").first();
   await template
     .getByText("STACKIT Observability · Fest vorgegeben", { exact: true })
diff --git a/landing-zone-configurator/app/e2e/common-editor.spec.ts b/landing-zone-configurator/app/e2e/common-editor.spec.ts
index a56c2d8d..eb08ffee 100644
--- a/landing-zone-configurator/app/e2e/common-editor.spec.ts
+++ b/landing-zone-configurator/app/e2e/common-editor.spec.ts
@@ -8,8 +8,17 @@ import {
   readConfigurationRecord,
   recordValues,
 } from "@lzc/domain";
+import {
+  mockEmptyApplicationLists,
+  openConfigurationStep,
+  openTemplateDrafts,
+} from "./editor-navigation";
 import { expect, test } from "./fixtures";
 
+test.beforeEach(async ({ page }) => {
+  await mockEmptyApplicationLists(page);
+});
+
 test.beforeEach(async ({ page }) => {
   await page.route("**/auth/status", (route) =>
     route.fulfill({ json: { github: false } }),
@@ -19,6 +28,38 @@ test.beforeEach(async ({ page }) => {
   );
 });
 
+test("old template-step links open the single local template editor without trapping browser history", async ({
+  page,
+}) => {
+  await page.goto("/templates/standalone");
+  await page
+    .getByRole("button", { name: "Konfiguration erstellen", exact: true })
+    .click();
+  await page
+    .getByLabel("Name der Konfiguration")
+    .fill("Unsaved platform draft");
+  await page.evaluate(() => {
+    history.pushState(null, "", "/configurations/edit/projects");
+    dispatchEvent(new PopStateEvent("popstate"));
+  });
+  await expect(page).toHaveURL(/\/applications$/);
+  await expect(page.locator(".template-overview")).toBeVisible();
+  await page.getByLabel("Name des Templates").first().fill("Unsaved template");
+  await page.goBack();
+  await expect(page).toHaveURL(/\/configurations\/edit\/basics$/);
+  await expect(page.getByLabel("Name der Konfiguration")).toHaveValue(
+    "Unsaved platform draft",
+  );
+  await expect(
+    page.getByRole("button", { name: "5 Template-Entwürfe", exact: true }),
+  ).toHaveCount(0);
+  await page.goForward();
+  await expect(page).toHaveURL(/\/applications$/);
+  await expect(page.getByLabel("Name des Templates").first()).toHaveValue(
+    "Unsaved template",
+  );
+});
+
 test("platform editor defines project templates without concrete application projects", async ({
   page,
 }, testInfo) => {
@@ -31,12 +72,25 @@ test("platform editor defines project templates without concrete application pro
   await page
     .getByLabel("Name der Konfiguration")
     .fill("Plattform mit Templates");
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  const steps = page.getByRole("navigation", {
+    name: "Konfigurationsschritte",
+    exact: true,
+  });
+  await expect(steps.getByRole("button")).toHaveText([
+    "1Grundlagen",
+    "2Ordner",
+    "3Netzwerk",
+    "4Plattform",
+    "5Betrieb",
+    "6Prüfen",
+  ]);
+  await expect(page.locator("section.project-card")).toHaveCount(0);
+  await openConfigurationStep(page, "Plattform");
+  await page.getByRole("button", { name: "Weiter →", exact: true }).click();
+  await expect(page).toHaveURL(/\/configurations\/edit\/operations$/);
+  await page.getByRole("button", { name: "Zurück", exact: true }).click();
+  await expect(page).toHaveURL(/\/configurations\/edit\/platform$/);
+  await openTemplateDrafts(page);
   const corporate = page
     .locator("section.project-card")
     .filter({ hasText: /Entwurf · Corporate/ })
@@ -61,13 +115,8 @@ test("platform editor defines project templates without concrete application pro
   await corporate
     .getByLabel("Fester Wert: STACKIT Observability", { exact: true })
     .selectOption("true");
-  await page.getByRole("button", { name: "3 Netzwerk", exact: true }).click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openConfigurationStep(page, "Netzwerk");
+  await openTemplateDrafts(page);
   await expect(
     corporate.getByLabel("Fester Wert: STACKIT Secrets Manager", {
       exact: true,
@@ -105,6 +154,7 @@ test("platform editor defines project templates without concrete application pro
   await expect(
     details.getByRole("heading", { name: "Neue Sandbox-Vorlage", exact: true }),
   ).toBeVisible();
+  await openConfigurationStep(page, "Netzwerk");
   await expect(
     page.getByRole("region", {
       name: "Application Landing Zone Template-Entwürfe",
@@ -114,9 +164,9 @@ test("platform editor defines project templates without concrete application pro
   await expect(
     page.locator(".topology").first().locator(".tree-children").first(),
   ).not.toContainText("External API Gateway");
-  await page.getByRole("button", { name: "3 Netzwerk", exact: true }).click();
   await page.goBack();
-  await expect(page).toHaveURL(/\/projects$/);
+  await page.goBack();
+  await expect(page).toHaveURL(/\/applications$/);
   await page.screenshot({
     path: testInfo.outputPath("project-templates.png"),
     fullPage: true,
@@ -419,9 +469,7 @@ test("shared configuration saves, reopens and restores in the account workspace"
   await page
     .getByLabel("Name der Konfiguration")
     .fill("Gemeinsamer Fork-Entwurf");
-  await page
-    .getByRole("button", { name: "5 Projekte (Bestand)", exact: true })
-    .click();
+  await openConfigurationStep(page, "Projekte (Bestand)");
   await page
     .getByRole("button", { name: "Komponente hinzufügen", exact: true })
     .click();
@@ -437,7 +485,7 @@ test("shared configuration saves, reopens and restores in the account workspace"
       exact: true,
     })
     .click();
-  await page.getByRole("button", { name: "7 Prüfen", exact: true }).click();
+  await openConfigurationStep(page, "Prüfen");
   await expect(
     page.getByRole("button", { name: "tfvars herunterladen", exact: true }),
   ).toBeEnabled();
@@ -457,10 +505,10 @@ test("shared configuration saves, reopens and restores in the account workspace"
   await page
     .getByRole("button", { name: "Entwurf bearbeiten", exact: true })
     .click();
-  await page.getByRole("button", { name: "3 Netzwerk", exact: true }).click();
+  await openConfigurationStep(page, "Netzwerk");
   await page.goto("/configurations/edit/network");
   await expect(page).toHaveURL(/\/configurations\/edit\/network$/);
-  await page.getByRole("button", { name: "1 Grundlagen", exact: true }).click();
+  await openConfigurationStep(page, "Grundlagen");
   await expect(page.getByLabel("Name der Konfiguration")).toHaveValue(
     "Gemeinsamer Fork-Entwurf",
   );
@@ -479,9 +527,7 @@ test("shared configuration saves, reopens and restores in the account workspace"
   await page
     .getByRole("button", { name: "Entwurf bearbeiten", exact: true })
     .click();
-  await page
-    .getByRole("button", { name: "5 Projekte (Bestand)", exact: true })
-    .click();
+  await openConfigurationStep(page, "Projekte (Bestand)");
   page.once("dialog", (dialog) => dialog.accept());
   await page
     .getByRole("button", {
@@ -489,12 +535,8 @@ test("shared configuration saves, reopens and restores in the account workspace"
       exact: true,
     })
     .click();
-  await expect(
-    page.getByRole("heading", {
-      name: "Template-Entwürfe",
-      exact: true,
-    }),
-  ).toBeVisible();
+  await expect(page).toHaveURL(/\/applications$/);
+  await expect(page.locator(".template-overview")).toBeVisible();
   await expect(page.getByLabel("Projektname", { exact: true })).toHaveCount(0);
   await page.getByLabel("Name des Templates").first().fill("Team-Anwendungen");
   const firstTemplate = page.locator("section.project-card").first();
@@ -507,7 +549,7 @@ test("shared configuration saves, reopens and restores in the account workspace"
   await firstTemplate
     .getByLabel("Vorauswahl: Umgebung / Stage")
     .selectOption("prod");
-  await page.getByRole("button", { name: "7 Prüfen", exact: true }).click();
+  await openConfigurationStep(page, "Prüfen");
   await page
     .getByRole("button", { name: "Konfiguration speichern →", exact: true })
     .click();
@@ -526,12 +568,7 @@ test("shared configuration saves, reopens and restores in the account workspace"
   await page
     .getByRole("button", { name: "Entwurf bearbeiten", exact: true })
     .click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openTemplateDrafts(page);
   await expect(page.getByLabel("Name des Templates").first()).toHaveValue(
     "Team-Anwendungen",
   );
@@ -557,12 +594,7 @@ test("Standalone starts Public and offers regional choices and explicit platform
     "SELECT",
   );
   await page.getByLabel("Region", { exact: true }).selectOption("eu02");
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openTemplateDrafts(page);
   await expect(page.locator("section.project-card").first()).toContainText(
     "Entwurf · Public",
   );
@@ -572,7 +604,7 @@ test("Standalone starts Public and offers regional choices and explicit platform
       { exact: false },
     ),
   ).toHaveCount(0);
-  await page.getByRole("button", { name: "4 Plattform", exact: true }).click();
+  await openConfigurationStep(page, "Plattform");
   await expect(
     page.getByText("Observability stellt zentrales Monitoring bereit.", {
       exact: false,
@@ -624,7 +656,7 @@ test("Standalone starts Public and offers regional choices and explicit platform
   await expect(
     kubernetes.getByRole("button", { name: "Deaktivieren", exact: true }),
   ).toBeDisabled();
-  await page.getByRole("button", { name: "3 Netzwerk", exact: true }).click();
+  await openConfigurationStep(page, "Netzwerk");
   const regions = page.getByLabel("Weitere Connectivity-Region", {
     exact: true,
   });
@@ -646,7 +678,7 @@ test("regional Connectivity offers a guided VPN draft with both tunnels and miss
   await page
     .getByRole("button", { name: "Konfiguration erstellen", exact: true })
     .click();
-  await page.getByRole("button", { name: "3 Netzwerk", exact: true }).click();
+  await openConfigurationStep(page, "Netzwerk");
   await page
     .getByLabel("Weitere Connectivity-Region", { exact: true })
     .selectOption("eu01");
diff --git a/landing-zone-configurator/app/e2e/configurator.spec.ts b/landing-zone-configurator/app/e2e/configurator.spec.ts
index 1192d91a..11ba32dd 100644
--- a/landing-zone-configurator/app/e2e/configurator.spec.ts
+++ b/landing-zone-configurator/app/e2e/configurator.spec.ts
@@ -31,6 +31,11 @@ import {
   assistantScenarioFixture,
   assistantScenarios,
 } from "../scripts/assistant-scenarios.js";
+import {
+  mockEmptyApplicationLists,
+  openConfigurationStep,
+  openTemplateDrafts,
+} from "./editor-navigation";
 import { expect, type Page, test } from "./fixtures";
 
 // Storage workflows use the editor breadcrumb; the primary navigation now resumes editing.
@@ -91,6 +96,10 @@ async function holdAssistantCompletion(page: Page, path: string) {
   }, path);
 }
 
+test.beforeEach(async ({ page }) => {
+  await mockEmptyApplicationLists(page);
+});
+
 test("DNS collection removals are explicit and can be excluded from local acceptance", async ({
   page,
 }) => {
@@ -1223,9 +1232,7 @@ test("template overview and structure share selection, edits and network referen
       exact: true,
     })
     .click();
-  await page
-    .getByRole("button", { name: "5 Template-Entwürfe", exact: true })
-    .click();
+  await openTemplateDrafts(page);
   const overview = page.getByRole("region", {
     name: "Template-Übersicht",
     exact: true,
@@ -2968,7 +2975,7 @@ test("edit, validate and download an isolated standalone copy", async ({
     .getByRole("button", { name: "Template ansehen : Standalone", exact: true })
     .click();
   await restoreLegacy(page);
-  await page.getByRole("button", { name: "4 Prüfen", exact: true }).click();
+  await openConfigurationStep(page, "Prüfen");
   await expect(page.getByRole("alert")).toContainText("Angaben bitte prüfen");
   await page.getByRole("button", { name: /Organisations-ID: Bitte/ }).click();
   await expect(page.getByLabel("STACKIT Organisations-ID")).toBeFocused();
@@ -3187,14 +3194,9 @@ test("URLs and browser back/forward preserve an in-progress draft", async ({
     .click();
   await expect(page).toHaveURL(/\/configurations\/edit\/basics$/);
   await page.getByLabel("Name der Konfiguration").fill("Entwurf mit History");
-  await page.getByRole("button", { name: "2 Ordner", exact: true }).click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
-  await expect(page).toHaveURL(/\/configurations\/edit\/projects$/);
+  await openConfigurationStep(page, "Ordner");
+  await openConfigurationStep(page, "Plattform");
+  await expect(page).toHaveURL(/\/configurations\/edit\/platform$/);
   await page.goBack();
   await expect(page).toHaveURL(/\/configurations\/edit\/folders$/);
   await page.goBack();
@@ -3207,14 +3209,14 @@ test("URLs and browser back/forward preserve an in-progress draft", async ({
   await page.goForward();
   await expect(
     page.getByRole("heading", {
-      name: "Template-Entwürfe",
+      name: "Plattform",
       exact: true,
     }),
   ).toBeVisible();
   await openConfigurationStorage(page);
   await expect(page).toHaveURL(/\/configurations$/);
   await page.goBack();
-  await expect(page).toHaveURL(/\/configurations\/edit\/projects$/);
+  await expect(page).toHaveURL(/\/configurations\/edit\/platform$/);
   await page.goBack();
   await page.goBack();
   await expect(page.getByLabel("Name der Konfiguration")).toHaveValue(
@@ -3338,11 +3340,11 @@ test("select a fork, reopen a config and resolve a save conflict as a new copy",
     .click();
   await expect(page).toHaveURL(/\/configurations\/edit\/basics$/);
   await page.getByLabel("Name der Konfiguration").fill("Meine neue Kopie");
-  await page.getByRole("button", { name: "2 Ordner", exact: true }).click();
+  await openConfigurationStep(page, "Ordner");
   await page
     .getByRole("textbox", { name: "Platform", exact: true })
     .fill("Plattform aus Fork");
-  await page.getByRole("button", { name: "1 Grundlagen", exact: true }).click();
+  await openConfigurationStep(page, "Grundlagen");
   // Fresh entry restores unsaved edits, the selected fork and the original base revision.
   head = "b".repeat(40);
   await page.goto("/configurations/edit/basics");
diff --git a/landing-zone-configurator/app/e2e/editor-navigation.ts b/landing-zone-configurator/app/e2e/editor-navigation.ts
new file mode 100644
index 00000000..6baf2d5a
--- /dev/null
+++ b/landing-zone-configurator/app/e2e/editor-navigation.ts
@@ -0,0 +1,40 @@
+import { expect, type Page } from "./fixtures";
+
+export async function openTemplateDrafts(page: Page) {
+  await page
+    .getByRole("navigation", { name: "Hauptnavigation", exact: true })
+    .getByRole("button", { name: "Application Landing Zones", exact: true })
+    .click();
+  const tab = page.getByRole("tab", { name: "Template-Entwürfe", exact: true });
+  if (await tab.count()) await tab.click();
+  await expect(page.locator(".template-overview")).toBeVisible();
+}
+
+export async function openConfigurationStep(page: Page, title: string) {
+  if (
+    !(await page
+      .getByRole("navigation", { name: "Konfigurationsschritte", exact: true })
+      .isVisible())
+  )
+    await page
+      .getByRole("navigation", { name: "Hauptnavigation", exact: true })
+      .getByRole("button", { name: "Konfigurationen", exact: true })
+      .click();
+  await page
+    .getByRole("navigation", { name: "Konfigurationsschritte", exact: true })
+    .getByRole("button")
+    .filter({ hasText: title })
+    .click();
+}
+
+export async function mockEmptyApplicationLists(page: Page) {
+  for (const [path, body] of Object.entries({
+    templates: { versions: [] },
+    instances: { instances: [] },
+    "platform-contracts": { contracts: [] },
+  }))
+    await page.route(`**/api/v1/applications/${path}`, (route) => {
+      expect(route.request().method()).toBe("GET");
+      return route.fulfill({ json: body });
+    });
+}
diff --git a/landing-zone-configurator/app/e2e/federation.spec.ts b/landing-zone-configurator/app/e2e/federation.spec.ts
index 58d82ce1..ec1fa6d8 100644
--- a/landing-zone-configurator/app/e2e/federation.spec.ts
+++ b/landing-zone-configurator/app/e2e/federation.spec.ts
@@ -1,5 +1,13 @@
+import {
+  mockEmptyApplicationLists,
+  openConfigurationStep,
+} from "./editor-navigation";
 import { expect, test } from "./fixtures";
 
+test.beforeEach(async ({ page }) => {
+  await mockEmptyApplicationLists(page);
+});
+
 test("CI federation stays optional and creates exact GitHub trust conditions", async ({
   page,
 }, testInfo) => {
@@ -13,7 +21,7 @@ test("CI federation stays optional and creates exact GitHub trust conditions", a
   await page
     .getByRole("button", { name: "Konfiguration erstellen", exact: true })
     .click();
-  await page.getByRole("button", { name: "6 Betrieb", exact: true }).click();
+  await openConfigurationStep(page, "Betrieb");
   await expect(
     page.getByRole("region", {
       name: "Service-Account-Föderation",
@@ -73,8 +81,8 @@ test("CI federation stays optional and creates exact GitHub trust conditions", a
     path: testInfo.outputPath("federation.png"),
     fullPage: true,
   });
-  await page.getByRole("button", { name: "1 Grundlagen", exact: true }).click();
-  await page.getByRole("button", { name: "6 Betrieb", exact: true }).click();
+  await openConfigurationStep(page, "Grundlagen");
+  await openConfigurationStep(page, "Betrieb");
   await expect(rule.getByLabel("Erwarteter Wert").nth(1)).toHaveValue(
     "repo:example/platform:ref:refs/heads/main",
   );
diff --git a/landing-zone-configurator/app/e2e/organisation.spec.ts b/landing-zone-configurator/app/e2e/organisation.spec.ts
index c4473467..1f9d9652 100644
--- a/landing-zone-configurator/app/e2e/organisation.spec.ts
+++ b/landing-zone-configurator/app/e2e/organisation.spec.ts
@@ -2,12 +2,20 @@ import {
   createEditorConfiguration,
   publishedProjectTemplateSchema,
 } from "@lzc/domain";
+import {
+  mockEmptyApplicationLists,
+  openTemplateDrafts,
+} from "./editor-navigation";
 import { expect, test } from "./fixtures";
 
 const userId = "11111111-1111-4111-8111-111111111111";
 const tenantId = "22222222-2222-4222-8222-222222222222";
 const organisationId = "33333333-3333-4333-8333-333333333333";
 
+test.beforeEach(async ({ page }) => {
+  await mockEmptyApplicationLists(page);
+});
+
 for (const scenario of [
   "state-recovery-owner",
   "state-recovery-prepared",
@@ -3133,12 +3141,7 @@ for (const { publishing, applied, renewProof, executing } of [
       await page
         .getByRole("button", { name: "Konfiguration erstellen", exact: true })
         .click();
-      await page
-        .getByRole("button", {
-          name: "5 Template-Entwürfe",
-          exact: true,
-        })
-        .click();
+      await openTemplateDrafts(page);
       const editor = page.locator("section.project-card").first();
       await editor.getByLabel(/Lokales/).check();
       await editor
@@ -3295,12 +3298,7 @@ for (const { publishing, applied, renewProof, executing } of [
         .getByRole("button", { name: "Konfigurationen", exact: true })
         .click();
 
-      await page
-        .getByRole("button", {
-          name: "5 Template-Entwürfe",
-          exact: true,
-        })
-        .click();
+      await openTemplateDrafts(page);
       await editor
         .getByLabel("Netzgröße (IPv4-Präfixlänge)", { exact: true })
         .fill("26");
diff --git a/landing-zone-configurator/app/e2e/template-parameters.spec.ts b/landing-zone-configurator/app/e2e/template-parameters.spec.ts
index b2cb1a54..65f4c3a3 100644
--- a/landing-zone-configurator/app/e2e/template-parameters.spec.ts
+++ b/landing-zone-configurator/app/e2e/template-parameters.spec.ts
@@ -1,5 +1,14 @@
+import {
+  mockEmptyApplicationLists,
+  openConfigurationStep,
+  openTemplateDrafts,
+} from "./editor-navigation";
 import { expect, test } from "./fixtures";
 
+test.beforeEach(async ({ page }) => {
+  await mockEmptyApplicationLists(page);
+});
+
 test("new templates separate cloud project access from requester identity and retain the explicit owner option", async ({
   page,
 }) => {
@@ -7,9 +16,7 @@ test("new templates separate cloud project access from requester identity and re
   await page
     .getByRole("button", { name: "Konfiguration erstellen", exact: true })
     .click();
-  await page
-    .getByRole("button", { name: "5 Template-Entwürfe", exact: true })
-    .click();
+  await openTemplateDrafts(page);
   await page
     .getByLabel("Template-Kennung", { exact: true })
     .fill("access-test");
@@ -131,12 +138,7 @@ test("MVP Observability has no ACL editor or required order input", async ({
   await page
     .getByRole("button", { name: "Konfiguration erstellen", exact: true })
     .click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openTemplateDrafts(page);
   const template = page.locator("section.project-card").first();
   await template
     .getByText("STACKIT Observability · Fest vorgegeben", { exact: true })
@@ -178,12 +180,7 @@ test("disabled Observability hides dependent details without discarding their va
   await page
     .getByRole("button", { name: "Konfiguration erstellen", exact: true })
     .click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openTemplateDrafts(page);
   const template = page.locator("section.project-card").first();
   const planSection = template.getByText(
     "Observability-Leistungsklasse · Fest vorgegeben",
@@ -244,12 +241,7 @@ test("a public template retains its local VM network independently of SNA", asyn
   await page
     .getByRole("button", { name: "Konfiguration erstellen", exact: true })
     .click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openTemplateDrafts(page);
   const template = page.locator("section.project-card").first();
   const enabled = template.getByLabel("Lokales Projektnetz anlegen", {
     exact: true,
@@ -265,13 +257,8 @@ test("a public template retains its local VM network independently of SNA", asyn
   await expect(template.getByLabel("STACKIT Network Area (SNA)")).toHaveCount(
     0,
   );
-  await page.getByRole("button", { name: "1 Grundlagen", exact: true }).click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openConfigurationStep(page, "Grundlagen");
+  await openTemplateDrafts(page);
   await expect(enabled).toBeChecked();
   await expect(prefix).toHaveValue("24");
   await expect(template).toContainText("Entwurf · Public");
@@ -312,12 +299,7 @@ test("platform engineer controls stage inputs and can test an order without prov
   await page
     .getByRole("button", { name: "Konfiguration erstellen", exact: true })
     .click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openTemplateDrafts(page);
   const template = page.locator("section.project-card").first();
   await template
     .getByText("Umgebung / Stage · Bei Bestellung auswählbar", { exact: true })
@@ -368,13 +350,8 @@ test("platform engineer controls stage inputs and can test an order without prov
   await template
     .getByLabel("Vorauswahl: Umgebung / Stage")
     .selectOption("prod");
-  await page.getByRole("button", { name: "1 Grundlagen", exact: true }).click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openConfigurationStep(page, "Grundlagen");
+  await openTemplateDrafts(page);
   await template
     .getByText("Umgebung / Stage · Bei Bestellung auswählbar", { exact: true })
     .click();
@@ -403,12 +380,7 @@ test("corporate Observability does not require an ACL network relationship", asy
   await page
     .getByRole("button", { name: "Konfiguration erstellen", exact: true })
     .click();
-  await page
-    .getByRole("button", {
-      name: "5 Template-Entwürfe",
-      exact: true,
-    })
-    .click();
+  await openTemplateDrafts(page);
   const template = page
     .locator("section.project-card")
     .filter({ hasText: /Entwurf · Corporate/ })
diff --git a/landing-zone-configurator/docs/common-editor.de.md b/landing-zone-configurator/docs/common-editor.de.md
index 8eacc4c1..8a9f0955 100644
--- a/landing-zone-configurator/docs/common-editor.de.md
+++ b/landing-zone-configurator/docs/common-editor.de.md
@@ -21,11 +21,13 @@ der App ab; es verlängert aber auch keine Cloud-Berechtigung. Ohne App-Sitzung
 bleibt **Mit STACKIT anmelden** die eigentliche Anmeldung.
 
 1. Eine beliebige Vorlage öffnen und **Konfiguration erstellen** wählen.
-2. **Grundlagen → Ordner → Netzwerk → Plattform → Projekte → Betrieb → Prüfen**.
+2. **Grundlagen → Ordner → Netzwerk → Plattform → Betrieb → Prüfen**.
+   Vorlagen werden ausschließlich unter **Application Landing Zones → Template-Entwürfe** bearbeitet; sie bleiben Teil derselben gespeicherten Konfiguration.
 3. Einstellungen nur bei Bedarf aufklappen. **Accelerator-Standard verwenden** entfernt die
    eigene Einstellung und nutzt den Engine-Standard, nicht den Vorlagenwert. Der Export enthält weiterhin nur explizite Angaben;
    angezeigte Standardwerte werden nicht beim bloßen Öffnen materialisiert.
-4. In **Projekte** Public, Corporate oder Sandbox hinzufügen. Public/Corporate
+4. Unter **Application Landing Zones → Template-Entwürfe** Public, Corporate oder Sandbox hinzufügen.
+   Bestehende Gesamtkonfigurationen behalten die Verwaltung konkreter Projekte unter **Projekte (Bestand)**. Public/Corporate
    können nach Bestätigung gewechselt werden. Der Zielordner wird angezeigt.
    Corporate benötigt eine passende Region und einen vorhandenen Bereich.
    Sandboxes haben einen eigenen Accelerator-Vertrag; ein Wechsel zu einer
diff --git a/landing-zone-configurator/docs/common-editor.md b/landing-zone-configurator/docs/common-editor.md
index d07491c5..64643c3a 100644
--- a/landing-zone-configurator/docs/common-editor.md
+++ b/landing-zone-configurator/docs/common-editor.md
@@ -19,11 +19,14 @@ it also does not extend any cloud permission. Without an app session,
 **Sign in with STACKIT** remains the actual login.
 
 1. Open any template and choose **Create configuration**.
-2. **Foundations → Folders → Network → Platform → Projects → Operations → Review**.
+2. **Foundations → Folders → Network → Platform → Operations → Review**.
+   Edit templates exclusively under **Application Landing Zones → Template drafts**;
+   they remain part of the same saved configuration.
 3. Expand settings only when needed. **Use Accelerator default** removes the
    custom setting and uses the engine default, not the template value. Export still contains only explicit inputs;
    displayed defaults are not materialized merely on opening.
-4. Under **Projects**, add Public, Corporate or Sandbox. Public/Corporate
+4. Under **Application Landing Zones → Template drafts**, add Public, Corporate or Sandbox.
+   Existing combined configurations retain concrete project management under **Projects (existing)**. Public/Corporate
    can be switched after confirmation. The target folder is shown.
    Corporate needs a matching region and an existing area.
    Sandboxes have their own Accelerator contract; switching to a
diff --git a/landing-zone-configurator/docs/development.de.md b/landing-zone-configurator/docs/development.de.md
index c34c5425..1a8b3a9b 100644
--- a/landing-zone-configurator/docs/development.de.md
+++ b/landing-zone-configurator/docs/development.de.md
@@ -81,3 +81,5 @@ sie ersetzen nicht die Qualifikation des geschützten Release-Workflows.
 ## Gemeinsamer Template-Entwurf und geführter Ablauf
 
 Der Konfigurationseditor und der erste Reiter von Application Landing Zones verwenden denselben kontrollierten Root-Entwurf, dieselbe Konfigurationsbindung und denselben gespeicherten Vergleichsstand. Beim Wechsel zwischen diesen Ansichten darf kein separater Entwurf oder implizites Speichern entstehen. Die Zuordnung einer Vorbereitung muss die gespeicherte Konfigurationsbindung verwenden, niemals die dokumentlokale `draft.id`: Beim Speichern und Kopieren entsteht eine separate Datenbank-ID, ohne das Dokument umzuschreiben. Diese Bindung muss durch beide Editorpfade weitergegeben werden; Testdaten verwenden unterschiedliche IDs. Die Plattformanbindung enthält Ausführungs- und Backend-Einrichtung vor der Veröffentlichung. Die Bearbeitung gehört zu Konfigurationen; Deployment-Phasen bleiben getrennte ausdrückliche Aktionen. Der Katalog-Provider muss an Arbeitsbereich und Plattformberechtigung gebunden bleiben, damit ein Rollenverlust private Katalogdaten entfernt, obwohl die Application-Ansicht zugänglich bleibt. Der Browsertest für den Platform-Owner-Ablauf prüft Speichern, Neuladen und Schrittfolge; sein Application-Owner-Fall prüft zusätzlich, dass keine privaten Konfigurationen gelesen werden.
+
+Template-Entwürfe werden ausschließlich im ersten Reiter unter Application Landing Zones bearbeitet. Sie bleiben Teil desselben kontrollierten Konfigurationsentwurfs mit identischer Speicherbindung. Der Konfigurationseditor blendet den Projektschritt für Plattformentwürfe aus; konkrete Bestandsprojekte bleiben bearbeitbar. Alte Links auf den Template-Schritt öffnen die Application Landing Zones. Gäste können dort lokale Entwürfe bearbeiten, aber nicht veröffentlichen oder bestellen.
diff --git a/landing-zone-configurator/docs/development.md b/landing-zone-configurator/docs/development.md
index b3d3f87b..e38f0a40 100644
--- a/landing-zone-configurator/docs/development.md
+++ b/landing-zone-configurator/docs/development.md
@@ -38,8 +38,11 @@ the draft and scoped catalogue provider; never retain private catalogues across
 those boundaries.
 
 Application template drafts use the same controlled root draft, configuration binding
-and saved snapshot in the configuration editor and the first Application Landing
-Zones tab. Do not introduce a separate draft or implicit save when navigating
+and saved snapshot across configuration editing and the first Application Landing
+Zones tab. Template editing belongs exclusively to that tab; the configuration
+step list omits projects for platform drafts, while legacy concrete-project editing
+remains available. Old platform draft project-step routes redirect to Applications.
+Guest users may edit their local templates there without publication or ordering. Do not introduce a separate draft or implicit save when navigating
 between these views. Preparation provenance must use the persisted configuration
 binding ID, never the document-local `draft.id`: saves and copies assign a
 separate database ID without rewriting the document. Pass that binding through
diff --git a/landing-zone-configurator/docs/project-template-drafts.de.md b/landing-zone-configurator/docs/project-template-drafts.de.md
index 6644b4be..009d0040 100644
--- a/landing-zone-configurator/docs/project-template-drafts.de.md
+++ b/landing-zone-configurator/docs/project-template-drafts.de.md
@@ -108,11 +108,13 @@ veröffentlicht keine Version und erteilt keine Ausführungsfreigabe. Applicatio
 sehen diesen Konfigurations-Chat nicht und erhalten keinen Zugriff auf Plattformdaten.
 
 Der Platform Engineer definiert zentrale Plattformdienste und die dafür nötigen
-Infrastrukturprojekte. Im Schritt **Projekt-Templates** erstellt er Vorlagen für
+Infrastrukturprojekte. Unter **Application Landing Zones → Template-Entwürfe** erstellt er Vorlagen für
 spätere Anwendungsprojekte. Die Plattformkonfiguration erzeugt diese Projekte
 nicht selbst. Der Application Owner bestellt später eine Instanz einer
 veröffentlichten Template-Version im separaten Application-Self-Service.
 
+Der Konfigurationseditor enthält keinen separaten Template-Schritt mehr. Template-Entwürfe bleiben Teil der gespeicherten Konfiguration; der Wechsel zwischen beiden Ansichten speichert keine Änderungen automatisch. Bestehende Gesamtkonfigurationen behalten den Schritt **Projekte (Bestand)**. Alte Links auf den Template-Schritt öffnen die Application Landing Zones. Ohne Anmeldung können lokale Template-Entwürfe weiterhin bearbeitet werden; Veröffentlichung und Bestellung erfordern eine Anmeldung.
+
 Neue Entwürfe aus allen acht Accelerator-Vorlagen nutzen diesen Ablauf.
 `landing_zones`, `sandboxes` und `landing_zone_namespace_services` aus den
 Beispielen werden zu Template-Entwürfen. Plattform, Connectivity, Governance,
diff --git a/landing-zone-configurator/docs/project-template-drafts.md b/landing-zone-configurator/docs/project-template-drafts.md
index 78ef7c3a..19357651 100644
--- a/landing-zone-configurator/docs/project-template-drafts.md
+++ b/landing-zone-configurator/docs/project-template-drafts.md
@@ -48,7 +48,9 @@ Acceptance changes the local draft; save explicitly before platform binding or
 publication. It does not publish a version or authorize execution. Application Owners
 do not see this configuration chat or gain access to platform configuration data.
 
-The Platform Engineer defines central platform services and the infrastructure projects required for them. In the **Project templates** step, they create templates for future application projects. Platform configuration does not create those projects itself. The Application Owner later orders an instance of a published template version in separate Application self-service.
+The Platform Engineer defines central platform services and the infrastructure projects required for them. Under **Application Landing Zones → Template drafts**, they create templates for future application projects. Platform configuration does not create those projects itself. The Application Owner later orders an instance of a published template version in separate Application self-service.
+
+The configuration editor no longer contains a separate template step. Template drafts remain part of the saved configuration; switching views does not save changes automatically. Existing combined configurations retain the **Projects (existing)** step. Old links to the template step open Application Landing Zones. Local template drafts can still be edited without signing in; publication and ordering require authentication.
 
 New drafts from all eight Accelerator templates use this workflow. `landing_zones`, `sandboxes` and `landing_zone_namespace_services` from the examples become template drafts. Platform, connectivity, governance, central services and their projects remain part of platform configuration. The preview shows platform resources and template drafts separately.
 

From 34be82616be5997ea21cdef76f5a665c8c558942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Weberru=C3=9F?= <lukas@klue.de>
Date: Tue, 27 Oct 2026 09:37:08 +0000
Subject: [PATCH 2/2] fix(configurator): scope catalogue controls to template
 editing

---
 .../app/apps/web/src/components/Applications.tsx       |  5 +++++
 landing-zone-configurator/app/apps/web/src/main.tsx    | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/landing-zone-configurator/app/apps/web/src/components/Applications.tsx b/landing-zone-configurator/app/apps/web/src/components/Applications.tsx
index 6ecb8e05..b749a8a0 100644
--- a/landing-zone-configurator/app/apps/web/src/components/Applications.tsx
+++ b/landing-zone-configurator/app/apps/web/src/components/Applications.tsx
@@ -2097,6 +2097,7 @@ export function Applications({
   configurationDirty = false,
   configurationSaved = false,
   onEditTemplates,
+  onTemplateEditingChange,
 }: {
   session: Session | null;
   draft: CommonConfiguration | null;
@@ -2105,6 +2106,7 @@ export function Applications({
   configurationDirty?: boolean;
   configurationSaved?: boolean;
   onEditTemplates?: () => void;
+  onTemplateEditingChange?: (editing: boolean) => void;
 }) {
   const [versions, setVersions] = useState<PublishedProjectTemplate[]>([]);
   const [instances, setInstances] = useState<ApplicationInstance[]>([]);
@@ -2163,6 +2165,9 @@ export function Applications({
   >([]);
   const [platformRevision, setPlatformRevision] = useState("");
   const [activeTab, setActiveTab] = useState<string | null>(null);
+  useEffect(() => {
+    onTemplateEditingChange?.(activeTab === null || activeTab === "drafts");
+  }, [activeTab, onTemplateEditingChange]);
   const [appliedPlatformsEnabled, setAppliedPlatformsEnabled] = useState(false);
   const [appliedPlatforms, setAppliedPlatforms] = useState<
     z.infer<typeof appliedPlatformsSchema>["platforms"]
diff --git a/landing-zone-configurator/app/apps/web/src/main.tsx b/landing-zone-configurator/app/apps/web/src/main.tsx
index 5e4407e6..57267dd1 100644
--- a/landing-zone-configurator/app/apps/web/src/main.tsx
+++ b/landing-zone-configurator/app/apps/web/src/main.tsx
@@ -148,6 +148,8 @@ function App() {
   const [session, setSession] = useState<Session | null>(null);
   const [returningFromLogin, setReturningFromLogin] = useState(false);
   const [credentialRevision, setCredentialRevision] = useState(0);
+  const [applicationTemplateEditing, setApplicationTemplateEditing] =
+    useState(true);
   const organisationWorkspace = session?.tenant?.kind === "organisation";
   const platformAccess =
     !organisationWorkspace ||
@@ -837,6 +839,7 @@ function App() {
                 configurationDirty={draftDirty}
                 configurationSaved={!!configurationBinding && !draftDirty}
                 onEditTemplates={() => setView("editor", "projects")}
+                onTemplateEditingChange={setApplicationTemplateEditing}
                 templateEditor={
                   platformAccess &&
                   draft &&
@@ -874,7 +877,12 @@ function App() {
             )}
             {platformAccess && (
               <>
-                <div hidden={view !== "editor" && view !== "applications"}>
+                <div
+                  hidden={
+                    view !== "editor" &&
+                    !(view === "applications" && applicationTemplateEditing)
+                  }
+                >
                   <CloudCataloguePanel
                     session={session}
                     key={credentialRevision}