diff --git a/pnpm-monorepo/apps/app/src/app/api/classification-level/[id]/route.ts b/pnpm-monorepo/apps/app/src/app/api/classification-level/[id]/route.ts
deleted file mode 100644
index b44b3055d..000000000
--- a/pnpm-monorepo/apps/app/src/app/api/classification-level/[id]/route.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { prisma } from "@/db";
-import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
-import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
-import { requireAuthenticationApi } from "@/modules/auth/server";
-import apiErrorHandler from "@/modules/common/utils/apiErrorHandler";
-import { NextResponse } from "next/server";
-import { z } from "zod";
-
-type Params = Promise<{
-  id: string;
-}>;
-
-const paramsSchema = z.object({ id: z.cuid() });
-
-const patchBodySchema = z.object({
-  name: z.string().trim().min(1).max(255),
-});
-
-export async function PATCH(request: Request, props: { params: Params }) {
-  try {
-    /**
-     * Authenticate and authorize the request
-     */
-    const authentication = await requireAuthenticationApi(
-      "/api/classification-level/[id]",
-      "PATCH",
-    );
-    await authentication.authorizeApi("classificationLevel", "manage");
-
-    /**
-     * Validate the request params and body
-     */
-    const paramsData = paramsSchema.parse(await props.params);
-    const body: unknown = await request.json();
-    const data = patchBodySchema.parse(body);
-
-    /**
-     * Do the thing
-     */
-    const existingItem = await prisma.classificationLevel.findUnique({
-      where: {
-        id: paramsData.id,
-      },
-      select: {
-        name: true,
-      },
-    });
-    if (!existingItem) throw new Error("Not found");
-
-    const item = await prisma.classificationLevel.update({
-      where: {
-        id: paramsData.id,
-      },
-      data,
-    });
-
-    await createAuditEvents([
-      {
-        type: AuditEventType.CLASSIFICATION_LEVEL_UPDATED,
-        data: {
-          classificationLevelId: item.id,
-          previousName: existingItem.name,
-          newName: item.name,
-        },
-        createdById: authentication.session.user.id,
-      },
-    ]);
-
-    /**
-     * Respond with the result
-     */
-    return NextResponse.json(item);
-  } catch (error) {
-    /**
-     * Respond with an error
-     */
-    return apiErrorHandler(error);
-  }
-}
-
-export async function DELETE(request: Request, props: { params: Params }) {
-  try {
-    /**
-     * Authenticate and authorize the request
-     */
-    const authentication = await requireAuthenticationApi(
-      "/api/classification-level/[id]",
-      "DELETE",
-    );
-    await authentication.authorizeApi("classificationLevel", "manage");
-
-    /**
-     * Validate the request params
-     */
-    const paramsData = paramsSchema.parse(await props.params);
-
-    /**
-     * Do the thing
-     */
-    const deletedItem = await prisma.classificationLevel.delete({
-      where: {
-        id: paramsData.id,
-      },
-    });
-
-    await createAuditEvents([
-      {
-        type: AuditEventType.CLASSIFICATION_LEVEL_DELETED,
-        data: {
-          classificationLevelId: deletedItem.id,
-          name: deletedItem.name,
-        },
-        createdById: authentication.session.user.id,
-      },
-    ]);
-
-    /**
-     * Respond with the result
-     */
-    return NextResponse.json({});
-  } catch (error) {
-    /**
-     * Respond with an error
-     */
-    return apiErrorHandler(error);
-  }
-}
diff --git a/pnpm-monorepo/apps/app/src/app/api/classification-level/route.ts b/pnpm-monorepo/apps/app/src/app/api/classification-level/route.ts
deleted file mode 100644
index f786da858..000000000
--- a/pnpm-monorepo/apps/app/src/app/api/classification-level/route.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { prisma } from "@/db";
-import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
-import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
-import { requireAuthenticationApi } from "@/modules/auth/server";
-import apiErrorHandler from "@/modules/common/utils/apiErrorHandler";
-import { NextResponse } from "next/server";
-import { z } from "zod";
-
-const postBodySchema = z.object({
-  name: z.string().trim().min(1).max(255),
-});
-
-export async function POST(request: Request) {
-  try {
-    /**
-     * Authenticate and authorize the request
-     */
-    const authentication = await requireAuthenticationApi(
-      "/api/classification-level",
-      "POST",
-    );
-    await authentication.authorizeApi("classificationLevel", "manage");
-
-    /**
-     * Validate the request body
-     */
-    const body: unknown = await request.json();
-    const data = postBodySchema.parse(body);
-
-    /**
-     * Do the thing
-     */
-    const item = await prisma.classificationLevel.create({
-      data,
-    });
-
-    await createAuditEvents([
-      {
-        type: AuditEventType.CLASSIFICATION_LEVEL_CREATED,
-        data: {
-          classificationLevelId: item.id,
-          name: item.name,
-        },
-        createdById: authentication.session.user.id,
-      },
-    ]);
-
-    /**
-     * Respond with the result
-     */
-    return NextResponse.json(item);
-  } catch (error) {
-    /**
-     * Respond with an error
-     */
-    return apiErrorHandler(error);
-  }
-}
diff --git a/pnpm-monorepo/apps/app/src/app/api/note-type/[id]/route.ts b/pnpm-monorepo/apps/app/src/app/api/note-type/[id]/route.ts
deleted file mode 100644
index ff37dcb8d..000000000
--- a/pnpm-monorepo/apps/app/src/app/api/note-type/[id]/route.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { prisma } from "@/db";
-import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
-import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
-import { requireAuthenticationApi } from "@/modules/auth/server";
-import apiErrorHandler from "@/modules/common/utils/apiErrorHandler";
-import { NextResponse } from "next/server";
-import { z } from "zod";
-
-type Params = Promise<{
-  id: string;
-}>;
-
-const paramsSchema = z.object({ id: z.cuid() });
-
-const patchBodySchema = z.object({
-  name: z.string().trim().min(1).max(255),
-});
-
-export async function PATCH(request: Request, props: { params: Params }) {
-  try {
-    /**
-     * Authenticate and authorize the request
-     */
-    const authentication = await requireAuthenticationApi(
-      "/api/note-type/[id]",
-      "PATCH",
-    );
-    await authentication.authorizeApi("noteType", "manage");
-
-    /**
-     * Validate the request params and body
-     */
-    const paramsData = paramsSchema.parse(await props.params);
-    const body: unknown = await request.json();
-    const data = patchBodySchema.parse(body);
-
-    /**
-     * Do the thing
-     */
-    const existingItem = await prisma.noteType.findUnique({
-      where: {
-        id: paramsData.id,
-      },
-      select: {
-        name: true,
-      },
-    });
-    if (!existingItem) throw new Error("Not found");
-
-    const item = await prisma.noteType.update({
-      where: {
-        id: paramsData.id,
-      },
-      data,
-    });
-
-    await createAuditEvents([
-      {
-        type: AuditEventType.NOTE_TYPE_UPDATED,
-        data: {
-          noteTypeId: item.id,
-          previousName: existingItem.name,
-          newName: item.name,
-        },
-        createdById: authentication.session.user.id,
-      },
-    ]);
-
-    /**
-     * Respond with the result
-     */
-    return NextResponse.json(item);
-  } catch (error) {
-    /**
-     * Respond with an error
-     */
-    return apiErrorHandler(error);
-  }
-}
-
-export async function DELETE(request: Request, props: { params: Params }) {
-  try {
-    /**
-     * Authenticate and authorize the request
-     */
-    const authentication = await requireAuthenticationApi(
-      "/api/note-type/[id]",
-      "DELETE",
-    );
-    await authentication.authorizeApi("noteType", "manage");
-
-    /**
-     * Validate the request params
-     */
-    const paramsData = paramsSchema.parse(await props.params);
-
-    /**
-     * Do the thing
-     */
-    const deletedItem = await prisma.noteType.delete({
-      where: {
-        id: paramsData.id,
-      },
-    });
-
-    await createAuditEvents([
-      {
-        type: AuditEventType.NOTE_TYPE_DELETED,
-        data: {
-          noteTypeId: deletedItem.id,
-          name: deletedItem.name,
-        },
-        createdById: authentication.session.user.id,
-      },
-    ]);
-
-    /**
-     * Respond with the result
-     */
-    return NextResponse.json({});
-  } catch (error) {
-    /**
-     * Respond with an error
-     */
-    return apiErrorHandler(error);
-  }
-}
diff --git a/pnpm-monorepo/apps/app/src/app/api/note-type/route.ts b/pnpm-monorepo/apps/app/src/app/api/note-type/route.ts
deleted file mode 100644
index d330a1923..000000000
--- a/pnpm-monorepo/apps/app/src/app/api/note-type/route.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { prisma } from "@/db";
-import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
-import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
-import { requireAuthenticationApi } from "@/modules/auth/server";
-import apiErrorHandler from "@/modules/common/utils/apiErrorHandler";
-import { NextResponse } from "next/server";
-import { z } from "zod";
-
-const postBodySchema = z.object({
-  name: z.string().trim().min(1).max(255),
-});
-
-export async function POST(request: Request) {
-  try {
-    /**
-     * Authenticate and authorize the request
-     */
-    const authentication = await requireAuthenticationApi(
-      "/api/note-type",
-      "POST",
-    );
-    await authentication.authorizeApi("noteType", "manage");
-
-    /**
-     * Validate the request body
-     */
-    const body: unknown = await request.json();
-    const data = postBodySchema.parse(body);
-
-    /**
-     * Do the thing
-     */
-    const item = await prisma.noteType.create({
-      data,
-    });
-
-    await createAuditEvents([
-      {
-        type: AuditEventType.NOTE_TYPE_CREATED,
-        data: {
-          noteTypeId: item.id,
-          name: item.name,
-        },
-        createdById: authentication.session.user.id,
-      },
-    ]);
-
-    /**
-     * Respond with the result
-     */
-    return NextResponse.json(item);
-  } catch (error) {
-    /**
-     * Respond with an error
-     */
-    return apiErrorHandler(error);
-  }
-}
diff --git a/pnpm-monorepo/apps/app/src/env.ts b/pnpm-monorepo/apps/app/src/env.ts
index a581cacdf..c566786d1 100644
--- a/pnpm-monorepo/apps/app/src/env.ts
+++ b/pnpm-monorepo/apps/app/src/env.ts
@@ -48,6 +48,12 @@ export const env = createEnv({
     UNLEASH_SERVER_API_URL: z.url().optional(),
     /** Unleash (or any other Unleash-compatible feature flag provider like GitLab) */
     UNLEASH_SERVER_API_TOKEN: z.string().optional(),
+    /**
+     * Seconds the fetched flag definitions are cached for. Lets the
+     * Playwright stack pick up a toggled flag without waiting out the
+     * production window.
+     */
+    UNLEASH_REVALIDATE_SECONDS: z.coerce.number().int().positive().default(30),
     COMMIT_SHA: z.preprocess(
       // Uses VERCEL_GIT_COMMIT_SHA if COMMIT_SHA is not set
       (str) => str || process.env.VERCEL_GIT_COMMIT_SHA,
@@ -188,6 +194,7 @@ export const env = createEnv({
     S3_PUBLIC_URL: process.env.S3_PUBLIC_URL,
     UNLEASH_SERVER_API_URL: process.env.UNLEASH_SERVER_API_URL,
     UNLEASH_SERVER_API_TOKEN: process.env.UNLEASH_SERVER_API_TOKEN,
+    UNLEASH_REVALIDATE_SECONDS: process.env.UNLEASH_REVALIDATE_SECONDS,
     NEXT_PUBLIC_HOST: process.env.NEXT_PUBLIC_HOST,
     COMMIT_SHA: process.env.COMMIT_SHA,
     NEXT_PUBLIC_CARE_BEAR_SHOOTER_BUILD_URL:
diff --git a/pnpm-monorepo/apps/app/src/modules/citizen/components/CitizenInput.tsx b/pnpm-monorepo/apps/app/src/modules/citizen/components/CitizenInput.tsx
index 7aa0f4e48..f37628272 100644
--- a/pnpm-monorepo/apps/app/src/modules/citizen/components/CitizenInput.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/citizen/components/CitizenInput.tsx
@@ -258,6 +258,7 @@ const Multiple = ({
         </Combobox>
 
         <PopoverBaseUI
+          title="Citizens einer Rolle auswählen"
           trigger={<FaUsers />}
           triggerRender={
             <Button
diff --git a/pnpm-monorepo/apps/app/src/modules/citizen/components/CitizenPopover.tsx b/pnpm-monorepo/apps/app/src/modules/citizen/components/CitizenPopover.tsx
index 235dc4fe0..80c3dd74a 100644
--- a/pnpm-monorepo/apps/app/src/modules/citizen/components/CitizenPopover.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/citizen/components/CitizenPopover.tsx
@@ -40,6 +40,7 @@ export const CitizenPopover = ({ children, citizenId }: Props) => {
 
   return (
     <PopoverBaseUI
+      title="Citizen-Details"
       trigger={children}
       onOpenChange={handleOpenChange}
       childrenClassName="w-[400px]"
diff --git a/pnpm-monorepo/apps/app/src/modules/common/components/Actions.tsx b/pnpm-monorepo/apps/app/src/modules/common/components/Actions.tsx
index e449f3332..ea982c4ee 100644
--- a/pnpm-monorepo/apps/app/src/modules/common/components/Actions.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/common/components/Actions.tsx
@@ -20,8 +20,10 @@ export const Actions = ({ children }: Readonly<Props>) => {
 
   return (
     <PopoverBaseUI
+      title="Aktionen"
       trigger={isOpen ? <FaTimes /> : <FaEllipsisH />}
       triggerRender={<Button variant="secondary" iconOnly={true} />}
+      triggerTitle="Aktionen"
       onOpenChange={setIsOpen}
       openOnHover={false}
       side="left"
diff --git a/pnpm-monorepo/apps/app/src/modules/common/components/Filter.tsx b/pnpm-monorepo/apps/app/src/modules/common/components/Filter.tsx
index fc1bf62ff..05f7f7ec8 100644
--- a/pnpm-monorepo/apps/app/src/modules/common/components/Filter.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/common/components/Filter.tsx
@@ -13,6 +13,7 @@ interface Props {
 export const Filter = ({ name, children }: Props) => {
   return (
     <PopoverBaseUI
+      title={name}
       trigger={
         <>
           <FaChevronDown /> {name}
diff --git a/pnpm-monorepo/apps/app/src/modules/common/components/PopoverBaseUI.tsx b/pnpm-monorepo/apps/app/src/modules/common/components/PopoverBaseUI.tsx
index 40ad751cb..cdb172daa 100644
--- a/pnpm-monorepo/apps/app/src/modules/common/components/PopoverBaseUI.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/common/components/PopoverBaseUI.tsx
@@ -8,6 +8,7 @@ import {
   useCallback,
   useContext,
   useMemo,
+  useRef,
   useState,
   type ComponentProps,
   type ReactNode,
@@ -26,6 +27,8 @@ const PopoverBaseUIContext = createContext<PopoverBaseUIContext | undefined>(
 interface PopoverChromeProps {
   readonly children: ReactNode;
   readonly childrenClassName?: string;
+  /** Accessible name of the popup, see PopoverBaseUI's `title` */
+  readonly title: string;
   /**
    * Invisible strips bridging the sideOffset gap so the pointer can
    * travel from a hover trigger into the popup — omitted for detached
@@ -38,10 +41,17 @@ interface PopoverChromeProps {
 const PopoverChrome = ({
   children,
   childrenClassName,
+  title,
   hoverBridges = false,
 }: PopoverChromeProps) => {
   return (
     <>
+      {/* Rendered as a span so naming the popup doesn't add an entry to the
+          page's heading outline — same trade-off as Modal's Dialog.Title. */}
+      <Popover.Title render={<span />} className="sr-only">
+        {title}
+      </Popover.Title>
+
       <Popover.Arrow className="data-[side=bottom]:-top-3.75 data-[side=left]:-right-3.25 data-[side=left]:rotate-90 data-[side=right]:-left-3.25 data-[side=right]:-rotate-90 data-[side=top]:-bottom-3.75 data-[side=top]:rotate-180">
         <IoMdArrowDropup className="fill-neutral-700 size-6" />
       </Popover.Arrow>
@@ -67,6 +77,12 @@ const PopoverChrome = ({
 };
 
 interface PopoverBaseUIContextProviderProps {
+  /**
+   * Accessible name of the popup. Base UI renders the popup with
+   * `role="dialog"`, which is announced as an unnamed dialog without one.
+   * Required so a new popover can't silently ship without a name.
+   */
+  readonly title: string;
   readonly trigger: ReactNode;
   /** Applied to the button element Base UI renders around `trigger` */
   readonly triggerClassName?: string;
@@ -100,6 +116,7 @@ interface PopoverBaseUIContextProviderProps {
 }
 
 export const PopoverBaseUI = ({
+  title,
   trigger,
   triggerClassName,
   triggerRender,
@@ -116,10 +133,30 @@ export const PopoverBaseUI = ({
 }: PopoverBaseUIContextProviderProps) => {
   const [isOpen, setIsOpen] = useState(false);
 
+  /**
+   * Moving the pointer onto a hover-opening trigger already opens the popup,
+   * so the click that usually follows would toggle it straight back closed —
+   * the opposite of what someone reaching for the button wants. That first
+   * press is swallowed; pressing again closes as expected.
+   */
+  const wasOpenedByHoverRef = useRef(false);
+
   const handleOpenChange = useCallback(
     (open: boolean, eventDetails: PopoverRoot.ChangeEventDetails) => {
       if (hoverOnly && open && eventDetails.reason !== "trigger-hover") return;
 
+      if (
+        !open &&
+        wasOpenedByHoverRef.current &&
+        eventDetails.reason === "trigger-press"
+      ) {
+        wasOpenedByHoverRef.current = false;
+        return;
+      }
+
+      wasOpenedByHoverRef.current =
+        open && eventDetails.reason === "trigger-hover";
+
       setIsOpen(open);
       onOpenChange?.(open);
     },
@@ -161,7 +198,11 @@ export const PopoverBaseUI = ({
             className={positionerClassName ?? "z-30"}
           >
             <Popover.Popup className="z-30 outline-hidden" initialFocus={false}>
-              <PopoverChrome childrenClassName={childrenClassName} hoverBridges>
+              <PopoverChrome
+                title={title}
+                childrenClassName={childrenClassName}
+                hoverBridges
+              >
                 {children}
               </PopoverChrome>
             </Popover.Popup>
@@ -173,6 +214,8 @@ export const PopoverBaseUI = ({
 };
 
 interface PopoverBaseUIDetachedProps {
+  /** Accessible name of the popup, see PopoverBaseUI's `title` */
+  readonly title: string;
   readonly open: boolean;
   /**
    * Reports Base UI's own dismissals (outside press, Escape). `open` is
@@ -194,6 +237,7 @@ interface PopoverBaseUIDetachedProps {
  * never takes focus.
  */
 export const PopoverBaseUIDetached = ({
+  title,
   open,
   onOpenChange,
   anchor,
@@ -226,7 +270,10 @@ export const PopoverBaseUIDetached = ({
             className="z-30"
           >
             <Popover.Popup className="z-30 outline-hidden" initialFocus={false}>
-              <PopoverChrome childrenClassName={childrenClassName}>
+              <PopoverChrome
+                title={title}
+                childrenClassName={childrenClassName}
+              >
                 {children}
               </PopoverChrome>
             </Popover.Popup>
diff --git a/pnpm-monorepo/apps/app/src/modules/common/components/form/EditableField.tsx b/pnpm-monorepo/apps/app/src/modules/common/components/form/EditableField.tsx
index 02fc2cff2..bb3a0bfef 100644
--- a/pnpm-monorepo/apps/app/src/modules/common/components/form/EditableField.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/common/components/form/EditableField.tsx
@@ -118,8 +118,14 @@ export const EditableField = <Value,>({
   };
 
   return (
+    /**
+     * inline-flex, not the default inline: both children are flex boxes, so
+     * an inline wrapper generates line boxes of its own next to them and
+     * takes the hit test for clicks aimed at the button inside.
+     */
     <span
       className={clsx(
+        "inline-flex",
         {
           "w-full": isEditing,
         },
diff --git a/pnpm-monorepo/apps/app/src/modules/common/components/form/YesNoCheckbox.tsx b/pnpm-monorepo/apps/app/src/modules/common/components/form/YesNoCheckbox.tsx
index 12dcd72d2..6b6793bac 100644
--- a/pnpm-monorepo/apps/app/src/modules/common/components/form/YesNoCheckbox.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/common/components/form/YesNoCheckbox.tsx
@@ -5,6 +5,12 @@ import { type InputHTMLAttributes, type ReactNode } from "react";
 import { FaCheck } from "react-icons/fa";
 
 interface Props extends InputHTMLAttributes<HTMLInputElement> {
+  /**
+   * Drops the Ja/Nein text. That text is the checkbox's STATE, never its
+   * name, so hiding it leaves the input nameless unless the caller supplies
+   * one — either an `aria-label` here or an own `<label htmlFor>` pointing
+   * at `id`.
+   */
   hideLabel?: boolean;
   yesLabel?: ReactNode;
   noLabel?: ReactNode;
diff --git a/pnpm-monorepo/apps/app/src/modules/common/utils/getUnleashFlag.ts b/pnpm-monorepo/apps/app/src/modules/common/utils/getUnleashFlag.ts
index 444e12773..abf058c49 100644
--- a/pnpm-monorepo/apps/app/src/modules/common/utils/getUnleashFlag.ts
+++ b/pnpm-monorepo/apps/app/src/modules/common/utils/getUnleashFlag.ts
@@ -22,7 +22,7 @@ export const getUnleashFlag = cache(
 
       const definitions = await getDefinitions({
         fetchOptions: {
-          next: { revalidate: 30 },
+          next: { revalidate: env.UNLEASH_REVALIDATE_SECONDS },
         },
       });
 
diff --git a/pnpm-monorepo/apps/app/src/modules/events/components/EventParticipationControls.tsx b/pnpm-monorepo/apps/app/src/modules/events/components/EventParticipationControls.tsx
index 61059251f..957e12173 100644
--- a/pnpm-monorepo/apps/app/src/modules/events/components/EventParticipationControls.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/events/components/EventParticipationControls.tsx
@@ -45,13 +45,18 @@ export const EventParticipationControls = ({
   const [commentDraft, setCommentDraft] = useState(comment ?? "");
 
   /**
-   * Re-seed the draft when the stored comment changes (e.g. a fresh
-   * sign-up after a cancellation) — same render-time pattern as RadioGroup.
+   * Adopt the stored comment when it changes (e.g. a fresh sign-up after a
+   * cancellation) — same render-time pattern as RadioGroup.
+   *
+   * Only while the draft is untouched, though: those same background
+   * refreshes arrive whenever anything revalidates the event, and adopting
+   * unconditionally would discard whatever the user had typed by then.
    */
   const [previousComment, setPreviousComment] = useState(comment);
   if (comment !== previousComment) {
+    const isDraftUntouched = commentDraft === (previousComment ?? "");
     setPreviousComment(comment);
-    setCommentDraft(comment ?? "");
+    if (isDraftUntouched) setCommentDraft(comment ?? "");
   }
 
   return (
diff --git a/pnpm-monorepo/apps/app/src/modules/notifications/components/NotificationSettings.tsx b/pnpm-monorepo/apps/app/src/modules/notifications/components/NotificationSettings.tsx
index 34b2787b6..25b5d6f56 100644
--- a/pnpm-monorepo/apps/app/src/modules/notifications/components/NotificationSettings.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/notifications/components/NotificationSettings.tsx
@@ -126,6 +126,7 @@ const SingleNotificationSettings = ({
         <YesNoCheckbox
           key={`ONSITE_${notificationType.id}`}
           name={`ONSITE_${notificationType.id}`}
+          aria-label={`On-site: ${notificationType.title}`}
           defaultChecked
           hideLabel
           disabled
@@ -136,6 +137,7 @@ const SingleNotificationSettings = ({
         <YesNoCheckbox
           key={`${NotificationChannel.WEB_PUSH}_${notificationType.id}`}
           name={`${NotificationChannel.WEB_PUSH}_${notificationType.id}`}
+          aria-label={`Browser: ${notificationType.title}`}
           defaultChecked={!isWebDisabled}
           hideLabel
         />
diff --git a/pnpm-monorepo/apps/app/src/modules/profit-distribution/components/CitizenTable.tsx b/pnpm-monorepo/apps/app/src/modules/profit-distribution/components/CitizenTable.tsx
index 0d49c7ef8..aa853e227 100644
--- a/pnpm-monorepo/apps/app/src/modules/profit-distribution/components/CitizenTable.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/profit-distribution/components/CitizenTable.tsx
@@ -208,6 +208,7 @@ export const CitizenTable = ({ className, cycleData }: Props) => {
               <YesNoCheckbox
                 key={`ceded_${cycleData.cycle.id}_${row.row.original.citizen.id}`}
                 name={`ceded_${cycleData.cycle.id}_${row.row.original.citizen.id}`}
+                aria-label={`Abgetreten: ${row.row.original.handle}`}
                 defaultChecked={Boolean(row.getValue())}
                 disabled={
                   ![
@@ -231,6 +232,7 @@ export const CitizenTable = ({ className, cycleData }: Props) => {
               <YesNoCheckbox
                 key={`accepted_${cycleData.cycle.id}_${row.row.original.citizen.id}`}
                 name={`accepted_${cycleData.cycle.id}_${row.row.original.citizen.id}`}
+                aria-label={`Zugestimmt: ${row.row.original.handle}`}
                 defaultChecked={Boolean(row.getValue())}
                 disabled={cycleData.currentPhase !== CyclePhase.Payout}
                 hideLabel
@@ -249,6 +251,7 @@ export const CitizenTable = ({ className, cycleData }: Props) => {
               <YesNoCheckbox
                 key={`disbursed_${cycleData.cycle.id}_${row.row.original.citizen.id}`}
                 name={`disbursed_${cycleData.cycle.id}_${row.row.original.citizen.id}`}
+                aria-label={`Ausgezahlt: ${row.row.original.handle}`}
                 defaultChecked={Boolean(row.getValue())}
                 disabled={cycleData.currentPhase !== CyclePhase.Payout}
                 hideLabel
diff --git a/pnpm-monorepo/apps/app/src/modules/roles/components/SingleRoleBadge.tsx b/pnpm-monorepo/apps/app/src/modules/roles/components/SingleRoleBadge.tsx
index aaeef6c67..5cb6f4abd 100644
--- a/pnpm-monorepo/apps/app/src/modules/roles/components/SingleRoleBadge.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/roles/components/SingleRoleBadge.tsx
@@ -148,7 +148,11 @@ export const SingleRoleBadge = ({
   if (!withPopover) return badge;
 
   return (
-    <PopoverBaseUI trigger={badge} childrenClassName="w-[400px]">
+    <PopoverBaseUI
+      title="Rollendetails"
+      trigger={badge}
+      childrenClassName="w-[400px]"
+    >
       <div>
         <div className="inline-flex align-middle gap-4 items-center">
           {role.icon ? (
diff --git a/pnpm-monorepo/apps/app/src/modules/shell/components/Sidebar/Notifications.tsx b/pnpm-monorepo/apps/app/src/modules/shell/components/Sidebar/Notifications.tsx
index fe5d59bcc..3182ea46a 100644
--- a/pnpm-monorepo/apps/app/src/modules/shell/components/Sidebar/Notifications.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/shell/components/Sidebar/Notifications.tsx
@@ -17,6 +17,7 @@ export const Notifications = () => {
 
   return (
     <PopoverBaseUI
+      title="Benachrichtigungen"
       trigger={
         <>
           <FaBell />
diff --git a/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Account.tsx b/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Account.tsx
index 8e7009d0e..dd8a4ac44 100644
--- a/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Account.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Account.tsx
@@ -20,6 +20,7 @@ export const Account = async ({ className }: Props) => {
 
   return (
     <PopoverBaseUI
+      title="Account"
       trigger={
         <div className="overflow-hidden rounded-secondary">
           <Avatar name={name} image={image} size={32} />
diff --git a/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Apps.tsx b/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Apps.tsx
index 1ccaab5ec..02ff35d48 100644
--- a/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Apps.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Apps.tsx
@@ -29,6 +29,7 @@ export const Apps = ({ className }: Props) => {
 
   return (
     <PopoverBaseUI
+      title="Apps"
       trigger={
         <>
           <AiFillAppstore className="text-xl" />
diff --git a/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Create.tsx b/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Create.tsx
index a1987d14c..9692106cc 100644
--- a/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Create.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Create.tsx
@@ -71,6 +71,7 @@ export const Create = ({ className }: Props) => {
   return (
     <div className={clsx("h-full p-2", className)}>
       <PopoverBaseUI
+        title="Neu erstellen"
         trigger={
           <>
             <FaPlus />
diff --git a/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Notifications.tsx b/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Notifications.tsx
index 8c2bfc56d..44625a435 100644
--- a/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Notifications.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/shell/components/TopBar/Notifications.tsx
@@ -14,6 +14,7 @@ export const Notifications = () => {
 
   return (
     <PopoverBaseUI
+      title="Benachrichtigungen"
       trigger={
         <>
           <FaBell />
diff --git a/pnpm-monorepo/apps/app/src/modules/silc/components/RoleSalariesClient/RoleSelector.tsx b/pnpm-monorepo/apps/app/src/modules/silc/components/RoleSalariesClient/RoleSelector.tsx
index 08b1c2c64..bacfcde49 100644
--- a/pnpm-monorepo/apps/app/src/modules/silc/components/RoleSalariesClient/RoleSelector.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/silc/components/RoleSalariesClient/RoleSelector.tsx
@@ -39,6 +39,7 @@ export const RoleSelector = ({ style, defaultValue, onChange }: Props) => {
       )}
 
       <PopoverBaseUI
+        title="Rolle auswählen"
         trigger={
           data && selectedRole ? (
             <span className="flex items-center justify-between gap-1">
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/actions/createClassificationLevel.ts b/pnpm-monorepo/apps/app/src/modules/spynet/actions/createClassificationLevel.ts
new file mode 100644
index 000000000..e05d0c685
--- /dev/null
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/actions/createClassificationLevel.ts
@@ -0,0 +1,47 @@
+"use server";
+
+import { prisma } from "@/db";
+import { createAuthenticatedAction } from "@/modules/actions/utils/createAction";
+import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
+import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
+import { revalidatePath } from "next/cache";
+import { z } from "zod";
+
+const schema = z.object({
+  name: z.string().trim().min(1).max(255),
+});
+
+export const createClassificationLevel = createAuthenticatedAction(
+  "createClassificationLevel",
+  schema,
+  async (formData, authentication, data, t) => {
+    if (!(await authentication.authorize("classificationLevel", "manage")))
+      return {
+        error: t("Common.forbidden"),
+        requestPayload: formData,
+      };
+
+    const classificationLevel = await prisma.classificationLevel.create({
+      data: {
+        name: data.name,
+      },
+    });
+
+    await createAuditEvents([
+      {
+        type: AuditEventType.CLASSIFICATION_LEVEL_CREATED,
+        data: {
+          classificationLevelId: classificationLevel.id,
+          name: classificationLevel.name,
+        },
+        createdById: authentication.session.user.id,
+      },
+    ]);
+
+    revalidatePath("/app/spynet/settings");
+
+    return {
+      success: "Erfolgreich hinzugefügt",
+    };
+  },
+);
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/actions/createNoteType.ts b/pnpm-monorepo/apps/app/src/modules/spynet/actions/createNoteType.ts
new file mode 100644
index 000000000..208b7ed23
--- /dev/null
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/actions/createNoteType.ts
@@ -0,0 +1,47 @@
+"use server";
+
+import { prisma } from "@/db";
+import { createAuthenticatedAction } from "@/modules/actions/utils/createAction";
+import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
+import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
+import { revalidatePath } from "next/cache";
+import { z } from "zod";
+
+const schema = z.object({
+  name: z.string().trim().min(1).max(255),
+});
+
+export const createNoteType = createAuthenticatedAction(
+  "createNoteType",
+  schema,
+  async (formData, authentication, data, t) => {
+    if (!(await authentication.authorize("noteType", "manage")))
+      return {
+        error: t("Common.forbidden"),
+        requestPayload: formData,
+      };
+
+    const noteType = await prisma.noteType.create({
+      data: {
+        name: data.name,
+      },
+    });
+
+    await createAuditEvents([
+      {
+        type: AuditEventType.NOTE_TYPE_CREATED,
+        data: {
+          noteTypeId: noteType.id,
+          name: noteType.name,
+        },
+        createdById: authentication.session.user.id,
+      },
+    ]);
+
+    revalidatePath("/app/spynet/settings");
+
+    return {
+      success: "Erfolgreich hinzugefügt",
+    };
+  },
+);
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/actions/deleteClassificationLevel.ts b/pnpm-monorepo/apps/app/src/modules/spynet/actions/deleteClassificationLevel.ts
new file mode 100644
index 000000000..5c244bf45
--- /dev/null
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/actions/deleteClassificationLevel.ts
@@ -0,0 +1,45 @@
+"use server";
+
+import { prisma } from "@/db";
+import { createAuthenticatedAction } from "@/modules/actions/utils/createAction";
+import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
+import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
+import { revalidatePath } from "next/cache";
+import { z } from "zod";
+
+const schema = z.object({
+  id: z.cuid(),
+});
+
+export const deleteClassificationLevel = createAuthenticatedAction(
+  "deleteClassificationLevel",
+  schema,
+  async (formData, authentication, data, t) => {
+    if (!(await authentication.authorize("classificationLevel", "manage")))
+      return {
+        error: t("Common.forbidden"),
+        requestPayload: formData,
+      };
+
+    const classificationLevel = await prisma.classificationLevel.delete({
+      where: { id: data.id },
+    });
+
+    await createAuditEvents([
+      {
+        type: AuditEventType.CLASSIFICATION_LEVEL_DELETED,
+        data: {
+          classificationLevelId: classificationLevel.id,
+          name: classificationLevel.name,
+        },
+        createdById: authentication.session.user.id,
+      },
+    ]);
+
+    revalidatePath("/app/spynet/settings");
+
+    return {
+      success: t("Common.successfullyDeleted"),
+    };
+  },
+);
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/actions/deleteNoteType.ts b/pnpm-monorepo/apps/app/src/modules/spynet/actions/deleteNoteType.ts
new file mode 100644
index 000000000..fd7d562b6
--- /dev/null
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/actions/deleteNoteType.ts
@@ -0,0 +1,45 @@
+"use server";
+
+import { prisma } from "@/db";
+import { createAuthenticatedAction } from "@/modules/actions/utils/createAction";
+import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
+import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
+import { revalidatePath } from "next/cache";
+import { z } from "zod";
+
+const schema = z.object({
+  id: z.cuid(),
+});
+
+export const deleteNoteType = createAuthenticatedAction(
+  "deleteNoteType",
+  schema,
+  async (formData, authentication, data, t) => {
+    if (!(await authentication.authorize("noteType", "manage")))
+      return {
+        error: t("Common.forbidden"),
+        requestPayload: formData,
+      };
+
+    const noteType = await prisma.noteType.delete({
+      where: { id: data.id },
+    });
+
+    await createAuditEvents([
+      {
+        type: AuditEventType.NOTE_TYPE_DELETED,
+        data: {
+          noteTypeId: noteType.id,
+          name: noteType.name,
+        },
+        createdById: authentication.session.user.id,
+      },
+    ]);
+
+    revalidatePath("/app/spynet/settings");
+
+    return {
+      success: t("Common.successfullyDeleted"),
+    };
+  },
+);
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/actions/updateClassificationLevel.ts b/pnpm-monorepo/apps/app/src/modules/spynet/actions/updateClassificationLevel.ts
new file mode 100644
index 000000000..07bea3c52
--- /dev/null
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/actions/updateClassificationLevel.ts
@@ -0,0 +1,61 @@
+"use server";
+
+import { prisma } from "@/db";
+import { createAuthenticatedAction } from "@/modules/actions/utils/createAction";
+import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
+import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
+import { revalidatePath } from "next/cache";
+import { z } from "zod";
+
+const schema = z.object({
+  id: z.cuid(),
+  name: z.string().trim().min(1).max(255),
+});
+
+export const updateClassificationLevel = createAuthenticatedAction(
+  "updateClassificationLevel",
+  schema,
+  async (formData, authentication, data, t) => {
+    if (!(await authentication.authorize("classificationLevel", "manage")))
+      return {
+        error: t("Common.forbidden"),
+        requestPayload: formData,
+      };
+
+    const existingClassificationLevel =
+      await prisma.classificationLevel.findUnique({
+        where: { id: data.id },
+        select: { name: true },
+      });
+    if (!existingClassificationLevel)
+      return {
+        error: t("Common.notFound"),
+        requestPayload: formData,
+      };
+
+    const classificationLevel = await prisma.classificationLevel.update({
+      where: { id: data.id },
+      data: {
+        name: data.name,
+      },
+    });
+
+    await createAuditEvents([
+      {
+        type: AuditEventType.CLASSIFICATION_LEVEL_UPDATED,
+        data: {
+          classificationLevelId: classificationLevel.id,
+          previousName: existingClassificationLevel.name,
+          newName: classificationLevel.name,
+        },
+        createdById: authentication.session.user.id,
+      },
+    ]);
+
+    revalidatePath("/app/spynet/settings");
+
+    return {
+      success: "Erfolgreich bearbeitet",
+    };
+  },
+);
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/actions/updateNoteType.ts b/pnpm-monorepo/apps/app/src/modules/spynet/actions/updateNoteType.ts
new file mode 100644
index 000000000..49438717e
--- /dev/null
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/actions/updateNoteType.ts
@@ -0,0 +1,60 @@
+"use server";
+
+import { prisma } from "@/db";
+import { createAuthenticatedAction } from "@/modules/actions/utils/createAction";
+import { AuditEventType } from "@/modules/audit/utils/AuditEventTypes";
+import { createAuditEvents } from "@/modules/audit/utils/createAuditEvent";
+import { revalidatePath } from "next/cache";
+import { z } from "zod";
+
+const schema = z.object({
+  id: z.cuid(),
+  name: z.string().trim().min(1).max(255),
+});
+
+export const updateNoteType = createAuthenticatedAction(
+  "updateNoteType",
+  schema,
+  async (formData, authentication, data, t) => {
+    if (!(await authentication.authorize("noteType", "manage")))
+      return {
+        error: t("Common.forbidden"),
+        requestPayload: formData,
+      };
+
+    const existingNoteType = await prisma.noteType.findUnique({
+      where: { id: data.id },
+      select: { name: true },
+    });
+    if (!existingNoteType)
+      return {
+        error: t("Common.notFound"),
+        requestPayload: formData,
+      };
+
+    const noteType = await prisma.noteType.update({
+      where: { id: data.id },
+      data: {
+        name: data.name,
+      },
+    });
+
+    await createAuditEvents([
+      {
+        type: AuditEventType.NOTE_TYPE_UPDATED,
+        data: {
+          noteTypeId: noteType.id,
+          previousName: existingNoteType.name,
+          newName: noteType.name,
+        },
+        createdById: authentication.session.user.id,
+      },
+    ]);
+
+    revalidatePath("/app/spynet/settings");
+
+    return {
+      success: "Erfolgreich bearbeitet",
+    };
+  },
+);
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/components/classification-level/ClassificationLevelsTile.tsx b/pnpm-monorepo/apps/app/src/modules/spynet/components/classification-level/ClassificationLevelsTile.tsx
index cc870366b..bf8148e1a 100644
--- a/pnpm-monorepo/apps/app/src/modules/spynet/components/classification-level/ClassificationLevelsTile.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/components/classification-level/ClassificationLevelsTile.tsx
@@ -1,4 +1,7 @@
 import { getAllClassificationLevels } from "@/modules/spynet/queries/getAllClassificationLevels";
+import { createClassificationLevel } from "../../actions/createClassificationLevel";
+import { deleteClassificationLevel } from "../../actions/deleteClassificationLevel";
+import { updateClassificationLevel } from "../../actions/updateClassificationLevel";
 import { SettingsRecordTile } from "../settings-record/SettingsRecordTile";
 
 interface Props {
@@ -14,7 +17,11 @@ const ClassificationLevelsTile = async ({ className }: Props) => {
       heading="Geheimhaltungsstufen"
       description="Jeder Notiz kann eine Geheimhaltungsstufe zugewiesen werden. Anhand dieser können Berechtigungen vergeben werden."
       emptyLabel="Keine Geheimhaltungsstufen vorhanden"
-      apiPath="/api/classification-level"
+      actions={{
+        create: createClassificationLevel,
+        update: updateClassificationLevel,
+        delete: deleteClassificationLevel,
+      }}
       records={classificationLevels}
     />
   );
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/components/note-type/NoteTypesTile.tsx b/pnpm-monorepo/apps/app/src/modules/spynet/components/note-type/NoteTypesTile.tsx
index ce6f42ae4..15567240d 100644
--- a/pnpm-monorepo/apps/app/src/modules/spynet/components/note-type/NoteTypesTile.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/components/note-type/NoteTypesTile.tsx
@@ -1,4 +1,7 @@
 import { getAllNoteTypes } from "@/modules/spynet/queries/getAllNoteTypes";
+import { createNoteType } from "../../actions/createNoteType";
+import { deleteNoteType } from "../../actions/deleteNoteType";
+import { updateNoteType } from "../../actions/updateNoteType";
 import { SettingsRecordTile } from "../settings-record/SettingsRecordTile";
 
 interface Props {
@@ -14,7 +17,11 @@ const NoteTypesTile = async ({ className }: Props) => {
       heading="Notizarten"
       description="Jeder Notiz kann eine Art zugewiesen werden. Anhand dieser können Berechtigungen vergeben werden."
       emptyLabel="Keine Notizarten vorhanden"
-      apiPath="/api/note-type"
+      actions={{
+        create: createNoteType,
+        update: updateNoteType,
+        delete: deleteNoteType,
+      }}
       records={noteTypes}
     />
   );
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/CreateSettingsRecord.tsx b/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/CreateSettingsRecord.tsx
index c0122857d..197ad3cd3 100644
--- a/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/CreateSettingsRecord.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/CreateSettingsRecord.tsx
@@ -1,58 +1,29 @@
 "use client";
 
+import { ActionErrorNote } from "@/modules/actions/components/ActionErrorNote";
+import type { ActionResponse } from "@/modules/actions/utils/createAction";
+import { useAction } from "@/modules/actions/utils/useAction";
 import { AsciiSpinner } from "@/modules/common/components/AsciiSpinner";
 import { Button2, Button2Variant } from "@/modules/common/components/Button2";
 import Modal from "@/modules/common/components/Modal";
 import clsx from "clsx";
-import { useRouter } from "next/navigation";
 import { useId, useState } from "react";
-import { useForm, type SubmitHandler } from "react-hook-form";
-import toast from "react-hot-toast";
 import { FaPlus, FaSave } from "react-icons/fa";
 
-interface FormValues {
-  name: string;
-}
-
 interface Props {
   readonly className?: string;
-  readonly apiPath: string;
+  readonly action: (formData: FormData) => Promise<ActionResponse>;
 }
 
-export const CreateSettingsRecord = ({ className, apiPath }: Props) => {
+export const CreateSettingsRecord = ({ className, action }: Props) => {
   const [isOpen, setIsOpen] = useState(false);
-
-  const router = useRouter();
-  const { register, handleSubmit, reset } = useForm<FormValues>();
-  const [isLoading, setIsLoading] = useState(false);
   const inputId = useId();
 
-  const onSubmit: SubmitHandler<FormValues> = async (data) => {
-    setIsLoading(true);
-
-    try {
-      const response = await fetch(apiPath, {
-        method: "POST",
-        body: JSON.stringify({
-          name: data.name,
-        }),
-      });
-
-      if (response.ok) {
-        router.refresh();
-        toast.success("Erfolgreich hinzugefügt");
-        reset();
-        setIsOpen(false);
-      } else {
-        toast.error("Beim Hinzufügen ist ein Fehler aufgetreten.");
-      }
-    } catch (error) {
-      toast.error("Beim Hinzufügen ist ein Fehler aufgetreten.");
-      console.error(error);
-    }
-
-    setIsLoading(false);
-  };
+  const { state, formAction, isPending, getDefaultValueWithFallback } =
+    useAction(action, {
+      errorToast: false,
+      onSuccess: () => setIsOpen(false),
+    });
 
   return (
     <>
@@ -71,7 +42,7 @@ export const CreateSettingsRecord = ({ className, apiPath }: Props) => {
         className="w-120"
         heading={<h2>Hinzufügen</h2>}
       >
-        <form onSubmit={handleSubmit(onSubmit)}>
+        <form action={formAction}>
           <label className="block" htmlFor={inputId}>
             Name
           </label>
@@ -79,16 +50,20 @@ export const CreateSettingsRecord = ({ className, apiPath }: Props) => {
           <input
             className="p-2 rounded-secondary bg-neutral-900 w-full mt-2"
             id={inputId}
-            {...register("name", { required: true })}
+            name="name"
+            defaultValue={getDefaultValueWithFallback("name", "")}
+            required
             autoFocus
           />
 
           <div className="flex justify-end mt-8">
-            <Button2 type="submit" disabled={isLoading}>
-              {isLoading ? <AsciiSpinner /> : <FaSave />}
+            <Button2 type="submit" disabled={isPending}>
+              {isPending ? <AsciiSpinner /> : <FaSave />}
               Speichern
             </Button2>
           </div>
+
+          <ActionErrorNote className="mt-4" state={state} />
         </form>
       </Modal>
     </>
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/DeleteSettingsRecord.tsx b/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/DeleteSettingsRecord.tsx
index bbbce27c0..9deb0e308 100644
--- a/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/DeleteSettingsRecord.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/DeleteSettingsRecord.tsx
@@ -1,37 +1,22 @@
 "use client";
 
+import type { ActionResponse } from "@/modules/actions/utils/createAction";
 import { AsciiSpinner } from "@/modules/common/components/AsciiSpinner";
 import Button from "@/modules/common/components/Button";
 import { ConfirmActionButton } from "@/modules/common/components/ConfirmActionButton";
-import { useRouter } from "next/navigation";
 import { FaTrash } from "react-icons/fa";
 import type { SettingsRecord } from "./SettingsRecord";
 
 interface Props {
-  readonly apiPath: string;
+  readonly action: (formData: FormData) => Promise<ActionResponse>;
   readonly record: SettingsRecord;
 }
 
-export const DeleteSettingsRecord = ({ apiPath, record }: Props) => {
-  const router = useRouter();
-
-  const deleteRecord = async (formData: FormData) => {
-    const response = await fetch(`${apiPath}/${record.id}`, {
-      method: "DELETE",
-    });
-
-    if (!response.ok)
-      return {
-        error: "Beim Löschen ist ein Fehler aufgetreten.",
-        requestPayload: formData,
-      };
-
-    return { success: "Erfolgreich gelöscht" };
-  };
-
+export const DeleteSettingsRecord = ({ action, record }: Props) => {
   return (
     <ConfirmActionButton
-      action={deleteRecord}
+      action={action}
+      hiddenFields={[{ name: "id", value: record.id }]}
       trigger={(isPending) => (
         <Button disabled={isPending} variant="tertiary">
           {isPending ? <AsciiSpinner /> : <FaTrash />} Löschen
@@ -44,7 +29,6 @@ export const DeleteSettingsRecord = ({ apiPath, record }: Props) => {
         </>
       }
       confirmLabel="Löschen"
-      onSuccess={() => router.refresh()}
     />
   );
 };
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/SettingsRecordTile.tsx b/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/SettingsRecordTile.tsx
index 5087a04a2..37c8cdaa8 100644
--- a/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/SettingsRecordTile.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/SettingsRecordTile.tsx
@@ -1,3 +1,4 @@
+import type { ActionResponse } from "@/modules/actions/utils/createAction";
 import { Actions } from "@/modules/common/components/Actions";
 import { Tile } from "@/modules/common/components/Tile";
 import type { ReactNode } from "react";
@@ -6,12 +7,19 @@ import { DeleteSettingsRecord } from "./DeleteSettingsRecord";
 import type { SettingsRecord } from "./SettingsRecord";
 import { UpdateSettingsRecord } from "./UpdateSettingsRecord";
 
+type SettingsRecordAction = (formData: FormData) => Promise<ActionResponse>;
+
 interface Props {
   readonly className?: string;
   readonly heading: string;
   readonly description: ReactNode;
   readonly emptyLabel: string;
-  readonly apiPath: string;
+  /** The record type's own CRUD actions — see NoteTypesTile for an example */
+  readonly actions: {
+    readonly create: SettingsRecordAction;
+    readonly update: SettingsRecordAction;
+    readonly delete: SettingsRecordAction;
+  };
   readonly records: SettingsRecord[];
 }
 
@@ -20,7 +28,7 @@ export const SettingsRecordTile = ({
   heading,
   description,
   emptyLabel,
-  apiPath,
+  actions,
   records,
 }: Props) => {
   const sortedRecords = records.toSorted((first, second) =>
@@ -30,7 +38,7 @@ export const SettingsRecordTile = ({
   return (
     <Tile
       heading={heading}
-      cta={<CreateSettingsRecord apiPath={apiPath} />}
+      cta={<CreateSettingsRecord action={actions.create} />}
       className={className}
     >
       <p className="mb-4 text-sm">{description}</p>
@@ -47,8 +55,8 @@ export const SettingsRecordTile = ({
 
           <div className="flex gap-4 items-center">
             <Actions>
-              <UpdateSettingsRecord apiPath={apiPath} record={record} />
-              <DeleteSettingsRecord apiPath={apiPath} record={record} />
+              <UpdateSettingsRecord action={actions.update} record={record} />
+              <DeleteSettingsRecord action={actions.delete} record={record} />
             </Actions>
           </div>
         </div>
diff --git a/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/UpdateSettingsRecord.tsx b/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/UpdateSettingsRecord.tsx
index a0186a818..3a725d037 100644
--- a/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/UpdateSettingsRecord.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/spynet/components/settings-record/UpdateSettingsRecord.tsx
@@ -1,64 +1,32 @@
 "use client";
 
+import { ActionErrorNote } from "@/modules/actions/components/ActionErrorNote";
+import type { ActionResponse } from "@/modules/actions/utils/createAction";
+import { useAction } from "@/modules/actions/utils/useAction";
 import { AsciiSpinner } from "@/modules/common/components/AsciiSpinner";
 import Button from "@/modules/common/components/Button";
 import { Button2 } from "@/modules/common/components/Button2";
 import Modal from "@/modules/common/components/Modal";
 import clsx from "clsx";
-import { useRouter } from "next/navigation";
 import { useId, useState } from "react";
-import { useForm, type SubmitHandler } from "react-hook-form";
-import toast from "react-hot-toast";
 import { FaPen, FaSave } from "react-icons/fa";
 import type { SettingsRecord } from "./SettingsRecord";
 
-interface FormValues {
-  name: string;
-}
-
 interface Props {
   readonly className?: string;
-  readonly apiPath: string;
+  readonly action: (formData: FormData) => Promise<ActionResponse>;
   readonly record: SettingsRecord;
 }
 
-export const UpdateSettingsRecord = ({ className, apiPath, record }: Props) => {
+export const UpdateSettingsRecord = ({ className, action, record }: Props) => {
   const [isOpen, setIsOpen] = useState(false);
-
-  const router = useRouter();
-  const { register, handleSubmit } = useForm<FormValues>({
-    defaultValues: {
-      name: record.name,
-    },
-  });
-  const [isLoading, setIsLoading] = useState(false);
   const inputId = useId();
 
-  const onSubmit: SubmitHandler<FormValues> = async (data) => {
-    setIsLoading(true);
-
-    try {
-      const response = await fetch(`${apiPath}/${record.id}`, {
-        method: "PATCH",
-        body: JSON.stringify({
-          name: data.name,
-        }),
-      });
-
-      if (response.ok) {
-        router.refresh();
-        toast.success("Erfolgreich bearbeitet");
-        setIsOpen(false);
-      } else {
-        toast.error("Beim Bearbeiten ist ein Fehler aufgetreten.");
-      }
-    } catch (error) {
-      toast.error("Beim Bearbeiten ist ein Fehler aufgetreten.");
-      console.error(error);
-    }
-
-    setIsLoading(false);
-  };
+  const { state, formAction, isPending, getDefaultValueWithFallback } =
+    useAction(action, {
+      errorToast: false,
+      onSuccess: () => setIsOpen(false),
+    });
 
   return (
     <>
@@ -77,7 +45,9 @@ export const UpdateSettingsRecord = ({ className, apiPath, record }: Props) => {
         className="w-120"
         heading={<h2>Bearbeiten</h2>}
       >
-        <form onSubmit={handleSubmit(onSubmit)}>
+        <form action={formAction}>
+          <input type="hidden" name="id" value={record.id} />
+
           <label className="block" htmlFor={inputId}>
             Name
           </label>
@@ -85,16 +55,20 @@ export const UpdateSettingsRecord = ({ className, apiPath, record }: Props) => {
           <input
             className="p-2 rounded-secondary bg-neutral-900 w-full mt-2"
             id={inputId}
-            {...register("name", { required: true })}
+            name="name"
+            defaultValue={getDefaultValueWithFallback("name", record.name)}
+            required
             autoFocus
           />
 
           <div className="flex justify-end mt-8">
-            <Button2 type="submit" disabled={isLoading}>
-              {isLoading ? <AsciiSpinner /> : <FaSave />}
+            <Button2 type="submit" disabled={isPending}>
+              {isPending ? <AsciiSpinner /> : <FaSave />}
               Speichern
             </Button2>
           </div>
+
+          <ActionErrorNote className="mt-4" state={state} />
         </form>
       </Modal>
     </>
diff --git a/pnpm-monorepo/apps/app/src/modules/tasks/components/CreateTask/RequiredRoles.tsx b/pnpm-monorepo/apps/app/src/modules/tasks/components/CreateTask/RequiredRoles.tsx
index 9a363f1d6..43b20fd45 100644
--- a/pnpm-monorepo/apps/app/src/modules/tasks/components/CreateTask/RequiredRoles.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/tasks/components/CreateTask/RequiredRoles.tsx
@@ -34,6 +34,7 @@ export const RequiredRoles = ({ className, defaultValue }: Props) => {
       <p className="mb-1">Erforderliche Rolle(n)</p>
 
       <PopoverBaseUI
+        title="Rolle auswählen"
         trigger={
           <>
             <FaUsers /> Rolle auswählen
diff --git a/pnpm-monorepo/apps/app/src/modules/users/components/UsersTable.tsx b/pnpm-monorepo/apps/app/src/modules/users/components/UsersTable.tsx
index 407aad69f..d1e020973 100644
--- a/pnpm-monorepo/apps/app/src/modules/users/components/UsersTable.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/users/components/UsersTable.tsx
@@ -124,6 +124,7 @@ export const UsersTable = ({
             <td className="overflow-hidden flex items-center gap-2">
               {user.bannedAt && (
                 <PopoverBaseUI
+                  title="Details zur Sperre"
                   trigger={
                     <span className="flex items-center gap-1 ml-2">
                       <FaCircleXmark className="text-red-500" /> Gesperrt
diff --git a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiCollabStatusDot.tsx b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiCollabStatusDot.tsx
index 08797b9f3..74494df1b 100644
--- a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiCollabStatusDot.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiCollabStatusDot.tsx
@@ -76,6 +76,7 @@ export const WikiCollabStatusDot = ({ className, status, users }: Props) => {
   return (
     <span className={clsx("flex items-center", className)}>
       <PopoverBaseUI
+        title="Aktive Bearbeiter"
         hoverOnly
         trigger={
           <span className="flex cursor-help items-center gap-1.5 p-1">
diff --git a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiGutter.tsx b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiGutter.tsx
index 6de590240..38e1d6b36 100644
--- a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiGutter.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiGutter.tsx
@@ -209,6 +209,7 @@ export const WikiGutter = ({
         onMouseLeave={() => setControlsHovered(false)}
       >
         <PopoverBaseUI
+          title="Block einfügen"
           openOnHover={false}
           side="bottom"
           onOpenChange={handleOpenChange}
diff --git a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiPageDetailsPopover.tsx b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiPageDetailsPopover.tsx
index e45010721..b42520d37 100644
--- a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiPageDetailsPopover.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiPageDetailsPopover.tsx
@@ -51,6 +51,7 @@ export const WikiPageDetailsPopover = ({ pageId }: Props) => {
 
   return (
     <PopoverBaseUI
+      title="Seitendetails"
       trigger={
         <span
           aria-label="Details anzeigen"
diff --git a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiRoleSelector.tsx b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiRoleSelector.tsx
index 4130f7c21..a55b4928b 100644
--- a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiRoleSelector.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiRoleSelector.tsx
@@ -65,6 +65,7 @@ export const WikiRoleSelector = ({
   return (
     <div className={clsx(className)}>
       <PopoverBaseUI
+        title="Rolle auswählen"
         trigger={
           <span
             className={clsx(
diff --git a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiSuggestionMenu.tsx b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiSuggestionMenu.tsx
index 99a7828ca..a53527ea4 100644
--- a/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiSuggestionMenu.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/wiki/components/WikiSuggestionMenu.tsx
@@ -225,6 +225,7 @@ const WikiSuggestionPopover = <Item extends WikiSuggestionMenuItem>({
 
   return (
     <PopoverBaseUIDetached
+      title="Vorschläge"
       open={open && anchor !== null}
       onOpenChange={(nextOpen) => {
         if (!nextOpen) onDismiss();
diff --git a/pnpm-monorepo/apps/app/src/modules/wiki/components/toolbar/ToolbarPopover.tsx b/pnpm-monorepo/apps/app/src/modules/wiki/components/toolbar/ToolbarPopover.tsx
index f4d34e9d3..654f06fec 100644
--- a/pnpm-monorepo/apps/app/src/modules/wiki/components/toolbar/ToolbarPopover.tsx
+++ b/pnpm-monorepo/apps/app/src/modules/wiki/components/toolbar/ToolbarPopover.tsx
@@ -21,6 +21,7 @@ export const ToolbarPopover = ({
 }: Props) => {
   return (
     <PopoverBaseUI
+      title={title}
       disabled={disabled}
       trigger={
         <span
diff --git a/pnpm-monorepo/apps/collab/src/index.ts b/pnpm-monorepo/apps/collab/src/index.ts
index c53897537..510b01610 100644
--- a/pnpm-monorepo/apps/collab/src/index.ts
+++ b/pnpm-monorepo/apps/collab/src/index.ts
@@ -384,6 +384,16 @@ const server = new Server<ConnectionContext>({
   },
 
   async onRequest(data) {
+    /**
+     * Readiness probe. An open port only means Node bound the socket —
+     * this answers once the server is actually serving, which is what an
+     * orchestrator (and the Playwright stack) needs to wait for.
+     */
+    if (data.request.method === "GET" && data.request.url === "/health") {
+      respondJson(data.response, 200, { status: "ok" });
+      throw null;
+    }
+
     if (data.request.method === "POST" && data.request.url === "/replace") {
       try {
         await handleReplaceRequest(data.request, data.response);
@@ -594,3 +604,29 @@ const server = new Server<ConnectionContext>({
 
 await server.listen();
 console.log(`[collab] Listening on port ${env.PORT}`);
+
+/**
+ * Edits are persisted on a debounce, so an abrupt exit drops up to
+ * `maxDebounce` worth of them. Hocuspocus' destroy() closes the
+ * connections and awaits the store hooks for every open document, so a
+ * deploy or a container restart lands after the writes instead of on top
+ * of them.
+ */
+let isShuttingDown = false;
+
+const shutDown = async (signal: NodeJS.Signals) => {
+  if (isShuttingDown) return;
+  isShuttingDown = true;
+  console.log(`[collab] ${signal} received, flushing open documents`);
+
+  try {
+    await server.destroy();
+    console.log("[collab] Shutdown complete");
+  } catch (error) {
+    console.error("[collab] Shutdown failed", error);
+    process.exitCode = 1;
+  }
+};
+
+process.on("SIGTERM", (signal) => void shutDown(signal));
+process.on("SIGINT", (signal) => void shutDown(signal));
diff --git a/pnpm-monorepo/apps/playwright/fixtures/interactions.ts b/pnpm-monorepo/apps/playwright/fixtures/interactions.ts
index 4c5e45755..be0d01ec5 100644
--- a/pnpm-monorepo/apps/playwright/fixtures/interactions.ts
+++ b/pnpm-monorepo/apps/playwright/fixtures/interactions.ts
@@ -7,12 +7,12 @@ import { expect, type Locator, type Page } from "@playwright/test";
 export const ACTION_FEEDBACK_TIMEOUT = 15_000;
 
 /**
- * The app's Modal (Base UI dialog) renders in a portal with role="dialog",
- * but its heading is not always a heading element — so modals are located
- * by their heading text instead of an accessible name.
+ * The app's Modal (Base UI dialog) renders in a portal with role="dialog"
+ * and takes its accessible name from the heading it is given. Popovers use
+ * the same role but carry their own name, so this never matches one.
  */
 export const modal = (page: Page, heading: string | RegExp) =>
-  page.getByRole("dialog").filter({ hasText: heading });
+  page.getByRole("dialog", { name: heading });
 
 /**
  * Interactions landing before React hydrates are swallowed: clicks fall on
@@ -97,21 +97,11 @@ export const tabUntilFocused = (page: Page, target: Locator) =>
   }).toPass({ timeout: HYDRATION_TIMEOUT });
 
 /**
- * EditableField wraps its display button and its save form in an inline
- * <span>; Playwright's hit-target validation misattributes clicks on them
- * to that span ("<span> intercepts pointer events") although real clicks
- * do reach the button — force skips only that validation. The reaction
- * check keeps the pre-hydration retry honest.
+ * Submits the open inline editor (EditableField). Only one can be open at a
+ * time, so the icon-only save button is unambiguous without scoping.
  */
-export const openInlineEditor = (editButton: Locator, editorInput: Locator) =>
-  expect(async () => {
-    await editButton.click({ force: true, timeout: REACTION_TIMEOUT });
-    await expect(editorInput).toBeVisible({ timeout: REACTION_TIMEOUT });
-  }).toPass({ timeout: HYDRATION_TIMEOUT });
-
-/** See openInlineEditor — the save button sits in the same inline wrapper. */
 export const saveInlineEditor = (page: Page) =>
-  page.locator('button[title="Speichern"]').click({ force: true });
+  page.locator('button[title="Speichern"]').click();
 
 /**
  * Proves the page has hydrated by opening and closing the notification
@@ -122,7 +112,7 @@ export const saveInlineEditor = (page: Page) =>
  */
 export const waitForAppShellHydration = async (page: Page) => {
   const bellButton = page.getByRole("button", { name: "Benachrichtigungen" });
-  const popover = page.getByRole("dialog");
+  const popover = page.getByRole("dialog", { name: "Benachrichtigungen" });
   await clickUntilVisible(bellButton, popover);
   await page.keyboard.press("Escape");
   await expect(popover).not.toBeVisible();
diff --git a/pnpm-monorepo/apps/playwright/fixtures/test.ts b/pnpm-monorepo/apps/playwright/fixtures/test.ts
index 23121f75d..afdde2d4e 100644
--- a/pnpm-monorepo/apps/playwright/fixtures/test.ts
+++ b/pnpm-monorepo/apps/playwright/fixtures/test.ts
@@ -128,7 +128,9 @@ export const test = base.extend<Fixtures, WorkerFixtures>({
           COLLAB_JWT_SECRET: collabJwtSecret,
         })
         .withExposedPorts(collabPort)
-        .withWaitStrategy(Wait.forListeningPorts())
+        // An open port only means the socket is bound; /health answers once
+        // the server is actually serving requests.
+        .withWaitStrategy(Wait.forHttp("/health", collabPort))
         .start();
 
       const appPort = await getFreePort();
diff --git a/pnpm-monorepo/apps/playwright/setup/stack.ts b/pnpm-monorepo/apps/playwright/setup/stack.ts
index 55a4b1684..bb8152f8e 100644
--- a/pnpm-monorepo/apps/playwright/setup/stack.ts
+++ b/pnpm-monorepo/apps/playwright/setup/stack.ts
@@ -91,6 +91,9 @@ export const unleashEnvironment = (unleashPort: number) =>
   ({
     UNLEASH_SERVER_API_URL: `http://localhost:${unleashPort}/api`,
     UNLEASH_SERVER_API_TOKEN: unleashBackendToken,
+    // Production caches the flag definitions for 30s; a toggle in a test
+    // must not wait that out (see tests/unleash.spec.ts).
+    UNLEASH_REVALIDATE_SECONDS: "1",
   }) as const;
 
 /**
diff --git a/pnpm-monorepo/apps/playwright/tests/apps-favorites.spec.ts b/pnpm-monorepo/apps/playwright/tests/apps-favorites.spec.ts
index b59a76dd3..ec5fbf360 100644
--- a/pnpm-monorepo/apps/playwright/tests/apps-favorites.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/apps-favorites.spec.ts
@@ -1,23 +1,20 @@
 import type { Page } from "@playwright/test";
 import { createCitizen } from "../fixtures/factories";
+import { clickUntilVisible } from "../fixtures/interactions";
 import { expect, test } from "../fixtures/test";
 
 /**
- * Base UI renders the popup with `role="dialog"`. Scoping to it keeps the
+ * Base UI renders the popup with `role="dialog"`; its name keeps the
  * assertions away from the mobile flyout, which lists the same apps.
  */
-const appsPopover = (page: Page) => page.getByRole("dialog");
+const appsPopover = (page: Page) =>
+  page.getByRole("dialog", { name: "Apps", exact: true });
 
-/**
- * The popover opens on hover — clicking the trigger would race the hover
- * delay and could toggle it straight back closed.
- */
-const openAppsPopover = async (page: Page) => {
-  await page.getByRole("button", { name: "Apps" }).hover();
-  await expect(
+const openAppsPopover = (page: Page) =>
+  clickUntilVisible(
+    page.getByRole("button", { name: "Apps" }),
     appsPopover(page).getByText("Featured", { exact: true }),
-  ).toBeVisible({ timeout: 15_000 });
-};
+  );
 
 const favoritesHeading = (page: Page) =>
   appsPopover(page).getByText("Favoriten", { exact: true });
diff --git a/pnpm-monorepo/apps/playwright/tests/collab-replace.spec.ts b/pnpm-monorepo/apps/playwright/tests/collab-replace.spec.ts
index e1cd36bae..b79271496 100644
--- a/pnpm-monorepo/apps/playwright/tests/collab-replace.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/collab-replace.spec.ts
@@ -47,40 +47,38 @@ test("a programmatic /replace creates suppressed links only", async ({
   });
 
   /**
-   * Node's fetch instead of Playwright's request fixture (whose client
-   * trips over Hocuspocus' plain-HTTP handling), retried in case the
-   * freshly started collab container isn't serving HTTP yet. A genuinely
-   * broken endpoint still fails every attempt.
+   * Node's fetch instead of Playwright's request fixture, whose client
+   * trips over Hocuspocus' plain-HTTP handling. The container is waited on
+   * with its /health route, so the endpoint is serving by now.
    */
-  await expect(async () => {
-    const response = await fetch(`${collabHttpUrl}/replace`, {
-      method: "POST",
-      headers: {
-        authorization: `Bearer ${signReplaceToken(wikiPage.id, author.entity.id)}`,
-        "content-type": "application/json",
-      },
-      body: JSON.stringify({
-        content: {
-          type: "doc",
-          content: [
-            {
-              type: "paragraph",
-              content: [
-                {
-                  type: "wikiCitizenMention",
-                  attrs: {
-                    citizenId: mentioned.entity.id,
-                    handle: "Zielperson",
-                  },
+  const response = await fetch(`${collabHttpUrl}/replace`, {
+    method: "POST",
+    headers: {
+      authorization: `Bearer ${signReplaceToken(wikiPage.id, author.entity.id)}`,
+      "content-type": "application/json",
+    },
+    body: JSON.stringify({
+      content: {
+        type: "doc",
+        content: [
+          {
+            type: "paragraph",
+            content: [
+              {
+                type: "wikiCitizenMention",
+                attrs: {
+                  citizenId: mentioned.entity.id,
+                  handle: "Zielperson",
                 },
-              ],
-            },
-          ],
-        },
-      }),
-    });
-    expect(response.ok).toBe(true);
-  }).toPass({ timeout: 15_000 });
+              },
+            ],
+          },
+        ],
+      },
+    }),
+    signal: AbortSignal.timeout(15_000),
+  });
+  expect(response.ok).toBe(true);
 
   await expect
     .poll(
diff --git a/pnpm-monorepo/apps/playwright/tests/fleet.spec.ts b/pnpm-monorepo/apps/playwright/tests/fleet.spec.ts
index 41612e6a4..63b862a1d 100644
--- a/pnpm-monorepo/apps/playwright/tests/fleet.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/fleet.spec.ts
@@ -11,7 +11,6 @@ import {
   clickUntilVisible,
   fillUntilUrl,
   modal,
-  openInlineEditor,
   saveInlineEditor,
 } from "../fixtures/interactions";
 import { expect, test } from "../fixtures/test";
@@ -150,7 +149,7 @@ test("my ships can be added, renamed and deleted with consistent org counts", as
   // Rename
   await page.goto("/app/fleet/my-ships");
   const nameInput = page.locator('input[name="name"]');
-  await openInlineEditor(
+  await clickUntilVisible(
     shipRow.locator('button[title="Klicken, um zu bearbeiten"]'),
     nameInput,
   );
@@ -223,7 +222,7 @@ test("manufacturers and series can be managed through the REST-backed settings",
     `/app/fleet/settings/manufacturer/${manufacturer!.id}`,
   );
   const nameInput = page.locator('input[name="name"]');
-  await openInlineEditor(
+  await clickUntilVisible(
     page.locator('button[title="Klicken, um zu bearbeiten"]'),
     nameInput,
   );
diff --git a/pnpm-monorepo/apps/playwright/tests/iam.spec.ts b/pnpm-monorepo/apps/playwright/tests/iam.spec.ts
index e22b34b55..1bd98f99f 100644
--- a/pnpm-monorepo/apps/playwright/tests/iam.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/iam.spec.ts
@@ -1,23 +1,7 @@
-import type { Page } from "@playwright/test";
 import { createCitizen } from "../fixtures/factories";
+import { ACTION_FEEDBACK_TIMEOUT, modal } from "../fixtures/interactions";
 import { expect, test } from "../fixtures/test";
 
-/**
- * The app's Modal renders as a portal without dialog semantics (the Base UI
- * rewrite is planned), so modals are located by their heading instead of
- * getByRole("dialog").
- */
-const modal = (page: Page, heading: string) =>
-  page
-    .locator("body > div")
-    .filter({ has: page.getByRole("heading", { name: heading }) });
-
-/**
- * Mutations run as server actions against a worker stack under full-suite
- * load — their success feedback regularly needs more than the 5s default.
- */
-const ACTION_FEEDBACK_TIMEOUT = 15_000;
-
 test("a role created and assigned through the UI grants its permission", async ({
   page,
   prisma,
diff --git a/pnpm-monorepo/apps/playwright/tests/notification-center.spec.ts b/pnpm-monorepo/apps/playwright/tests/notification-center.spec.ts
index 7e1a4b1ea..7e48efd97 100644
--- a/pnpm-monorepo/apps/playwright/tests/notification-center.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/notification-center.spec.ts
@@ -8,9 +8,10 @@ const bellButton = (page: Page) =>
 /**
  * The notification center is mounted twice (top bar popover and the hidden
  * mobile flyout), so desktop assertions are scoped to the open popover —
- * Base UI renders its popup with `role="dialog"`.
+ * Base UI renders its popup with `role="dialog"`, named after its trigger.
  */
-const popover = (page: Page) => page.getByRole("dialog");
+const popover = (page: Page) =>
+  page.getByRole("dialog", { name: "Benachrichtigungen" });
 
 const openNotificationCenter = async (page: Page) => {
   await bellButton(page).click();
diff --git a/pnpm-monorepo/apps/playwright/tests/notification-settings.spec.ts b/pnpm-monorepo/apps/playwright/tests/notification-settings.spec.ts
index 050280334..81c4cae3e 100644
--- a/pnpm-monorepo/apps/playwright/tests/notification-settings.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/notification-settings.spec.ts
@@ -8,9 +8,10 @@ import {
 import { expect, test } from "../fixtures/test";
 
 /**
- * The checkbox inputs are sr-only without an accessible name — they are
- * located by their form field name (ONSITE_<type> / WEB_PUSH_<type>) and
- * toggled through their wrapping label.
+ * The checkbox input itself is sr-only — the visible control is the box its
+ * wrapping label draws, so toggling goes through the label the way a click
+ * does. State is read off the input, located by its form field name
+ * (ONSITE_<type> / WEB_PUSH_<type>) so the cases stay written in ids.
  */
 const browserCheckbox = (page: Page, notificationType: string) =>
   page.locator(`input[name="WEB_PUSH_${notificationType}"]`);
@@ -36,6 +37,15 @@ test("browser notifications are enabled by default", async ({
   await expect(browserCheckbox(page, "event_created")).toBeChecked();
   await expect(browserCheckbox(page, "wiki_page_reported")).toBeChecked();
 
+  // Each box names its channel and its notification type; the visible
+  // Ja/Nein text is the state, never the name
+  await expect(
+    page.getByRole("checkbox", { name: "Browser: Neues Event" }),
+  ).toBeChecked();
+  await expect(
+    page.getByRole("checkbox", { name: "On-site: Neues Event" }),
+  ).toBeDisabled();
+
   const settingsCount = await prisma.notificationSetting.count({
     where: { citizenId: citizen.entity.id },
   });
diff --git a/pnpm-monorepo/apps/playwright/tests/spynet.spec.ts b/pnpm-monorepo/apps/playwright/tests/spynet.spec.ts
index 0b780648d..8b934eb5c 100644
--- a/pnpm-monorepo/apps/playwright/tests/spynet.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/spynet.spec.ts
@@ -205,29 +205,28 @@ const exerciseSettingsRecordCrud = async (
     timeout: ACTION_FEEDBACK_TIMEOUT,
   });
 
-  /**
-   * The record's actions menu is an icon-only popover trigger, and a late
-   * router.refresh() re-render can unmount the open popover — so opening
-   * an action retries the whole open-popover-then-click sequence.
-   */
   const actionsTrigger = (record: string) =>
     tile
       .locator("li, tr, article, div")
       .filter({ hasText: record })
-      .getByRole("button")
+      .getByRole("button", { name: "Aktionen" })
       .last();
-  const openRowAction = (
+  /**
+   * The menu stays open behind the modal it opened, so by the delete step it
+   * is already showing — opening it again would toggle it shut and detach
+   * the button before the click lands.
+   */
+  const openRowAction = async (
     record: string,
     actionLabel: string,
     reaction: Locator,
-  ) =>
-    expect(async () => {
-      const actionButton = page.getByRole("button", { name: actionLabel });
-      if (!(await actionButton.isVisible()))
-        await actionsTrigger(record).click({ timeout: 1_000 });
-      await actionButton.click({ timeout: 1_000 });
-      await expect(reaction).toBeVisible({ timeout: 1_000 });
-    }).toPass({ timeout: ACTION_FEEDBACK_TIMEOUT });
+  ) => {
+    const actionButton = page.getByRole("button", { name: actionLabel });
+    if (!(await actionButton.isVisible()))
+      await clickUntilVisible(actionsTrigger(record), actionButton);
+    await actionButton.click();
+    await expect(reaction).toBeVisible({ timeout: ACTION_FEEDBACK_TIMEOUT });
+  };
 
   // Update
   const updateModal = modal(page, "Bearbeiten");
diff --git a/pnpm-monorepo/apps/playwright/tests/tasks.spec.ts b/pnpm-monorepo/apps/playwright/tests/tasks.spec.ts
index 549333dbf..a5628b769 100644
--- a/pnpm-monorepo/apps/playwright/tests/tasks.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/tasks.spec.ts
@@ -6,7 +6,6 @@ import {
   ACTION_FEEDBACK_TIMEOUT,
   clickUntilVisible,
   modal,
-  openInlineEditor,
   saveInlineEditor,
 } from "../fixtures/interactions";
 import { expect, test } from "../fixtures/test";
@@ -80,7 +79,7 @@ test("a task can be created and two of its fields edited through the shared fact
   // Two different fields of the shared field-update factory: title …
   await page.getByRole("link", { name: /Erztransport eskortieren/ }).click();
   const titleInput = page.locator('input[name="title"]');
-  await openInlineEditor(editButtons(page).first(), titleInput);
+  await clickUntilVisible(editButtons(page).first(), titleInput);
   await titleInput.fill("Titan-Erz eskortieren");
   await saveInlineEditor(page);
   await expect(editButtons(page).first()).toContainText(
@@ -91,7 +90,7 @@ test("a task can be created and two of its fields edited through the shared fact
   // … and description
   const descriptionSection = tileSection(page, "Beschreibung");
   const descriptionInput = page.locator('textarea[name="description"]');
-  await openInlineEditor(editButtons(descriptionSection), descriptionInput);
+  await clickUntilVisible(editButtons(descriptionSection), descriptionInput);
   await descriptionInput.fill("Begleitschutz von Lorville nach Everus Harbor.");
   await saveInlineEditor(page);
   await expect(descriptionSection).toContainText(
diff --git a/pnpm-monorepo/apps/playwright/tests/unleash.spec.ts b/pnpm-monorepo/apps/playwright/tests/unleash.spec.ts
index 414504593..cf2fd6631 100644
--- a/pnpm-monorepo/apps/playwright/tests/unleash.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/unleash.spec.ts
@@ -4,16 +4,16 @@ import { expect, test } from "../fixtures/test";
 import { setUnleashFlag, UNLEASH_FLAG } from "../fixtures/unleash";
 
 /**
- * Flag changes reach the app only after its 30 second definitions cache
- * expires (see the app's getUnleashFlag), so every state assertion polls
- * with a timeout well above that. Both flag states are asserted, so a
- * timeout here means the app did not pick up the change from the stack's
- * Unleash container — not that the default kicked in.
+ * The stack runs the app with a one second flag cache
+ * (UNLEASH_REVALIDATE_SECONDS, see setup/stack.ts), so a toggle shows up
+ * after roughly one navigation. The headroom is for suite load. Both flag
+ * states are asserted, so a timeout here means the app did not pick up the
+ * change from the stack's Unleash container — not that the default kicked in.
  */
-const FLAG_PROPAGATION_TIMEOUT = 90_000;
-const FLAG_PROPAGATION_INTERVALS = [2_000];
+const FLAG_PROPAGATION_TIMEOUT = 30_000;
+const FLAG_PROPAGATION_INTERVALS = [1_000];
 /** Two polled flag states plus navigations per test */
-const FLAG_TEST_TIMEOUT = 300_000;
+const FLAG_TEST_TIMEOUT = 120_000;
 
 /**
  * Navigates and reports whether the element shows up. The wait covers
diff --git a/pnpm-monorepo/apps/playwright/tests/variant-wiki.spec.ts b/pnpm-monorepo/apps/playwright/tests/variant-wiki.spec.ts
index d5d8e70e1..95a774d9e 100644
--- a/pnpm-monorepo/apps/playwright/tests/variant-wiki.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/variant-wiki.spec.ts
@@ -344,13 +344,15 @@ test("the update variant modal links a wiki page", async ({
   await page.goto(
     `/app/fleet/settings/manufacturer/${manufacturer.id}/series/${series.id}`,
   );
-  // The row's unnamed ellipsis button opens the actions popover
   const editButton = page.getByRole("button", {
     name: "Bearbeiten",
     exact: true,
   });
   await clickUntilVisible(
-    page.getByRole("row").filter({ hasText: variant.name }).getByRole("button"),
+    page
+      .getByRole("row")
+      .filter({ hasText: variant.name })
+      .getByRole("button", { name: "Aktionen" }),
     editButton,
   );
 
diff --git a/pnpm-monorepo/apps/playwright/tests/wiki-editing.spec.ts b/pnpm-monorepo/apps/playwright/tests/wiki-editing.spec.ts
index 17a9a4bd9..bf6350beb 100644
--- a/pnpm-monorepo/apps/playwright/tests/wiki-editing.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/wiki-editing.spec.ts
@@ -70,7 +70,7 @@ test("the slash palette opens and inserts a block", async ({
   // the empty page starts with an empty paragraph, so this is a block start
   await page.keyboard.type("/");
 
-  const palette = page.getByRole("dialog");
+  const palette = page.getByRole("dialog", { name: "Vorschläge" });
   await expect(
     palette.locator("[data-suggestion-index]:visible").first(),
   ).toBeVisible();
diff --git a/pnpm-monorepo/apps/playwright/tests/wiki-mentions.spec.ts b/pnpm-monorepo/apps/playwright/tests/wiki-mentions.spec.ts
index 06ae68c89..3d45724da 100644
--- a/pnpm-monorepo/apps/playwright/tests/wiki-mentions.spec.ts
+++ b/pnpm-monorepo/apps/playwright/tests/wiki-mentions.spec.ts
@@ -13,7 +13,7 @@ const insertMention = async (
   handle: string,
 ) => {
   await page.keyboard.type(`@${handle.slice(0, 5)}`);
-  const menu = page.getByRole("dialog");
+  const menu = page.getByRole("dialog", { name: "Vorschläge" });
   await menu
     .locator("[data-suggestion-index]:visible", { hasText: handle })
     .first()