diff --git a/apps/web/src/app/api/trpc/lambda/[trpc]/route.ts b/apps/web/src/app/api/trpc/lambda/[trpc]/route.ts
index 5175cdfe9..ca0af87f0 100644
--- a/apps/web/src/app/api/trpc/lambda/[trpc]/route.ts
+++ b/apps/web/src/app/api/trpc/lambda/[trpc]/route.ts
@@ -7,9 +7,6 @@ import { lambdaRouter } from "@openstatus/api/src/lambda";
 // Stripe is incompatible with Edge runtimes due to using Node.js events
 // export const runtime = "edge";
 
-// We should understand why some requests are taking longer than 15s
-export const maxDuration = 120;
-
 const handler = (req: NextRequest) =>
   fetchRequestHandler({
     endpoint: "/api/trpc/lambda",
diff --git a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx
index 8deaccaef..5e105f8d4 100644
--- a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx
+++ b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx
@@ -50,6 +50,8 @@ const searchParamsSchema = z.object({
     ),
 });
 
+export const revalidate = 120;
+
 export default async function Page({
   params,
   searchParams,
diff --git a/apps/web/src/app/status-page/[domain]/monitors/page.tsx b/apps/web/src/app/status-page/[domain]/monitors/page.tsx
index 8d7bcca85..c912fd94d 100644
--- a/apps/web/src/app/status-page/[domain]/monitors/page.tsx
+++ b/apps/web/src/app/status-page/[domain]/monitors/page.tsx
@@ -25,6 +25,8 @@ const searchParamsSchema = z.object({
 
 const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });
 
+export const revalidate = 120;
+
 export default async function Page({
   params,
   searchParams,
@@ -51,7 +53,7 @@ export default async function Page({
             });
 
             return { monitor, data };
-          }),
+          })
         )
       : undefined;
 
@@ -81,7 +83,7 @@ export default async function Page({
                 groupDataByTimestamp(
                   data.map((data) => ({ ...data, region: "ams" })),
                   period,
-                  quantile,
+                  quantile
                 );
               return (
                 <li key={monitor.id} className="grid gap-2">
diff --git a/apps/web/src/app/status-page/[domain]/page.tsx b/apps/web/src/app/status-page/[domain]/page.tsx
index 15406ab75..8d1efc9d7 100644
--- a/apps/web/src/app/status-page/[domain]/page.tsx
+++ b/apps/web/src/app/status-page/[domain]/page.tsx
@@ -15,8 +15,7 @@ type Props = {
   searchParams: { [key: string]: string | string[] | undefined };
 };
 
-export const revalidate = 600;
-export const maxDuration = 120;
+export const revalidate = 120;
 
 export default async function Page({ params }: Props) {
   const page = await api.page.getPageBySlug.query({ slug: params.domain });
@@ -25,7 +24,7 @@ export default async function Page({ params }: Props) {
   const currentMaintenances = page.maintenances.filter(
     (maintenance) =>
       maintenance.to.getTime() > Date.now() &&
-      maintenance.from.getTime() < Date.now(),
+      maintenance.from.getTime() < Date.now()
   );
 
   return (