diff --git a/src/lib/helpers/buildTimeout.ts b/src/lib/helpers/buildTimeout.ts
index 9b2544df9..724f82a6a 100644
--- a/src/lib/helpers/buildTimeout.ts
+++ b/src/lib/helpers/buildTimeout.ts
@@ -22,13 +22,13 @@ function isBuildTimedOut(createdAt: string, status: string, timeoutSeconds: numb
  * Gets the effective status for a build, considering timeout
  */
 export function getEffectiveBuildStatus(
-    originalStatus: string,
-    createdAt: string,
-    screenshots: Array<
-        Models.Deployment['screenshotLight'] | Models.Deployment['screenshotDark'] | undefined
-    >,
+    deployment: Models.Deployment,
     consoleVariables: Models.ConsoleVariables | undefined
 ): string {
+    const originalStatus = deployment.status;
+    const createdAt = deployment.$createdAt;
+    const screenshots = [deployment.screenshotLight, deployment.screenshotDark];
+
     const timeoutSeconds = getBuildTimeoutSeconds(consoleVariables);
     if (isBuildTimedOut(createdAt, originalStatus, timeoutSeconds)) {
         return 'failed';
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte
index 1d18ee85b..bb2f3fda1 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte
@@ -38,14 +38,7 @@
         footer?: Snippet;
     } = $props();
 
-    let effectiveStatus = $derived(
-        getEffectiveBuildStatus(
-            deployment.status,
-            deployment.$createdAt,
-            [deployment.screenshotLight, deployment.screenshotDark],
-            $regionalConsoleVariables
-        )
-    );
+    let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
     let totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0));
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index 9676c3302..140524354 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -41,12 +41,7 @@
     let { data } = $props();
 
     let effectiveStatus = $derived(
-        getEffectiveBuildStatus(
-            data.deployment.status,
-            data.deployment.$createdAt,
-            [data.deployment.screenshotLight, data.deployment.screenshotDark],
-            $regionalConsoleVariables
-        )
+        getEffectiveBuildStatus(data.deployment, $regionalConsoleVariables)
     );
     let showDelete = $state(false);
     let showCancel = $state(false);
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
index a6355710d..a70bf52d5 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
@@ -95,9 +95,7 @@
     {#snippet children(root)}
         {#each data.deploymentList.deployments as deployment (deployment.$id)}
             {@const effectiveStatus = getEffectiveBuildStatus(
-                deployment.status,
-                deployment.$createdAt,
-                [deployment.screenshotLight, deployment.screenshotDark],
+                deployment,
                 $regionalConsoleVariables
             )}
             <Table.Row.Link
diff --git a/src/routes/(console)/project-[region]-[project]/sites/(components)/deploymentActionMenu.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/deploymentActionMenu.svelte
index 5055094fb..aada935e8 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/(components)/deploymentActionMenu.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/deploymentActionMenu.svelte
@@ -54,9 +54,7 @@
     <svelte:fragment slot="menu" let:toggle>
         <ActionMenu.Root>
             {@const effectiveStatus = getEffectiveBuildStatus(
-                deployment.status,
-                deployment.$createdAt,
-                [deployment.screenshotLight, deployment.screenshotDark],
+                deployment,
                 $regionalConsoleVariables
             )}
             {#if !inCard}
diff --git a/src/routes/(console)/project-[region]-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/logs.svelte
index ca0e0f62d..03e5a9b49 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/(components)/logs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/logs.svelte
@@ -41,14 +41,7 @@
         emptyCopy?: string;
     } = $props();
 
-    let effectiveStatus = $derived(
-        getEffectiveBuildStatus(
-            deployment.status,
-            deployment.$createdAt,
-            [deployment.screenshotLight, deployment.screenshotDark],
-            $regionalConsoleVariables
-        )
-    );
+    let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
 
     function setCopy() {
         if (effectiveStatus === 'failed') {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/(components)/logsTimer.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/logsTimer.svelte
index 417da666a..2fa4c6185 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/(components)/logsTimer.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/logsTimer.svelte
@@ -7,16 +7,9 @@
 
     import { Layout, Spinner, Typography } from '@appwrite.io/pink-svelte';
 
-    let { status, deployment }: { status: string; deployment: Models.Deployment } = $props();
+    let { deployment }: { status: string; deployment: Models.Deployment } = $props();
 
-    let effectiveStatus = $derived(
-        getEffectiveBuildStatus(
-            status,
-            deployment.$createdAt,
-            [deployment.screenshotLight, deployment.screenshotDark],
-            $regionalConsoleVariables
-        )
-    );
+    let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
 </script>
 
 <Layout.Stack direction="row" alignItems="center" inline>
diff --git a/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte
index 93696adb7..eb392282a 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte
@@ -42,14 +42,7 @@
         footer?: Snippet;
     } = $props();
 
-    let effectiveStatus = $derived(
-        getEffectiveBuildStatus(
-            deployment.status,
-            deployment.$createdAt,
-            [deployment.screenshotLight, deployment.screenshotDark],
-            $regionalConsoleVariables
-        )
-    );
+    let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
     let show = $state(false);
 
     const totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0));
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte
index b70984418..14dab773d 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte
@@ -20,14 +20,7 @@
     let deployment = $state(data.deployment);
     let skipScreenshotInterval: ReturnType<typeof setInterval> | null = $state(null);
 
-    let effectiveStatus = $derived(
-        getEffectiveBuildStatus(
-            deployment.status,
-            deployment.$createdAt,
-            [deployment.screenshotLight, deployment.screenshotDark],
-            $regionalConsoleVariables
-        )
-    );
+    let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
 
     onMount(() => {
         const intervalCleanup = () => {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte
index 3f95bd737..23883b059 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte
@@ -26,14 +26,7 @@
     let { data }: PageProps = $props();
 
     let deployment = $derived(data.deployment);
-    let effectiveStatus = $derived(
-        getEffectiveBuildStatus(
-            deployment.status,
-            deployment.$createdAt,
-            [deployment.screenshotLight, deployment.screenshotDark],
-            $regionalConsoleVariables
-        )
-    );
+    let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
 
     let showRedeploy = $state(false);
     let showActivate = $state(false);
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte
index 1752e31c3..92c82f8fb 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte
@@ -82,9 +82,7 @@
     {#snippet children(root)}
         {#each data.deploymentList.deployments as deployment (deployment.$id)}
             {@const effectiveStatus = getEffectiveBuildStatus(
-                deployment.status,
-                deployment.$createdAt,
-                [deployment.screenshotLight, deployment.screenshotDark],
+                deployment,
                 $regionalConsoleVariables
             )}
             <Table.Row.Link
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte
index b80adfa2e..b66277f2b 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte
@@ -73,11 +73,8 @@
                         <Id value={deployment.$id}>{deployment.$id}</Id>
                     </Table.Cell>
                     <Table.Cell {root}>
-                        {@const status = deployment.status}
                         {@const effectiveStatus = getEffectiveBuildStatus(
-                            status,
-                            deployment.$createdAt,
-                            [deployment.screenshotLight, deployment.screenshotDark],
+                            deployment,
                             $regionalConsoleVariables
                         )}
                         {#if activeDeployment?.$id === deployment?.$id}