diff --git a/ui/api/kafka/actions.ts b/ui/api/kafka/actions.ts
index 68c5b80e7..23fcf7377 100644
--- a/ui/api/kafka/actions.ts
+++ b/ui/api/kafka/actions.ts
@@ -66,7 +66,6 @@ export async function getKafkaCluster(
   try {
     const res = await fetch(url, {
       headers: await getHeaders(),
-      cache: "reload",
     });
     if (res.status === 200) {
       const rawData = await res.json();
diff --git a/ui/api/messages/actions.ts b/ui/api/messages/actions.ts
index 2fb1a2b57..2ea6e62a3 100644
--- a/ui/api/messages/actions.ts
+++ b/ui/api/messages/actions.ts
@@ -75,7 +75,6 @@ export async function getTopicMessages(
   );
   const res = await fetch(url, {
     headers: await getHeaders(),
-    cache: "no-store",
     next: { tags: [`messages-${topicId}`] },
   });
   const rawData = await res.json();
diff --git a/ui/api/topics/actions.ts b/ui/api/topics/actions.ts
index 391309cc9..945c5779a 100644
--- a/ui/api/topics/actions.ts
+++ b/ui/api/topics/actions.ts
@@ -17,7 +17,6 @@ import {
 import { filterUndefinedFromObj } from "@/utils/filterUndefinedFromObj";
 import { logger } from "@/utils/logger";
 import { getSession, setSession } from "@/utils/session";
-import { revalidateTag } from "next/cache";
 
 const log = logger.child({ module: "topics-api" });
 
@@ -121,9 +120,6 @@ export async function createTopic(
   log.debug({ url, rawData }, "createTopic response");
   const response = TopicCreateResponseSchema.parse(rawData);
   log.debug(response, "createTopic response parsed");
-  if (validateOnly === false) {
-    revalidateTag("topics");
-  }
   return response;
 }
 
@@ -155,7 +151,6 @@ export async function updateTopic(
   log.debug({ status: res.status }, "updateTopic response");
   try {
     if (res.status === 204) {
-      revalidateTag(`topic-${topicId}`);
       return true;
     } else {
       const rawData = await res.json();
@@ -181,7 +176,6 @@ export async function deleteTopic(
     const success = res.status === 204;
     if (success) {
       log.debug({ url }, "deleteTopic success");
-      revalidateTag("topics");
     }
     return success;
   } catch (e) {
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/NodeBreadcrumb.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/NodeBreadcrumb.tsx
index 9ee444c30..e3f8945b6 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/NodeBreadcrumb.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/NodeBreadcrumb.tsx
@@ -6,8 +6,6 @@ import { Skeleton } from "@patternfly/react-core";
 import { notFound } from "next/navigation";
 import { Suspense } from "react";
 
-export const fetchCache = "force-cache";
-
 export async function NodeBreadcrumb({
   params: { kafkaId, nodeId },
 }: {
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/configuration/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/configuration/page.tsx
index 04b3c5a3c..4b0583325 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/configuration/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/configuration/page.tsx
@@ -1,4 +1,3 @@
 import { NodeBreadcrumb } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/NodeBreadcrumb";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/nodes/[nodeId]/NodeBreadcrumb";
 export default NodeBreadcrumb;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb.tsx
index cf8a9cece..28df70810 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb.tsx
@@ -3,8 +3,6 @@ import { KafkaTopicParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/to
 import { BreadcrumbLink } from "@/components/Navigation/BreadcrumbLink";
 import { BreadcrumbItem } from "@/libs/patternfly/react-core";
 
-export const fetchCache = "force-cache";
-
 export async function TopicBreadcrumb({
   params: { kafkaId, topicId },
 }: {
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/configuration/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/configuration/page.tsx
index 7c2988070..b3458fcd0 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/configuration/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/configuration/page.tsx
@@ -1,4 +1,3 @@
 import { TopicBreadcrumb } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 export default TopicBreadcrumb;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/consumer-groups/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/consumer-groups/page.tsx
index 7c2988070..b3458fcd0 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/consumer-groups/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/consumer-groups/page.tsx
@@ -1,4 +1,3 @@
 import { TopicBreadcrumb } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 export default TopicBreadcrumb;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/messages/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/messages/page.tsx
index 7c2988070..b3458fcd0 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/messages/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/messages/page.tsx
@@ -1,4 +1,3 @@
 import { TopicBreadcrumb } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 export default TopicBreadcrumb;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/partitions/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/partitions/page.tsx
index 7c2988070..b3458fcd0 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/partitions/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/partitions/page.tsx
@@ -1,4 +1,3 @@
 import { TopicBreadcrumb } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 export default TopicBreadcrumb;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/schema-registry/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/schema-registry/page.tsx
index 7c2988070..b3458fcd0 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/schema-registry/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/schema-registry/page.tsx
@@ -1,4 +1,3 @@
 import { TopicBreadcrumb } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@activeBreadcrumb/topics/[topicId]/TopicBreadcrumb";
 export default TopicBreadcrumb;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/KafkaHeader.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/KafkaHeader.tsx
index 9f906d242..7238100f2 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/KafkaHeader.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/KafkaHeader.tsx
@@ -6,8 +6,6 @@ import { Skeleton } from "@patternfly/react-core";
 import { notFound } from "next/navigation";
 import { Suspense } from "react";
 
-export const fetchCache = "force-cache";
-
 export function KafkaHeader({ params: { kafkaId } }: { params: KafkaParams }) {
   return (
     <Suspense fallback={<AppHeader title={<Skeleton width="35%" />} />}>
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/consumer-groups/[groupId]/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/consumer-groups/[groupId]/page.tsx
index 58e581c5d..1bd4d1fcc 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/consumer-groups/[groupId]/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/consumer-groups/[groupId]/page.tsx
@@ -5,8 +5,6 @@ import { Suspense } from "react";
 import { useTranslations } from "next-intl";
 import { ConsumerGroupActionButton } from "./ConsumerGroupActionButton";
 
-export const fetchCache = "force-cache";
-
 export default function Page({
   params: { kafkaId, groupId },
 }: {
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/NodeHeader.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/NodeHeader.tsx
index e6ad903d5..cfcbe6165 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/NodeHeader.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/NodeHeader.tsx
@@ -5,8 +5,6 @@ import { Skeleton } from "@patternfly/react-core";
 import { notFound } from "next/navigation";
 import { Suspense } from "react";
 
-export const fetchCache = "force-cache";
-
 export async function NodeHeader({
   params: { kafkaId, nodeId },
 }: {
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/configuration/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/configuration/page.tsx
index 09dfc0918..c1e74b42e 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/configuration/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/configuration/page.tsx
@@ -1,4 +1,3 @@
 import { NodeHeader } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/NodeHeader";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/nodes/[nodeId]/NodeHeader";
 export default NodeHeader;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/overview/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/overview/page.tsx
index 2dce3a70e..9495a14c2 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/overview/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/overview/page.tsx
@@ -8,8 +8,6 @@ import { Skeleton } from "@patternfly/react-core";
 import { notFound } from "next/navigation";
 import { Suspense } from "react";
 
-export const fetchCache = "force-cache";
-
 export default function Header({
   params: { kafkaId },
 }: {
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/schema-registry/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/schema-registry/page.tsx
index cf868ac5c..a35fb2b8f 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/schema-registry/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/schema-registry/page.tsx
@@ -1,4 +1,3 @@
 import { KafkaHeader } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/KafkaHeader";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/KafkaHeader";
 export default KafkaHeader;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader.tsx
index 74d7d6c0a..ce7796acc 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader.tsx
@@ -16,19 +16,22 @@ import { Skeleton } from "@patternfly/react-core";
 import { notFound } from "next/navigation";
 import { ReactNode, Suspense } from "react";
 
-export const fetchCache = "force-cache";
+export type TopicHeaderProps = {
+  params: KafkaTopicParams;
+  showRefresh?: boolean;
+};
 
 export function TopicHeader({
   params: { kafkaId, topicId },
-}: {
-  params: KafkaTopicParams;
-}) {
+  showRefresh,
+}: TopicHeaderProps) {
   const portal = <div key={"topic-header-portal"} id={"topic-header-portal"} />;
   return (
     <Suspense
       fallback={
         <AppHeader
           title={<Skeleton width="35%" />}
+          showRefresh={showRefresh}
           navigation={
             <PageNavigation>
               <Nav aria-label="Group section navigation" variant="tertiary">
@@ -77,16 +80,22 @@ export function TopicHeader({
         />
       }
     >
-      <ConnectedTopicHeader params={{ kafkaId, topicId }} portal={portal} />
+      <ConnectedTopicHeader
+        params={{ kafkaId, topicId }}
+        portal={portal}
+        showRefresh={showRefresh}
+      />
     </Suspense>
   );
 }
 
 async function ConnectedTopicHeader({
   params: { kafkaId, topicId },
+  showRefresh,
   portal,
 }: {
   params: KafkaTopicParams;
+  showRefresh?: boolean;
   portal: ReactNode;
 }) {
   const cluster = await getKafkaCluster(kafkaId);
@@ -102,6 +111,7 @@ async function ConnectedTopicHeader({
           {topic?.meta?.managed === true && <ManagedTopicLabel />}
         </>
       }
+      showRefresh={showRefresh}
       navigation={
         <PageNavigation>
           <Nav aria-label="Group section navigation" variant="tertiary">
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/configuration/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/configuration/page.tsx
index 788769cca..66b7f2811 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/configuration/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/configuration/page.tsx
@@ -1,4 +1,3 @@
 import { TopicHeader } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 export default TopicHeader;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/consumer-groups/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/consumer-groups/page.tsx
index 788769cca..66b7f2811 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/consumer-groups/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/consumer-groups/page.tsx
@@ -1,4 +1,3 @@
 import { TopicHeader } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 export default TopicHeader;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/messages/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/messages/page.tsx
index 788769cca..98775bd08 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/messages/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/messages/page.tsx
@@ -1,4 +1,10 @@
-import { TopicHeader } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
+import {
+  TopicHeader,
+  TopicHeaderProps,
+} from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
-export default TopicHeader;
+export default function TopicHeaderNoRefresh(
+  props: Omit<TopicHeaderProps, "showRefresh">,
+) {
+  return <TopicHeader {...props} showRefresh={false} />;
+}
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/partitions/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/partitions/page.tsx
index 788769cca..66b7f2811 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/partitions/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/partitions/page.tsx
@@ -1,4 +1,3 @@
 import { TopicHeader } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 export default TopicHeader;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/schema-registry/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/schema-registry/page.tsx
index 788769cca..66b7f2811 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/schema-registry/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/schema-registry/page.tsx
@@ -1,4 +1,3 @@
 import { TopicHeader } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 
-export { fetchCache } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/@header/topics/[topicId]/TopicHeader";
 export default TopicHeader;
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@modal/topics/[topicId]/delete/DeleteTopicModal.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@modal/topics/[topicId]/delete/DeleteTopicModal.tsx
index 88582dce1..1441b7ea6 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@modal/topics/[topicId]/delete/DeleteTopicModal.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/@modal/topics/[topicId]/delete/DeleteTopicModal.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { KafkaParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/kafka.params";
 import { DeleteModal } from "@/components/DeleteModal";
-import { useRouter } from "@/navigation";
+import { useRouter } from "@/i18n/routing";
 import { useTranslations } from "next-intl";
 import { useParams } from "next/navigation";
 import { useState, useTransition } from "react";
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/KafkaSwitcher.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/KafkaSwitcher.tsx
index 912f2a107..469d18b12 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/KafkaSwitcher.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/KafkaSwitcher.tsx
@@ -8,7 +8,7 @@ import {
   MenuToggle,
   SearchInput,
 } from "@/libs/patternfly/react-core";
-import { Link, useRouter } from "@/navigation";
+import { Link, useRouter } from "@/i18n/routing";
 import { Route } from "next";
 import { CSSProperties, useState } from "react";
 
@@ -49,9 +49,7 @@ export function KafkaSwitcher<T extends string>({
     .filter(
       (b) =>
         searchText === "" ||
-        b.attributes.name
-          .toLowerCase()
-          .includes(searchText.toLowerCase()),
+        b.attributes.name.toLowerCase().includes(searchText.toLowerCase()),
     )
     .map(clusterToDropdownItem);
   return (
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/ConnectedConsumerGroupTable.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/ConnectedConsumerGroupTable.tsx
index 679241437..8eea45429 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/ConnectedConsumerGroupTable.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/ConnectedConsumerGroupTable.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { ConsumerGroup, ConsumerGroupState } from "@/api/consumerGroups/schema";
-import { useRouter } from "@/navigation";
+import { useRouter } from "@/i18n/routing";
 import { useFilterParams } from "@/utils/useFilterParams";
 import { useOptimistic, useState, useTransition } from "react";
 import {
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/ConsumerGroupsTable.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/ConsumerGroupsTable.tsx
index 01f8cc133..c7e5c9582 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/ConsumerGroupsTable.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/ConsumerGroupsTable.tsx
@@ -8,7 +8,7 @@ import {
   HelpIcon,
   InfoCircleIcon,
 } from "@/libs/patternfly/react-icons";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { useTranslations } from "next-intl";
 import { ReactNode, useEffect, useState } from "react";
 
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/[groupId]/LagTable.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/[groupId]/LagTable.tsx
index b80cedeb1..c6862f615 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/[groupId]/LagTable.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/[groupId]/LagTable.tsx
@@ -3,7 +3,7 @@ import { Number } from "@/components/Format/Number";
 import { ResponsiveTable } from "@/components/Table";
 import { Tooltip } from "@/libs/patternfly/react-core";
 import { HelpIcon } from "@/libs/patternfly/react-icons";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { TableVariant } from "@patternfly/react-table";
 import { useTranslations } from "next-intl";
 
@@ -40,9 +40,7 @@ export function LagTable({
             return (
               <Th key={key}>
                 {t("committed_offset")}{" "}
-                <Tooltip
-                  content={t("committed_offset_tooltip")}
-                >
+                <Tooltip content={t("committed_offset_tooltip")}>
                   <HelpIcon />
                 </Tooltip>
               </Th>
@@ -51,9 +49,7 @@ export function LagTable({
             return (
               <Th key={key}>
                 {t("end_offset")}{" "}
-                <Tooltip
-                  content={t("end_offset_tooltip")}
-                >
+                <Tooltip content={t("end_offset_tooltip")}>
                   <HelpIcon />
                 </Tooltip>
               </Th>
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/[groupId]/reset-offset/ResetConsumerOffset.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/[groupId]/reset-offset/ResetConsumerOffset.tsx
index 26b389ae8..8ed558cae 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/[groupId]/reset-offset/ResetConsumerOffset.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/[groupId]/reset-offset/ResetConsumerOffset.tsx
@@ -7,7 +7,7 @@ import {
   TopicSelection,
   partitionSelection,
 } from "../types";
-import { useRouter } from "@/navigation";
+import { useRouter } from "@/i18n/routing";
 import {
   getDryrunResult,
   updateConsumerGroup,
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/page.tsx
index f08e71f1d..fcb8b3a82 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/consumer-groups/page.tsx
@@ -40,7 +40,7 @@ export default function ConsumerGroupsPage({
     | ConsumerGroupState[]
     | undefined;
   return (
-    <PageSection>
+    <PageSection isFilled={true}>
       <Suspense
         fallback={
           <ConnectedConsumerGroupTable
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/[nodeId]/configuration/ConfigTable.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/[nodeId]/configuration/ConfigTable.tsx
index c991c4dbe..4cc0a093e 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/[nodeId]/configuration/ConfigTable.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/[nodeId]/configuration/ConfigTable.tsx
@@ -3,7 +3,7 @@
 import { NodeConfig } from "@/api/nodes/schema";
 import { Number } from "@/components/Format/Number";
 import { TableView } from "@/components/Table";
-import { usePathname, useRouter } from "@/navigation";
+import { usePathname, useRouter } from "@/i18n/routing";
 import { Label, LabelGroup, List, ListItem } from "@patternfly/react-core";
 import { TableVariant } from "@patternfly/react-table";
 import { useTranslations } from "next-intl";
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/[nodeId]/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/[nodeId]/page.tsx
index 2c135a8af..998c6ee13 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/[nodeId]/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/[nodeId]/page.tsx
@@ -1,5 +1,5 @@
 import { KafkaNodeParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/kafkaNode.params";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 
 export default function NodePage({ params }: { params: KafkaNodeParams }) {
   redirect(`/kafka/${params.kafkaId}/nodes/${params.nodeId}/configuration`);
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/page.tsx
index ac801d29d..9cdd0519f 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/page.tsx
@@ -6,7 +6,7 @@ import {
   NodesTable,
 } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/nodes/NodesTable";
 import { Alert, PageSection } from "@/libs/patternfly/react-core";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 import { getTranslations } from "next-intl/server";
 import { Suspense } from "react";
 
@@ -71,7 +71,7 @@ async function ConnectedNodes({ params }: { params: KafkaParams }) {
   return (
     <>
       {!kpis && (
-        <PageSection>
+        <PageSection isFilled={true}>
           <Alert title={t("nodes.kpis_offline")} variant={"warning"} />
         </PageSection>
       )}
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/page.tsx
index 087acf721..2d31d7503 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/page.tsx
@@ -1,5 +1,5 @@
 import { KafkaParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/kafka.params";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 
 export const dynamic = "force-dynamic";
 
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/(page)/ConnectedTopicsTable.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/(page)/ConnectedTopicsTable.tsx
index 0e0853406..3b912e92e 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/(page)/ConnectedTopicsTable.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/(page)/ConnectedTopicsTable.tsx
@@ -6,7 +6,7 @@ import {
   TopicsTableColumn,
   TopicsTableColumns,
 } from "@/components/TopicsTable/TopicsTable";
-import { useRouter } from "@/navigation";
+import { useRouter } from "@/i18n/routing";
 import { isReadonly } from "@/utils/env";
 import { useFilterParams } from "@/utils/useFilterParams";
 import { useOptimistic, useTransition } from "react";
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/(page)/post-delete/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/(page)/post-delete/page.tsx
index 26702db2d..9a5643e2f 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/(page)/post-delete/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/(page)/post-delete/page.tsx
@@ -1,12 +1,10 @@
 import { KafkaParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/kafka.params";
 import { RedirectOnLoad } from "@/components/Navigation/RedirectOnLoad";
-import { revalidatePath } from "next/cache";
 
 export default function PostDeletePage({
   params: { kafkaId },
 }: {
   params: KafkaParams;
 }) {
-  revalidatePath(`/kafka/${kafkaId}/topics`, "page");
   return <RedirectOnLoad url={`/kafka/${kafkaId}/topics`} />;
 }
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/configuration/ConfigTable.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/configuration/ConfigTable.tsx
index 01a5b6351..88a05120f 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/configuration/ConfigTable.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/configuration/ConfigTable.tsx
@@ -4,7 +4,7 @@ import { Error } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create
 import { topicMutateErrorToFieldError } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/topicMutateErrorToFieldError";
 import { Number } from "@/components/Format/Number";
 import { ResponsiveTableProps, TableView } from "@/components/Table";
-import { usePathname, useRouter } from "@/navigation";
+import { usePathname, useRouter } from "@/i18n/routing";
 import { isReadonly } from "@/utils/env";
 import {
   Button,
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/configuration/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/configuration/page.tsx
index 9117b610d..eeddb8464 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/configuration/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/configuration/page.tsx
@@ -1,7 +1,7 @@
 import { getTopic, updateTopic } from "@/api/topics/actions";
 import { KafkaTopicParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/kafkaTopic.params";
 import { PageSection } from "@/libs/patternfly/react-core";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 import { isReadonly } from "@/utils/env";
 import { Suspense } from "react";
 import { ConfigTable } from "./ConfigTable";
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/consumer-groups/ConsumerGroupsTable.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/consumer-groups/ConsumerGroupsTable.tsx
index 81d11dbf1..ea59f4932 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/consumer-groups/ConsumerGroupsTable.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/consumer-groups/ConsumerGroupsTable.tsx
@@ -6,7 +6,7 @@ import { LabelLink } from "@/components/Navigation/LabelLink";
 import { TableView } from "@/components/Table";
 import { LabelGroup, Tooltip } from "@/libs/patternfly/react-core";
 import { HelpIcon } from "@/libs/patternfly/react-icons";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { useTranslations } from "next-intl";
 import { useEffect, useState } from "react";
 
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/messages/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/messages/page.tsx
index 4dccaa968..aa4af4eaf 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/messages/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/messages/page.tsx
@@ -1,7 +1,7 @@
 import { getTopicMessage } from "@/api/messages/actions";
 import { getTopic } from "@/api/topics/actions";
 import { KafkaTopicParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/kafkaTopic.params";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 import { ConnectedMessagesTable } from "./ConnectedMessagesTable";
 import { MessagesSearchParams, parseSearchParams } from "./parseSearchParams";
 
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/page.tsx
index cdd0f5497..c51b75eb2 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/page.tsx
@@ -1,5 +1,5 @@
 import { KafkaTopicParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/kafkaTopic.params";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 
 export default function TopicPage({ params }: { params: KafkaTopicParams }) {
   redirect(`/kafka/${params.kafkaId}/topics/${params.topicId}/messages`);
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/partitions/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/partitions/page.tsx
index 4c7660d9e..02f02888f 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/partitions/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/[topicId]/partitions/page.tsx
@@ -1,6 +1,6 @@
 import { getTopic } from "@/api/topics/actions";
 import { KafkaTopicParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/kafkaTopic.params";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 import { Suspense } from "react";
 import { PartitionsTable } from "./PartitionsTable";
 
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/CreateTopic.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/CreateTopic.tsx
index 0bee86e7a..01aa10f23 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/CreateTopic.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/CreateTopic.tsx
@@ -8,7 +8,7 @@ import {
 import { StepDetails } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/StepDetails";
 import { StepOptions } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/StepOptions";
 import { StepReview } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/StepReview";
-import { useRouter } from "@/navigation";
+import { useRouter } from "@/i18n/routing";
 import {
   Button,
   PageSection,
diff --git a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/page.tsx b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/page.tsx
index 64e9e09b8..cb1f8a44a 100644
--- a/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/page.tsx
@@ -3,7 +3,7 @@ import { createTopic } from "@/api/topics/actions";
 import { NewConfigMap } from "@/api/topics/schema";
 import { KafkaParams } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/kafka.params";
 import { CreateTopic } from "@/app/[locale]/(authorized)/kafka/[kafkaId]/topics/create/CreateTopic";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 import { isReadonly } from "@/utils/env";
 import { notFound } from "next/navigation";
 
diff --git a/ui/app/[locale]/(authorized)/kafka/page.tsx b/ui/app/[locale]/(authorized)/kafka/page.tsx
index 33bbbda79..892b4f4c5 100644
--- a/ui/app/[locale]/(authorized)/kafka/page.tsx
+++ b/ui/app/[locale]/(authorized)/kafka/page.tsx
@@ -1,6 +1,6 @@
 import { getKafkaClusters } from "@/api/kafka/actions";
 import { RedirectOnLoad } from "@/components/Navigation/RedirectOnLoad";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 
 export default function Page({}) {
   return redirect("/");
diff --git a/ui/app/[locale]/(public)/(home)/page.tsx b/ui/app/[locale]/(public)/(home)/page.tsx
index c504706aa..afa357e0b 100644
--- a/ui/app/[locale]/(public)/(home)/page.tsx
+++ b/ui/app/[locale]/(public)/(home)/page.tsx
@@ -26,7 +26,6 @@ import {
   TextContent,
   Title,
 } from "@/libs/patternfly/react-core";
-import { redirect } from "@/navigation";
 import { isProductizedBuild } from "@/utils/env";
 import { getTranslations } from "next-intl/server";
 import { Suspense } from "react";
@@ -64,8 +63,7 @@ export default async function Home() {
       <PageSection>
         <Stack hasGutter={true}>
           <StackItem>
-            <Card
-              isCompact={true} >
+            <Card isCompact={true}>
               <CardTitle>
                 <TextContent>
                   {t.rich("homepage.platform_openshift_cluster")}
diff --git a/ui/app/[locale]/(public)/kafka/[kafkaId]/login/SignInPage.tsx b/ui/app/[locale]/(public)/kafka/[kafkaId]/login/SignInPage.tsx
index 7dce7a301..2b470b5db 100644
--- a/ui/app/[locale]/(public)/kafka/[kafkaId]/login/SignInPage.tsx
+++ b/ui/app/[locale]/(public)/kafka/[kafkaId]/login/SignInPage.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { ExternalLink } from "@/components/Navigation/ExternalLink";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import {
   Alert,
   Button,
diff --git a/ui/app/[locale]/(public)/kafka/[kafkaId]/login/page.tsx b/ui/app/[locale]/(public)/kafka/[kafkaId]/login/page.tsx
index 8b44b51ba..19d2d5a03 100644
--- a/ui/app/[locale]/(public)/kafka/[kafkaId]/login/page.tsx
+++ b/ui/app/[locale]/(public)/kafka/[kafkaId]/login/page.tsx
@@ -1,5 +1,5 @@
 import { getKafkaClusters } from "@/api/kafka/actions";
-import { redirect } from "@/navigation";
+import { redirect } from "@/i18n/routing";
 import { SignInPage } from "./SignInPage";
 
 export default async function SignIn({
diff --git a/ui/app/[locale]/NextIntlProvider.tsx b/ui/app/[locale]/NextIntlProvider.tsx
index eea074c57..731081c6a 100644
--- a/ui/app/[locale]/NextIntlProvider.tsx
+++ b/ui/app/[locale]/NextIntlProvider.tsx
@@ -1,5 +1,4 @@
 "use client";
-
 import { defaultTranslationValues } from "@/i18n";
 import { AbstractIntlMessages, NextIntlClientProvider } from "next-intl";
 import { ReactNode } from "react";
@@ -20,7 +19,6 @@ export default function NextIntlProvider({
       locale={locale}
       messages={messages}
       defaultTranslationValues={defaultTranslationValues}
-      now={new Date()}
       timeZone={timeZone}
     >
       {children}
diff --git a/ui/app/[locale]/layout.tsx b/ui/app/[locale]/layout.tsx
index a26d1dd99..58a945b8e 100644
--- a/ui/app/[locale]/layout.tsx
+++ b/ui/app/[locale]/layout.tsx
@@ -1,8 +1,5 @@
-import { getAuthOptions } from "@/app/api/auth/[...nextauth]/route";
-
-import { getServerSession } from "next-auth";
-import { getTranslations } from "next-intl/server";
-import { notFound } from "next/navigation";
+import { getMessages, getTranslations } from "next-intl/server";
+import { useNow, useTimeZone } from "next-intl";
 import { ReactNode } from "react";
 import NextIntlProvider from "./NextIntlProvider";
 import "../globals.css";
@@ -13,14 +10,7 @@ type Props = {
 };
 
 export default async function Layout({ children, params: { locale } }: Props) {
-  let messages;
-  try {
-    messages = (await import(`../../messages/${locale}.json`)).default;
-  } catch (error) {
-    notFound();
-  }
-  const authOptions = await getAuthOptions();
-  const session = await getServerSession(authOptions);
+  const messages = await getMessages();
   return (
     <NextIntlProvider locale={locale} messages={messages}>
       {children}
diff --git a/ui/app/layout.tsx b/ui/app/layout.tsx
index eb99123c7..23f2be2ee 100644
--- a/ui/app/layout.tsx
+++ b/ui/app/layout.tsx
@@ -4,6 +4,9 @@ type Props = {
   children: ReactNode;
 };
 
+export const fetchCache = "force-no-store";
+export const dynamic = "force-dynamic";
+
 // Since we have a `not-found.tsx` page on the root, a layout file
 // is required, even if it's just passing children through.
 export default function RootLayout({ children }: Props) {
diff --git a/ui/components/AppHeader.tsx b/ui/components/AppHeader.tsx
index 76504eeb2..2af56f57e 100644
--- a/ui/components/AppHeader.tsx
+++ b/ui/components/AppHeader.tsx
@@ -1,3 +1,5 @@
+import { DateTime } from "@/components/Format/DateTime";
+import { RefreshButton } from "@/components/RefreshButton";
 import {
   Divider,
   Flex,
@@ -6,18 +8,22 @@ import {
   Title,
 } from "@/libs/patternfly/react-core";
 import { ReactNode } from "react";
+import { useNow } from "next-intl";
 
 export function AppHeader({
   title,
   subTitle,
   actions,
   navigation,
+  showRefresh = true,
 }: {
   title: ReactNode;
   subTitle?: ReactNode;
   actions?: ReactNode[];
   navigation?: ReactNode;
+  showRefresh?: boolean;
 }) {
+  const lastRefresh = useNow();
   return (
     <>
       <PageSection
@@ -26,26 +32,43 @@ export function AppHeader({
         className={navigation ? "pf-v5-u-px-lg pf-v5-u-pt-sm" : undefined}
         hasShadowBottom={!navigation}
       >
-        <Flex>
-          <Flex direction={{ default: "column" }}>
-            <FlexItem>
+        <Flex direction={{ default: "column" }}>
+          <Flex>
+            <FlexItem flex={{ default: "flex_1" }}>
               <Title headingLevel={"h1"}>{title}</Title>
             </FlexItem>
-            {subTitle && <FlexItem>{subTitle}</FlexItem>}
+
+            {showRefresh && (
+              <FlexItem
+                alignSelf={{ default: "alignSelfFlexEnd" }}
+                className={"pf-v5-u-font-size-sm"}
+              >
+                Last updated{" "}
+                <DateTime
+                  value={lastRefresh}
+                  dateStyle={"short"}
+                  timeStyle={"medium"}
+                  tz={"local"}
+                />
+                <RefreshButton lastRefresh={lastRefresh} />
+              </FlexItem>
+            )}
           </Flex>
-          {actions && (
-            <Flex
-              direction={{ default: "column" }}
-              align={{ default: "alignRight" }}
-              alignSelf={{ default: "alignSelfFlexEnd" }}
-            >
-              <Flex>
-                {actions.map((a, idx) => (
-                  <FlexItem key={idx}>{a}</FlexItem>
-                ))}
+          <Flex>
+            {subTitle && <FlexItem>{subTitle}</FlexItem>}
+            {actions && (
+              <Flex
+                direction={{ default: "column" }}
+                align={{ default: "alignRight" }}
+              >
+                <Flex alignSelf={{ default: "alignSelfFlexEnd" }}>
+                  {actions.map((a, idx) => (
+                    <FlexItem key={idx}>{a}</FlexItem>
+                  ))}
+                </Flex>
               </Flex>
-            </Flex>
-          )}
+            )}
+          </Flex>
         </Flex>
       </PageSection>
       {navigation}
diff --git a/ui/components/ClusterOverview/ClusterCard.tsx b/ui/components/ClusterOverview/ClusterCard.tsx
index 8632cf5a1..e3f0d4d83 100644
--- a/ui/components/ClusterOverview/ClusterCard.tsx
+++ b/ui/components/ClusterOverview/ClusterCard.tsx
@@ -26,7 +26,7 @@ import {
   ExclamationCircleIcon,
   ExclamationTriangleIcon,
 } from "@/libs/patternfly/react-icons";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { useTranslations } from "next-intl";
 import { ErrorsAndWarnings } from "./components/ErrorsAndWarnings";
 
diff --git a/ui/components/ClusterOverview/PageLayout.tsx b/ui/components/ClusterOverview/PageLayout.tsx
index efc26bdfb..e5c7a0169 100644
--- a/ui/components/ClusterOverview/PageLayout.tsx
+++ b/ui/components/ClusterOverview/PageLayout.tsx
@@ -1,3 +1,4 @@
+import { DateTime } from "@/components/Format/DateTime";
 import {
   Flex,
   FlexItem,
@@ -5,6 +6,7 @@ import {
   GridItem,
   PageSection,
 } from "@/libs/patternfly/react-core";
+import { Link } from "@/i18n/routing";
 import { ReactNode, Suspense } from "react";
 import { ClusterCard } from "./ClusterCard";
 import { ClusterChartsCard } from "./ClusterChartsCard";
diff --git a/ui/components/ClusterOverview/TopicsPartitionsCard.tsx b/ui/components/ClusterOverview/TopicsPartitionsCard.tsx
index 368bee619..d87a26117 100644
--- a/ui/components/ClusterOverview/TopicsPartitionsCard.tsx
+++ b/ui/components/ClusterOverview/TopicsPartitionsCard.tsx
@@ -19,7 +19,7 @@ import {
   ExclamationTriangleIcon,
   HelpIcon,
 } from "@/libs/patternfly/react-icons";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { useTranslations } from "next-intl";
 
 type TopicsPartitionsCardProps = {
@@ -38,15 +38,18 @@ export function TopicsPartitionsCard({
 }:
   | ({ isLoading: false } & TopicsPartitionsCardProps)
   | ({
-    isLoading: true;
-  } & Partial<{ [key in keyof TopicsPartitionsCardProps]?: undefined }>)) {
-
+      isLoading: true;
+    } & Partial<{ [key in keyof TopicsPartitionsCardProps]?: undefined }>)) {
   const t = useTranslations();
   return (
     <Card component={"div"}>
       <CardHeader
         actions={{
-          actions: <Link href={"./topics"}>{t("ClusterOverview.view_all_topics")}</Link>,
+          actions: (
+            <Link href={"./topics"}>
+              {t("ClusterOverview.view_all_topics")}
+            </Link>
+          ),
         }}
       >
         <CardTitle>{t("ClusterOverview.topic_header")}</CardTitle>
@@ -67,7 +70,8 @@ export function TopicsPartitionsCard({
                     <TextContent>
                       <Text component={"small"}>
                         <Link href={"./topics"}>
-                          <Number value={topicsTotal} /> {t("ClusterOverview.total_topics")}
+                          <Number value={topicsTotal} />{" "}
+                          {t("ClusterOverview.total_topics")}
                         </Link>
                       </Text>
                     </TextContent>
@@ -111,7 +115,11 @@ export function TopicsPartitionsCard({
                     <CheckCircleIcon />
                   </Icon>
                   &nbsp;{t("ClusterOverview.fully_replicated_partition")}&nbsp;
-                  <Tooltip content={t("ClusterOverview.fully_replicated_partition_tooltip")}>
+                  <Tooltip
+                    content={t(
+                      "ClusterOverview.fully_replicated_partition_tooltip",
+                    )}
+                  >
                     <HelpIcon />
                   </Tooltip>
                 </Text>
@@ -135,7 +143,11 @@ export function TopicsPartitionsCard({
                     <ExclamationTriangleIcon />
                   </Icon>
                   &nbsp;{t("ClusterOverview.under_replicated_partition")}&nbsp;
-                  <Tooltip content={t("ClusterOverview.under_replicated_partition_tooltip")}>
+                  <Tooltip
+                    content={t(
+                      "ClusterOverview.under_replicated_partition_tooltip",
+                    )}
+                  >
                     <HelpIcon />
                   </Tooltip>
                 </Text>
@@ -163,7 +175,9 @@ export function TopicsPartitionsCard({
                     <ExclamationCircleIcon />
                   </Icon>
                   &nbsp;{t("ClusterOverview.unavailable_partition")}&nbsp;
-                  <Tooltip content={t("ClusterOverview.unavailable_partition_tooltip")}>
+                  <Tooltip
+                    content={t("ClusterOverview.unavailable_partition_tooltip")}
+                  >
                     <HelpIcon />
                   </Tooltip>
                 </Text>
diff --git a/ui/components/ClusterOverview/components/TopicsTable.tsx b/ui/components/ClusterOverview/components/TopicsTable.tsx
index 483a33542..f410dadcc 100644
--- a/ui/components/ClusterOverview/components/TopicsTable.tsx
+++ b/ui/components/ClusterOverview/components/TopicsTable.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { ViewedTopic } from "@/api/topics/actions";
 import { ResponsiveTable } from "@/components/Table";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { Truncate } from "@patternfly/react-core";
 import { TableVariant } from "@patternfly/react-table";
 import { useTranslations } from "next-intl";
diff --git a/ui/components/Format/DateTime.tsx b/ui/components/Format/DateTime.tsx
index b35e28559..ae0b6dd8c 100644
--- a/ui/components/Format/DateTime.tsx
+++ b/ui/components/Format/DateTime.tsx
@@ -23,9 +23,14 @@ export function DateTime({
   if (!isDate(maybeDate)) {
     return empty;
   }
-  return format.dateTime(maybeDate, {
+  const formattedDt = format.dateTime(maybeDate, {
     dateStyle,
     timeStyle,
     timeZone: tz === "local" ? undefined : "UTC",
   });
+  return (
+    <time dateTime={maybeDate.toISOString()} suppressHydrationWarning={true}>
+      {formattedDt}
+    </time>
+  );
 }
diff --git a/ui/components/NavExpandable.tsx b/ui/components/NavExpandable.tsx
index 22475eda1..25aff80a3 100644
--- a/ui/components/NavExpandable.tsx
+++ b/ui/components/NavExpandable.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { usePathname } from "@/navigation";
+import { usePathname } from "@/i18n/routing";
 import {
   NavExpandable as PFNavExpendable,
   NavExpandableProps,
diff --git a/ui/components/Navigation/BreadcrumbLink.tsx b/ui/components/Navigation/BreadcrumbLink.tsx
index 21b65b93f..3782d19f2 100644
--- a/ui/components/Navigation/BreadcrumbLink.tsx
+++ b/ui/components/Navigation/BreadcrumbLink.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { BreadcrumbItem } from "@/libs/patternfly/react-core";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { BreadcrumbItemProps } from "@patternfly/react-core";
 import { Route } from "next";
 
diff --git a/ui/components/Navigation/ButtonLink.tsx b/ui/components/Navigation/ButtonLink.tsx
index 679a62ac3..7a2285263 100644
--- a/ui/components/Navigation/ButtonLink.tsx
+++ b/ui/components/Navigation/ButtonLink.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { ButtonProps } from "@/libs/patternfly/react-core";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { Route } from "next";
 
 export function ButtonLink<T extends string>({
diff --git a/ui/components/Navigation/LabelLink.tsx b/ui/components/Navigation/LabelLink.tsx
index 01e55c203..1ddce29c6 100644
--- a/ui/components/Navigation/LabelLink.tsx
+++ b/ui/components/Navigation/LabelLink.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { Label, LabelProps } from "@/libs/patternfly/react-core";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { Route } from "next";
 
 export function LabelLink<T extends string>({
diff --git a/ui/components/Navigation/NavItemLink.tsx b/ui/components/Navigation/NavItemLink.tsx
index 8a9cad4e1..4c5fba704 100644
--- a/ui/components/Navigation/NavItemLink.tsx
+++ b/ui/components/Navigation/NavItemLink.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { NavItem } from "@/libs/patternfly/react-core";
-import { Link, usePathname } from "@/navigation";
+import { Link, usePathname } from "@/i18n/routing";
 import { Route } from "next";
 import { PropsWithChildren } from "react";
 
diff --git a/ui/components/Navigation/RedirectOnLoad.tsx b/ui/components/Navigation/RedirectOnLoad.tsx
index 6febeb8fb..63de5eb57 100644
--- a/ui/components/Navigation/RedirectOnLoad.tsx
+++ b/ui/components/Navigation/RedirectOnLoad.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { EmptyStateLoading } from "@/components/EmptyStateLoading";
-import { useRouter } from "@/navigation";
+import { useRouter } from "@/i18n/routing";
 import { useEffect } from "react";
 
 export function RedirectOnLoad({ url }: { url: string }) {
diff --git a/ui/components/RefreshButton.stories.tsx b/ui/components/RefreshButton.stories.tsx
index 0e6d81f53..e187baba1 100644
--- a/ui/components/RefreshButton.stories.tsx
+++ b/ui/components/RefreshButton.stories.tsx
@@ -21,28 +21,3 @@ export const Default: Story = {
     await expect(args.onClick).toBeCalledTimes(1);
   },
 };
-
-export const Refreshing: Story = {
-  args: {
-    isRefreshing: true,
-    tooltip: "Data is currently refreshing",
-  },
-  play: async ({ canvasElement, args }) => {
-    const canvas = within(canvasElement);
-    await expect(canvas.getByRole("progressbar")).toBeTruthy();
-  },
-};
-
-export const Disabled: Story = {
-  args: {
-    isDisabled: true,
-  },
-  play: async ({ canvasElement, args }) => {
-    const canvas = within(canvasElement);
-    expect(canvas.getByLabelText("Refresh")).toBeDisabled();
-    await userEvent.click(canvas.getByLabelText("Refresh"), {
-      pointerEventsCheck: 0, // disable checking for the pointer event to allow clicking
-    });
-    await expect(args.onClick).toBeCalledTimes(0);
-  },
-};
diff --git a/ui/components/RefreshButton.tsx b/ui/components/RefreshButton.tsx
index 52b3349e5..310eb655b 100644
--- a/ui/components/RefreshButton.tsx
+++ b/ui/components/RefreshButton.tsx
@@ -1,23 +1,36 @@
-import { Button, Spinner, Tooltip } from "@patternfly/react-core";
-import { SyncAltIcon } from "@patternfly/react-icons";
+"use client";
+import { Button, Spinner, Tooltip } from "@/libs/patternfly/react-core";
+import { SyncAltIcon } from "@/libs/patternfly/react-icons";
+import { useRouter } from "@/i18n/routing";
+import { ButtonProps } from "@/libs/patternfly/react-core";
 import { useTranslations } from "next-intl";
+import { useState } from "react";
 
 export type RefreshButtonProps = {
-  isDisabled?: boolean;
+  lastRefresh: Date;
   tooltip?: string;
-  isRefreshing: boolean;
   ariaLabel?: string;
-  onClick: () => void;
+  onClick?: () => void;
 };
 
 export function RefreshButton({
+  lastRefresh,
   ariaLabel,
   onClick,
-  isDisabled,
   tooltip,
-  isRefreshing,
 }: RefreshButtonProps) {
   const t = useTranslations();
+  const router = useRouter();
+  const [refreshTs, setRefreshTs] = useState<Date | undefined>();
+  const handleClick: ButtonProps["onClick"] =
+    onClick ??
+    ((e) => {
+      e.preventDefault();
+      setRefreshTs(new Date());
+      router.refresh();
+    });
+
+  const isRefreshing = refreshTs !== undefined && refreshTs >= lastRefresh;
 
   const defaultTooltip = isRefreshing
     ? t("RefreshButton.refreshing_tooltip")
@@ -28,8 +41,8 @@ export function RefreshButton({
         className="pf-m-hoverable"
         variant="plain"
         aria-label={ariaLabel || t("RefreshButton.refresh_button_label")}
-        isDisabled={isDisabled}
-        onClick={isDisabled === true ? undefined : onClick}
+        isDisabled={isRefreshing}
+        onClick={isRefreshing === true ? undefined : handleClick}
         icon={
           isRefreshing === false ? <SyncAltIcon /> : <Spinner size={"md"} />
         }
diff --git a/ui/components/Table/Toolbar/SearchInput.tsx b/ui/components/Table/Toolbar/SearchInput.tsx
index 343283aa2..e887b7c66 100644
--- a/ui/components/Table/Toolbar/SearchInput.tsx
+++ b/ui/components/Table/Toolbar/SearchInput.tsx
@@ -75,7 +75,7 @@ export function SearchInput({
         trigger="manual"
         isVisible={showErrorFeedback}
         content={errorMessage}
-        ref={inputRef}
+        triggerRef={inputRef}
       />
     </InputGroup>
   );
diff --git a/ui/components/TopicsTable/TopicsTable.tsx b/ui/components/TopicsTable/TopicsTable.tsx
index 64eae30dc..7882fcd6e 100644
--- a/ui/components/TopicsTable/TopicsTable.tsx
+++ b/ui/components/TopicsTable/TopicsTable.tsx
@@ -13,7 +13,7 @@ import {
   HelpIcon,
 } from "@/libs/patternfly/react-icons";
 import { TableVariant } from "@/libs/patternfly/react-table";
-import { Link } from "@/navigation";
+import { Link } from "@/i18n/routing";
 import { Truncate } from "@patternfly/react-core";
 import { useTranslations } from "next-intl";
 import { ReactNode } from "react";
@@ -298,12 +298,12 @@ export function TopicsTable({
       actions={
         isReadOnly === false
           ? [
-            {
-              label: t("create_topic"),
-              onClick: onCreateTopic,
-              isPrimary: true,
-            },
-          ]
+              {
+                label: t("create_topic"),
+                onClick: onCreateTopic,
+                isPrimary: true,
+              },
+            ]
           : undefined
       }
       tools={[
diff --git a/ui/i18n/request.ts b/ui/i18n/request.ts
new file mode 100644
index 000000000..cb8d9189e
--- /dev/null
+++ b/ui/i18n/request.ts
@@ -0,0 +1,12 @@
+import { notFound } from "next/navigation";
+import { getRequestConfig } from "next-intl/server";
+import { routing } from "@/i18n/routing";
+
+export default getRequestConfig(async ({ locale }) => {
+  // Validate that the incoming `locale` parameter is valid
+  if (!routing.locales.includes(locale as any)) notFound();
+
+  return {
+    messages: (await import(`../../messages/${locale}.json`)).default,
+  };
+});
diff --git a/ui/i18n/routing.ts b/ui/i18n/routing.ts
new file mode 100644
index 000000000..c605909a4
--- /dev/null
+++ b/ui/i18n/routing.ts
@@ -0,0 +1,18 @@
+import { defineRouting } from "next-intl/routing";
+import { createSharedPathnamesNavigation } from "next-intl/navigation";
+
+export const locales = ["en"] as const;
+
+export const routing = defineRouting({
+  // A list of all locales that are supported
+  locales,
+
+  // Used when no locale matches
+  defaultLocale: "en",
+  localePrefix: "never",
+});
+
+// Lightweight wrappers around Next.js' navigation APIs
+// that will consider the routing configuration
+export const { Link, redirect, usePathname, useRouter } =
+  createSharedPathnamesNavigation(routing);
diff --git a/ui/middleware.ts b/ui/middleware.ts
index 1cac4b75c..8b5909822 100644
--- a/ui/middleware.ts
+++ b/ui/middleware.ts
@@ -1,4 +1,4 @@
-import { locales } from "@/navigation";
+import { locales, routing } from "@/i18n/routing";
 import withAuth from "next-auth/middleware";
 import createIntlMiddleware from "next-intl/middleware";
 import { NextRequest, NextResponse } from "next/server";
@@ -10,14 +10,7 @@ const log = logger.child({ module: "middleware" });
 const publicPages = ["/kafka/[^/]+/login", "/cluster", "/"];
 const protectedPages = ["/kafka/[^/]+/.*"];
 
-const intlMiddleware = createIntlMiddleware({
-  // A list of all locales that are supported
-  locales,
-
-  // If this locale is matched, pathnames work without a prefix (e.g. `/about`)
-  defaultLocale: "en",
-  localePrefix: "never",
-});
+const intlMiddleware = createIntlMiddleware(routing);
 
 const authMiddleware = withAuth(
   // Note that this callback is only invoked if
@@ -62,7 +55,14 @@ export default async function middleware(req: NextRequest) {
     log.trace({ requestPath: requestPath }, "protected page");
     return (authMiddleware as any)(req);
   } else {
-    log.debug({ requestPath: requestPath, publicPathnameRegex: publicPathnameRegex, protectedPathnameRegex: protectedPathnameRegex }, "neither public nor protected!");
+    log.debug(
+      {
+        requestPath: requestPath,
+        publicPathnameRegex: publicPathnameRegex,
+        protectedPathnameRegex: protectedPathnameRegex,
+      },
+      "neither public nor protected!",
+    );
     return NextResponse.redirect(new URL("/", req.url));
   }
 }
diff --git a/ui/navigation.ts b/ui/navigation.ts
deleted file mode 100644
index df7b638a1..000000000
--- a/ui/navigation.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createSharedPathnamesNavigation } from "next-intl/navigation";
-
-export const locales = ["en"] as const;
-
-export const { Link, redirect, usePathname, useRouter } =
-  createSharedPathnamesNavigation({ locales });
diff --git a/ui/next.config.js b/ui/next.config.js
index 768f1a9f9..7d7b639ad 100644
--- a/ui/next.config.js
+++ b/ui/next.config.js
@@ -22,6 +22,15 @@ const nextConfig = {
     "@patternfly/react-tokens",
     "@patternfly/react-icons",
   ],
+  logging:
+    process.env.NODE_ENV === "development"
+      ? {
+          fetches: {
+            fullUrl: true,
+            hmrRefreshes: true,
+          },
+        }
+      : undefined,
 };
 
 module.exports = withNextIntl(nextConfig);
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 9f8239d92..c92486067 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -9840,9 +9840,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001587",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz",
-      "integrity": "sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==",
+      "version": "1.0.30001663",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001663.tgz",
+      "integrity": "sha512-o9C3X27GLKbLeTYZ6HBOLU1tsAcBZsLis28wrVzddShCS16RujjHp9GDHKZqrB3meE0YjhawvMFsGb/igqiPzA==",
       "funding": [
         {
           "type": "opencollective",
@@ -9856,7 +9856,8 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
diff --git a/ui/package.json b/ui/package.json
index f61c34054..f97b11c2d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -74,4 +74,4 @@
     "storybook": "^8.1.11",
     "tsconfig-paths-webpack-plugin": "^4.1.0"
   }
-}
\ No newline at end of file
+}
diff --git a/ui/tests/playwright/BrokerPropertyPage.test.tsx b/ui/tests/playwright/BrokerPropertyPage.test.tsx
index 68ecbb804..fba482856 100644
--- a/ui/tests/playwright/BrokerPropertyPage.test.tsx
+++ b/ui/tests/playwright/BrokerPropertyPage.test.tsx
@@ -1,20 +1,24 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
 
-test("Brokers property page", async ({page}) => {
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToClusterOverview();
+});
+
+test("Brokers property page", async ({ page, authenticatedPage }) => {
   await test.step("Navigate to brokers property page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
     await page.click('text="Brokers"');
-    await page.waitForSelector('text="Broker ID"',{ timeout: 500000 });
-    await page.click('table[aria-label="Kafka clusters"] tbody tr:nth-child(1) td:nth-child(2) a');
-    await page.waitForSelector('text="Clear all filters"',{ timeout: 500000 });
-  })
+    await authenticatedPage.waitForTableLoaded();
+    await authenticatedPage.clickFirstLinkInTheTable("Kafka clusters");
+  });
   await test.step("Brokers page should display properties", async () => {
-    const dataRows = await page.locator('table[aria-label="Node configuration"] tbody tr').count();
+    await authenticatedPage.waitForTableLoaded();
+    const dataRows = await page
+      .locator('table[aria-label="Node configuration"] tbody tr')
+      .count();
     expect(dataRows).toBeGreaterThan(0);
-    const dataCells = await page.locator('table[aria-label="Node configuration"] tbody tr td').evaluateAll((tds) =>
-      tds.map((td) => td.textContent?.trim() ?? "")
-    );
+    const dataCells = await page
+      .locator('table[aria-label="Node configuration"] tbody tr td')
+      .evaluateAll((tds) => tds.map((td) => td.textContent?.trim() ?? ""));
 
     expect(dataCells.length).toBeGreaterThan(0);
   });
diff --git a/ui/tests/playwright/BrokersPage.test.tsx b/ui/tests/playwright/BrokersPage.test.tsx
index e2494e360..e47f205ab 100644
--- a/ui/tests/playwright/BrokersPage.test.tsx
+++ b/ui/tests/playwright/BrokersPage.test.tsx
@@ -1,12 +1,14 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
 
-test("Brokers page", async ({page}) => {
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToClusterOverview();
+});
+
+test("Brokers page", async ({ page }) => {
   await test.step("Navigate to brokers page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
     await page.click('text="Brokers"');
     await page.waitForSelector('text="Rack"', { timeout: 500000 });
-  })
+  });
   await test.step("Brokers page should display table", async () => {
     expect(await page.innerText("body")).toContain("Brokers");
     expect(await page.innerText("body")).toContain(
@@ -16,11 +18,13 @@ test("Brokers page", async ({page}) => {
     expect(await page.innerText("body")).toContain("Total Replicas");
     expect(await page.innerText("body")).toContain("Rack");
     expect(await page.innerText("body")).toContain("Broker ID");
-    const dataRows = await page.locator('table[aria-label="Kafka clusters"] tbody tr').count();
+    const dataRows = await page
+      .locator('table[aria-label="Kafka clusters"] tbody tr')
+      .count();
     expect(dataRows).toBeGreaterThan(0);
-    const dataCells = await page.locator('table[aria-label="Kafka clusters"] tbody tr td').evaluateAll((tds) =>
-      tds.map((td) => td.textContent?.trim() ?? "")
-    );
+    const dataCells = await page
+      .locator('table[aria-label="Kafka clusters"] tbody tr td')
+      .evaluateAll((tds) => tds.map((td) => td.textContent?.trim() ?? ""));
 
     expect(dataCells.length).toBeGreaterThan(0);
   });
diff --git a/ui/tests/playwright/ClusterOverview.test.tsx b/ui/tests/playwright/ClusterOverview.test.tsx
index 390a51395..a31284598 100644
--- a/ui/tests/playwright/ClusterOverview.test.tsx
+++ b/ui/tests/playwright/ClusterOverview.test.tsx
@@ -1,12 +1,17 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
+
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToClusterOverview();
+});
 
 test("Cluster Overview page", async ({ page }) => {
   await test.step("Navigate to cluster overview page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
     await page.click('text="Cluster overview"');
-    await page.waitForSelector('text="Key performance indicators and important information regarding the Kafka cluster."', { timeout: 500000 });
-  })
+    await page.waitForSelector(
+      'text="Key performance indicators and important information regarding the Kafka cluster."',
+      { timeout: 500000 },
+    );
+  });
   await test.step("Cluster overview page should display correctly", async () => {
     const newPage = page.mainFrame();
     expect(await newPage.innerText("body")).toContain("Cluster overview");
diff --git a/ui/tests/playwright/ConsumerGroupsPage.test.tsx b/ui/tests/playwright/ConsumerGroupsPage.test.tsx
index ad1ee9dc2..1d6010e7c 100644
--- a/ui/tests/playwright/ConsumerGroupsPage.test.tsx
+++ b/ui/tests/playwright/ConsumerGroupsPage.test.tsx
@@ -1,29 +1,31 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
+
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToConsumerGroups();
+});
 
 test("Consumer groups page", async ({ page }) => {
-  await test.step("Navigate to consumers group page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
-    await page.click('text="Consumer groups"');
-    await page.waitForSelector('text="Consumer group name"', {
-      timeout: 500000,
-    });
-  });
   await test.step("Consumer groups page should display table", async () => {
     await page.waitForFunction(() => {
-        return document.querySelectorAll('table[aria-label="Consumer groups"] tbody tr').length > 0;
+      return (
+        document.querySelectorAll(
+          'table[aria-label="Consumer groups"] tbody tr',
+        ).length > 0
+      );
     });
     expect(await page.innerText("body")).toContain("Consumer group name");
     expect(await page.innerText("body")).toContain("State");
     expect(await page.innerText("body")).toContain("Overall lag");
     expect(await page.innerText("body")).toContain("Members");
     expect(await page.innerText("body")).toContain("Topics");
-    const dataRows = await page.locator('table[aria-label="Consumer groups"] tbody tr').count();
+    const dataRows = await page
+      .locator('table[aria-label="Consumer groups"] tbody tr')
+      .count();
     expect(dataRows).toBeGreaterThan(0);
 
-    const dataCells = await page.locator('table[aria-label="Consumer groups"] tbody tr td').evaluateAll((tds) =>
-      tds.map((td) => td.textContent?.trim() ?? "")
-    );
+    const dataCells = await page
+      .locator('table[aria-label="Consumer groups"] tbody tr td')
+      .evaluateAll((tds) => tds.map((td) => td.textContent?.trim() ?? ""));
 
     expect(dataCells.length).toBeGreaterThan(0);
   });
diff --git a/ui/tests/playwright/ConsumerPage.test.tsx b/ui/tests/playwright/ConsumerPage.test.tsx
index cac9a0a28..5f1288547 100644
--- a/ui/tests/playwright/ConsumerPage.test.tsx
+++ b/ui/tests/playwright/ConsumerPage.test.tsx
@@ -1,18 +1,23 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
 
-test("Consumer  page", async ({page}) => {
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToConsumerGroups();
+});
+
+test("Consumer  page", async ({ page, authenticatedPage }) => {
   await test.step("Navigate to consumer page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
-    await page.click('text="Consumer groups"');
-    await page.click('table[aria-label="Consumer groups"] tbody.pf-v5-c-table__tbody > tr:nth-of-type(1) td.pf-v5-c-table__td:nth-of-type(1) a');
-    await page.waitForSelector('text="Member ID"', { timeout: 500000 });
-  })
+    await authenticatedPage.clickFirstLinkInTheTable("Consumer groups");
+    await authenticatedPage.waitForTableLoaded();
+  });
   await test.step("Consumer  page should display table", async () => {
     expect(await page.innerText("body")).toContain("Member ID");
     expect(await page.innerText("body")).toContain("Overall lag");
     expect(await page.innerText("body")).toContain("Assigned partitions");
-    const button = page.locator('button[aria-labelledby="simple-node0 00"][aria-label="Details"]').first();
+    const button = page
+      .locator(
+        'button[aria-labelledby="simple-node0 00"][aria-label="Details"]',
+      )
+      .first();
     await button?.click();
     expect(await page.innerText("body")).toContain("Committed offset");
     expect(await page.innerText("body")).toContain("Topic");
diff --git a/ui/tests/playwright/CreateTopicPage.test.tsx b/ui/tests/playwright/CreateTopicPage.test.tsx
index d354084bd..be976846b 100644
--- a/ui/tests/playwright/CreateTopicPage.test.tsx
+++ b/ui/tests/playwright/CreateTopicPage.test.tsx
@@ -1,10 +1,11 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
+
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToClusterOverview();
+});
 
 test.describe("Create Topic", () => {
   test.skip("Create Topic form should appear", async ({ page }) => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
-
     await page.goto(`./kafka/j7W3TRG7SsWCBXHjz2hfrg/topics/create`);
     await page.waitForLoadState("networkidle", { timeout: 10000 });
     const screenshot = await page.screenshot();
diff --git a/ui/tests/playwright/HomePage.test.tsx b/ui/tests/playwright/HomePage.test.tsx
index 4686af789..852c8ea69 100644
--- a/ui/tests/playwright/HomePage.test.tsx
+++ b/ui/tests/playwright/HomePage.test.tsx
@@ -3,8 +3,9 @@ import { expect, test } from "@playwright/test";
 test.skip("Home page", async ({ page }) => {
   await test.step("Column headings are present", async () => {
     await page.goto("./");
-    const columnHeadings = await page.locator('table[aria-label="Kafka clusters"] thead th').evaluateAll((ths) =>
-      ths.map((th) => th.textContent?.trim()));
+    const columnHeadings = await page
+      .locator('table[aria-label="Kafka clusters"] thead th')
+      .evaluateAll((ths) => ths.map((th) => th.textContent?.trim()));
     expect(columnHeadings).toContain("Name");
     expect(columnHeadings).toContain("Brokers");
     expect(columnHeadings).toContain("Consumer groups");
@@ -21,7 +22,7 @@ test.skip("Home page", async ({ page }) => {
 
     // Click on the "Connection details" button within the dropdown menu
     await page.click(
-      'button[class="pf-v5-c-menu__item"] span[class="pf-v5-c-menu__item-text"]:has-text("Connection details")'
+      'button[class="pf-v5-c-menu__item"] span[class="pf-v5-c-menu__item-text"]:has-text("Connection details")',
     );
 
     // Wait for the input fields to appear
@@ -32,21 +33,25 @@ test.skip("Home page", async ({ page }) => {
     expect(await page.innerText("body")).toContain(
       "External listeners provide client access to a Kafka cluster from outside the OpenShift cluster.",
     );
-    const inputValues = await page.locator('.pf-v5-c-form-control input[type="text"]').evaluateAll((inputs) =>
-      inputs.map((input) => (input as HTMLInputElement).value)
-    );
+    const inputValues = await page
+      .locator('.pf-v5-c-form-control input[type="text"]')
+      .evaluateAll((inputs) =>
+        inputs.map((input) => (input as HTMLInputElement).value),
+      );
     expect(inputValues.every((value) => value.length > 1)).toBe(true); //await page.waitForSelector('span[class="pf-v5-c-form-control pf-m-readonly"] input[id="text-input-13"]');
   });
 
   await test.step("Data rows are present", async () => {
-    const dataRows = await page.locator('table[aria-label="Kafka clusters"] tbody tr').elementHandles();
+    const dataRows = await page
+      .locator('table[aria-label="Kafka clusters"] tbody tr')
+      .elementHandles();
     expect(dataRows.length).toBeGreaterThan(0);
   });
 
   await test.step("Data cells in each row are present", async () => {
-    const dataCells = await page.locator('table[aria-label="Kafka clusters"] tbody tr td').evaluateAll((tds) =>
-      tds.map((td) => td.textContent?.trim() ?? "")
-    );
+    const dataCells = await page
+      .locator('table[aria-label="Kafka clusters"] tbody tr td')
+      .evaluateAll((tds) => tds.map((td) => td.textContent?.trim() ?? ""));
     expect(dataCells.length).toBeGreaterThan(0);
   });
 
diff --git a/ui/tests/playwright/MessagesPage.test.tsx b/ui/tests/playwright/MessagesPage.test.tsx
index 540c97175..c51b41615 100644
--- a/ui/tests/playwright/MessagesPage.test.tsx
+++ b/ui/tests/playwright/MessagesPage.test.tsx
@@ -1,28 +1,28 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
 
-test("Messages page", async ({page}) => {
-  await test.step("Navigate to topics messages page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
-    await page.click('text="Topics"');
-    await page.waitForSelector('text="Hide internal topics"', { timeout: 500000 });
-    await page.click('table[aria-label="Topics"] tbody tr:first-child td:first-child a');
-    await expect(page.getByText("Last updated").or(page.getByText("No messages data"))).toBeVisible();
-  })
-  await test.step("Messages page should display table", async () => {
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToFirstTopic();
+});
+
+test("Messages page", async ({ page, authenticatedPage }) => {
+  await test.step("Messages page should display table, or an empty state", async () => {
     if (await page.getByText("No messages data").isVisible()) {
-      expect(await page.innerText("body")).toContain("Data will appear shortly after we receive produced messages.");
+      expect(await page.innerText("body")).toContain(
+        "Data will appear shortly after we receive produced messages.",
+      );
       return;
     }
 
     expect(await page.innerText("body")).toContain("Key");
     await page.click('button[aria-label="Open advanced search"]');
     expect(await page.innerText("body")).toContain("All partitions");
-    const dataRows = await page.locator('table[aria-label="Messages table"] tbody tr').elementHandles();
+    const dataRows = await page
+      .locator('table[aria-label="Messages table"] tbody tr')
+      .elementHandles();
     expect(dataRows.length).toBeGreaterThan(0);
-    const dataCells = await page.locator('table[aria-label="Messages table"] tbody tr td').evaluateAll((tds) =>
-      tds.map((td) => td.textContent?.trim() ?? "")
-    );
+    const dataCells = await page
+      .locator('table[aria-label="Messages table"] tbody tr td')
+      .evaluateAll((tds) => tds.map((td) => td.textContent?.trim() ?? ""));
     expect(dataCells.length).toBeGreaterThan(0);
   });
 });
diff --git a/ui/tests/playwright/PartitionsPage.test.tsx b/ui/tests/playwright/PartitionsPage.test.tsx
index 1d20e1099..4c056242e 100644
--- a/ui/tests/playwright/PartitionsPage.test.tsx
+++ b/ui/tests/playwright/PartitionsPage.test.tsx
@@ -1,17 +1,14 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
 
-test("Partitions page", async ({page}) => {
-  await test.step("Navigate to partitions page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
-    await page.click('text="Topics"');
-    await page.waitForSelector('text="Hide internal topics"', { timeout: 500000 });
-    await page.click('table[aria-label="Topics"] tbody tr:first-child td:first-child a');
-    await expect(page.getByText("Last updated").or(page.getByText("No messages data"))).toBeVisible();
-    await page.click('text="Partitions"');
-    await page.waitForSelector('text="Partition ID"', { timeout: 500000 });
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToFirstTopic();
+});
 
-  })
+test("Partitions page", async ({ page, authenticatedPage }) => {
+  await test.step("Navigate to partitions page", async () => {
+    await authenticatedPage.clickLink("Partitions");
+    await authenticatedPage.waitForTableLoaded();
+  });
   await test.step("Partitions page should display table", async () => {
     expect(await page.innerText("body")).toContain("Partition ID");
     expect(await page.innerText("body")).toContain("Status");
@@ -19,10 +16,13 @@ test("Partitions page", async ({page}) => {
     expect(await page.innerText("body")).toContain("Size");
     expect(await page.innerText("body")).toContain("Leader");
     expect(await page.innerText("body")).toContain("Preferred leader");
-    const dataRows = await page.locator('table[aria-label="Partitions"] tbody tr').elementHandles();
+    const dataRows = await page
+      .locator('table[aria-label="Partitions"] tbody tr')
+      .elementHandles();
     expect(dataRows.length).toBeGreaterThan(0);
-    const dataCells = await page.locator('table[aria-label="Partitions"] tbody tr td').evaluateAll((tds) =>
-    tds.map((td) => td.textContent?.trim() ?? ""));
+    const dataCells = await page
+      .locator('table[aria-label="Partitions"] tbody tr td')
+      .evaluateAll((tds) => tds.map((td) => td.textContent?.trim() ?? ""));
     expect(dataCells.length).toBeGreaterThan(0);
   });
 });
diff --git a/ui/tests/playwright/TopicConfigurationPage.test.tsx b/ui/tests/playwright/TopicConfigurationPage.test.tsx
index 126e4d2e4..fdf9a6c46 100644
--- a/ui/tests/playwright/TopicConfigurationPage.test.tsx
+++ b/ui/tests/playwright/TopicConfigurationPage.test.tsx
@@ -1,22 +1,22 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
 
-test("Topics configuration", async ({page}) => {
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToFirstTopic();
+});
+
+test("Topics configuration", async ({ page, authenticatedPage }) => {
   await test.step("Navigate to topics configuration page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
-    await page.click('text="Topics"');
-    await page.waitForSelector('text="Hide internal topics"', { timeout: 500000 });
-    await page.click('table[aria-label="Topics"] tbody tr:first-child td:first-child a');
-    await expect(page.getByText("Last updated").or(page.getByText("No messages data"))).toBeVisible();
-    await page.click('text="Configuration"');
-    await page.waitForSelector('text="Clear all filters"', { timeout: 500000 });
-  })
+    await authenticatedPage.clickLink("Configuration");
+  });
   await test.step("Topics configuration page should display table", async () => {
-    const dataRows = await page.locator('table[aria-label="Node configuration"] tbody tr').elementHandles();
+    await authenticatedPage.waitForTableLoaded();
+    const dataRows = await page
+      .locator('table[aria-label="Node configuration"] tbody tr')
+      .elementHandles();
     expect(dataRows.length).toBeGreaterThan(0);
-    const dataCells = await page.locator('table[aria-label="Node configuration"] tbody tr td').evaluateAll((tds) =>
-    tds.map((td) => td.textContent?.trim() ?? "")
-  );
+    const dataCells = await page
+      .locator('table[aria-label="Node configuration"] tbody tr td')
+      .evaluateAll((tds) => tds.map((td) => td.textContent?.trim() ?? ""));
     expect(dataCells.length).toBeGreaterThan(0);
   });
 });
diff --git a/ui/tests/playwright/TopicConsumers.test.tsx b/ui/tests/playwright/TopicConsumers.test.tsx
index 2da03794a..11d9cf7af 100644
--- a/ui/tests/playwright/TopicConsumers.test.tsx
+++ b/ui/tests/playwright/TopicConsumers.test.tsx
@@ -1,17 +1,18 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
 
-test("Topics consumers", async ({page}) => {
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToFirstTopic();
+});
+
+test("Topics consumers", async ({ page, authenticatedPage }) => {
   await test.step("Navigate to topics consumers page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
-    await page.click('text="Topics"');
-    await page.waitForSelector('text="Hide internal topics"', { timeout: 500000 });
-    await page.click('table[aria-label="Topics"] tbody tr:first-child td:first-child a');
-    await expect(page.getByText("Last updated").or(page.getByText("No messages data"))).toBeVisible();
-    await page.click('text="Consumer groups"');
-    await expect(page.getByText("Consumer group name").or(page.getByText("No consumer groups"))).toBeVisible();
-  })
+    await authenticatedPage.clickLink("Consumer groups");
+  });
   await test.step("Topics consumers page should display table", async () => {
+    await authenticatedPage.waitForTableLoaded();
+    if (await page.getByText("No consumer groups").isVisible()) {
+      return;
+    }
     expect(await page.innerText("body")).toContain("Consumer group name");
     expect(await page.innerText("body")).toContain("Overall lag");
     expect(await page.innerText("body")).toContain("State");
@@ -19,12 +20,14 @@ test("Topics consumers", async ({page}) => {
     expect(await page.innerText("body")).toContain("Members");
 
     await page.waitForSelector('table[aria-label="Consumer groups"] tbody tr');
-    const dataRows = await page.locator('table[aria-label="Consumer groups"] tbody tr').count();
+    const dataRows = await page
+      .locator('table[aria-label="Consumer groups"] tbody tr')
+      .count();
     expect(dataRows).toBeGreaterThan(0);
 
-    const dataCells = await page.locator('table[aria-label="Consumer groups"] tbody tr td').evaluateAll((tds) =>
-      tds.map((td) => td.textContent?.trim() ?? "")
-    );
+    const dataCells = await page
+      .locator('table[aria-label="Consumer groups"] tbody tr td')
+      .evaluateAll((tds) => tds.map((td) => td.textContent?.trim() ?? ""));
     expect(dataCells.length).toBeGreaterThan(0);
   });
 });
diff --git a/ui/tests/playwright/TopicsPage.test.tsx b/ui/tests/playwright/TopicsPage.test.tsx
index 8643194a2..dc88ebbb9 100644
--- a/ui/tests/playwright/TopicsPage.test.tsx
+++ b/ui/tests/playwright/TopicsPage.test.tsx
@@ -1,24 +1,22 @@
-import { expect, test } from "@playwright/test";
+import { expect, test } from "./authenticated-test";
 
-test("Topics page", async ({page}) => {
-  await test.step("Navigate to topics page", async () => {
-    await page.goto("./");
-    await page.click('text="Click to login anonymously"');
-    await page.click('text="Topics"');
-    await page.waitForSelector('text="Hide internal topics"', { timeout: 500000 });
-  })
+test.beforeEach(async ({ authenticatedPage }) => {
+  await authenticatedPage.goToTopics();
+});
+
+test("Topics page", async ({ page }) => {
   await test.step("Topics page should display table", async () => {
-    const label =  page.locator('label.pf-v5-c-switch').first();
+    const label = page.locator("label.pf-v5-c-switch").first();
     expect(label).not.toBeNull();
     const labelText = await label?.innerText();
     expect(labelText?.trim()).toBe("Hide internal topics");
-    const input =   label?.locator('input.pf-v5-c-switch__input').first();
+    const input = label?.locator("input.pf-v5-c-switch__input").first();
     expect(input).not.toBeNull();
     const isChecked = await input?.isChecked();
     expect(isChecked).toBe(true);
     //const button = await page.$('button:has-text("Create Topic")');
     //expect(button).not.toBeNull();
-    const filterInput =  page.locator('div.pf-v5-c-input-group input').first();
+    const filterInput = page.locator("div.pf-v5-c-input-group input").first();
     expect(filterInput).not.toBeNull();
 
     // Get the placeholder attribute value
diff --git a/ui/tests/playwright/auth.setup.ts b/ui/tests/playwright/auth.setup.ts
index 62f816de7..ffc340a82 100644
--- a/ui/tests/playwright/auth.setup.ts
+++ b/ui/tests/playwright/auth.setup.ts
@@ -1,12 +1,18 @@
+import { authFile } from "./playwright.config";
 import { expect, test as setup } from "@playwright/test";
 
 setup("authenticate", async ({ page }) => {
-  await page.goto("/");
+  await page.goto("./");
   await page.waitForURL("**/login", { waitUntil: "commit" });
-  //await page.waitForURL("./", { waitUntil: "commit" });
-  await expect(page.getByText("Welcome to the StreamsHub console")).toBeVisible();
   await page.click('text="Click to login anonymously"');
   await page.waitForURL("**/overview", { waitUntil: "commit" });
+  await expect(
+    page.getByRole("heading", { name: "Cluster overview" }),
+  ).toBeVisible();
   const newPage = page.mainFrame();
   expect(await newPage.innerText("body")).toContain("Cluster overview");
+
+  process.env.TEST_BASE_URL = page.url();
+
+  await page.context().storageState({ path: authFile });
 });
diff --git a/ui/tests/playwright/authenticated-page.ts b/ui/tests/playwright/authenticated-page.ts
new file mode 100644
index 000000000..164758399
--- /dev/null
+++ b/ui/tests/playwright/authenticated-page.ts
@@ -0,0 +1,77 @@
+import type { Page } from "@playwright/test";
+
+export class AuthenticatedPage {
+  private readonly baseUrl: string;
+
+  constructor(public readonly page: Page) {
+    this.baseUrl = process.env.TEST_BASE_URL;
+  }
+
+  async goToClusterOverview() {
+    await this.page.goto(this.baseUrl);
+  }
+
+  async clickLink(text: string, where: "main" | "sidebar" = "main") {
+    const link = this.page
+      .locator(where === "main" ? "main" : "#page-sidebar")
+      .locator("a")
+      .locator(`text="${text}"`);
+    await link.click();
+    const url = await link.getAttribute("href");
+    await this.awaitLink(url);
+  }
+
+  async awaitLink(url: string) {
+    // the first ** is to handle relative links
+    // the last ** is to handle redirects, sometimes we link to a page that redirects to another page
+    const waitUrl = `${url.startsWith(this.baseUrl) ? "" : "**"}${url.startsWith("/") ? "" : "/"}${url}`;
+    try {
+      await this.page.waitForURL(waitUrl, { waitUntil: "networkidle" });
+    } catch {
+      await this.page.waitForURL(waitUrl + "/**", { waitUntil: "networkidle" });
+    }
+  }
+
+  async goToTopics(waitForLoaded = true) {
+    await this.goToClusterOverview();
+    await this.clickLink("Topics", "sidebar");
+    if (waitForLoaded) {
+      await this.waitForTableLoaded();
+    }
+  }
+
+  async goToFirstTopic(waitForLoaded = true) {
+    await this.goToTopics(waitForLoaded);
+    await this.clickFirstLinkInTheTable("Topics");
+    if (waitForLoaded) {
+      await this.waitForTableLoaded();
+    }
+  }
+
+  async goToConsumerGroups(waitForLoaded = true) {
+    await this.goToClusterOverview();
+    await this.clickLink("Consumer groups", "sidebar");
+    if (waitForLoaded) {
+      await this.waitForTableLoaded();
+    }
+  }
+
+  async waitForTableLoaded() {
+    await this.page.waitForSelector('text="Loading data"', {
+      state: "hidden",
+    });
+  }
+
+  async clickFirstLinkInTheTable(tableLabel: string) {
+    const link = this.page
+      .locator(`table[aria-label="${tableLabel}"]`)
+      .locator("tbody")
+      .locator("tr")
+      .first()
+      .locator("td a")
+      .first();
+    await link.click();
+    const url = await link.getAttribute("href");
+    await this.awaitLink(url);
+  }
+}
diff --git a/ui/tests/playwright/authenticated-test.ts b/ui/tests/playwright/authenticated-test.ts
new file mode 100644
index 000000000..80471be11
--- /dev/null
+++ b/ui/tests/playwright/authenticated-test.ts
@@ -0,0 +1,19 @@
+import { test as base } from "@playwright/test";
+import { AuthenticatedPage } from "./authenticated-page";
+
+// Declare the types of your fixtures.
+type MyFixtures = {
+  authenticatedPage: AuthenticatedPage;
+};
+
+// Extend base test by providing "todoPage" and "settingsPage".
+// This new "test" can be used in multiple test files, and each of them will get the fixtures.
+export const test = base.extend<MyFixtures>({
+  authenticatedPage: async ({ page }, use) => {
+    // Set up the fixture.
+    const todoPage = new AuthenticatedPage(page);
+    await todoPage.goToClusterOverview();
+    await use(todoPage);
+  },
+});
+export { expect } from "@playwright/test";
diff --git a/ui/tests/playwright/playwright.config.ts b/ui/tests/playwright/playwright.config.ts
index 3b541c39a..55c2abcde 100644
--- a/ui/tests/playwright/playwright.config.ts
+++ b/ui/tests/playwright/playwright.config.ts
@@ -1,5 +1,8 @@
+import path from "path";
 import { defineConfig, devices } from "playwright/test";
 
+export const authFile = path.join(__dirname, ".auth/user.json");
+
 export default defineConfig({
   // Retry on CI only.
   retries: process.env.CI_CLUSTER ? 5 : 0,
@@ -8,16 +11,16 @@ export default defineConfig({
   workers: process.env.CI_CLUSTER ? 1 : undefined,
 
   projects: [
-    //{ name: "setup", testMatch: /.*\.setup\.ts/ },
+    { name: "setup", testMatch: /.*\.setup\.ts/ },
     {
       name: "chromium",
       use: {
         ...devices["Desktop Chrome"],
         // Use prepared auth state.
-        // storageState: "tests/playwright/.auth/user.json",
+        storageState: authFile,
       },
-      //dependencies: ["setup"],
-      timeout: 25000,
+      dependencies: ["setup"],
+      timeout: 60000,
     },
 
     {
@@ -25,14 +28,14 @@ export default defineConfig({
       use: {
         ...devices["Desktop Firefox"],
         // Use prepared auth state.
-        // storageState: "tests/playwright/.auth/user.json",
+        storageState: authFile,
       },
-      //dependencies: ["setup"],
-      timeout: 25000,
+      dependencies: ["setup"],
+      timeout: 60000,
     },
   ],
   use: {
-    baseURL: process.env.PLAYWRIGHT_BASE_URL,
+    baseURL: process.env.PLAYWRIGHT_BASE_URL || "http://localhost:3000",
     ignoreHTTPSErrors: true,
   },
 });