diff --git a/app/config/errors.php b/app/config/errors.php
index 58e95cf5d4..c3b791f613 100644
--- a/app/config/errors.php
+++ b/app/config/errors.php
@@ -580,6 +580,11 @@ return [
         'description' => 'Build with the requested ID is already completed and cannot be canceled.',
         'code' => 400,
     ],
+    Exception::BUILD_FAILED => [
+        'name' => Exception::BUILD_FAILED,
+        'description' => 'Build with the requested ID failed. Please check the logs for more information.',
+        'code' => 400,
+    ],
 
     /** Deployments */
     Exception::DEPLOYMENT_NOT_FOUND => [
diff --git a/app/config/frameworks.php b/app/config/frameworks.php
index 82fd70bf5b..afdf96145e 100644
--- a/app/config/frameworks.php
+++ b/app/config/frameworks.php
@@ -138,7 +138,7 @@ return [
     'vue' => [
         'key' => 'vue',
         'name' => 'Vue.js',
-        'screenshotSleep' => 3000,
+        'screenshotSleep' => 5000,
         'buildRuntime' => 'node-22',
         'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
         'adapters' => [
@@ -227,6 +227,23 @@ return [
             ]
         ]
     ],
+    'lynx' => [
+        'key' => 'lynx',
+        'name' => 'Lynx',
+        'screenshotSleep' => 5000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
     'flutter' => [
         'key' => 'flutter',
         'name' => 'Flutter',
diff --git a/app/config/specs/open-api3-latest-console.json b/app/config/specs/open-api3-latest-console.json
index cc8a611416..bd2230a4a8 100644
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
@@ -24718,6 +24718,7 @@
                                             "sveltekit",
                                             "astro",
                                             "remix",
+                                            "lynx",
                                             "flutter",
                                             "vite",
                                             "other"
@@ -25353,6 +25354,7 @@
                                             "sveltekit",
                                             "astro",
                                             "remix",
+                                            "lynx",
                                             "flutter",
                                             "vite",
                                             "other"
@@ -37040,6 +37042,11 @@
                         "description": "Site Template Name.",
                         "x-example": "Starter site"
                     },
+                    "tagline": {
+                        "type": "string",
+                        "description": "Short description of template",
+                        "x-example": "Minimal web app integrating with Appwrite."
+                    },
                     "demoUrl": {
                         "type": "string",
                         "description": "URL hosting a template demo.",
@@ -37103,6 +37110,7 @@
                 "required": [
                     "key",
                     "name",
+                    "tagline",
                     "demoUrl",
                     "screenshotDark",
                     "screenshotLight",
diff --git a/app/config/specs/open-api3-latest-server.json b/app/config/specs/open-api3-latest-server.json
index ecda53b77b..706d84bd84 100644
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
@@ -16816,6 +16816,7 @@
                                             "sveltekit",
                                             "astro",
                                             "remix",
+                                            "lynx",
                                             "flutter",
                                             "vite",
                                             "other"
@@ -17226,6 +17227,7 @@
                                             "sveltekit",
                                             "astro",
                                             "remix",
+                                            "lynx",
                                             "flutter",
                                             "vite",
                                             "other"
diff --git a/app/config/specs/swagger2-latest-console.json b/app/config/specs/swagger2-latest-console.json
index 4d3ab5bce8..0ef66f4f9c 100644
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
@@ -25221,6 +25221,7 @@
                                         "sveltekit",
                                         "astro",
                                         "remix",
+                                        "lynx",
                                         "flutter",
                                         "vite",
                                         "other"
@@ -25871,6 +25872,7 @@
                                         "sveltekit",
                                         "astro",
                                         "remix",
+                                        "lynx",
                                         "flutter",
                                         "vite",
                                         "other"
@@ -37623,6 +37625,11 @@
                     "description": "Site Template Name.",
                     "x-example": "Starter site"
                 },
+                "tagline": {
+                    "type": "string",
+                    "description": "Short description of template",
+                    "x-example": "Minimal web app integrating with Appwrite."
+                },
                 "demoUrl": {
                     "type": "string",
                     "description": "URL hosting a template demo.",
@@ -37688,6 +37695,7 @@
             "required": [
                 "key",
                 "name",
+                "tagline",
                 "demoUrl",
                 "screenshotDark",
                 "screenshotLight",
diff --git a/app/config/specs/swagger2-latest-server.json b/app/config/specs/swagger2-latest-server.json
index c2d3b06ebc..59f7b5f7b8 100644
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
@@ -17285,6 +17285,7 @@
                                         "sveltekit",
                                         "astro",
                                         "remix",
+                                        "lynx",
                                         "flutter",
                                         "vite",
                                         "other"
@@ -17714,6 +17715,7 @@
                                         "sveltekit",
                                         "astro",
                                         "remix",
+                                        "lynx",
                                         "flutter",
                                         "vite",
                                         "other"
diff --git a/app/config/templates/site.php b/app/config/templates/site.php
index ba58940969..f5ffab0dad 100644
--- a/app/config/templates/site.php
+++ b/app/config/templates/site.php
@@ -87,15 +87,6 @@ const TEMPLATE_FRAMEWORKS = [
         'adapter' => 'static',
         'fallbackFile' => '',
     ],
-    'OTHER' => [
-        'key' => 'other',
-        'name' => 'Other',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'static',
-        'fallbackFile' => 'index.html',
-    ],
     'VITE' => [
         'key' => 'vite',
         'name' => 'Vite',
@@ -144,6 +135,16 @@ const TEMPLATE_FRAMEWORKS = [
         'adapter' => 'static',
         'outputDirectory' => './',
     ],
+    'LYNX' => [
+        'key' => 'lynx',
+        'name' => 'Lynx',
+        'installCommand' => 'npm install && cd web && npm install && cd ..',
+        'buildCommand' => 'npm run build && cd web && npm run build && cd ..',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'static',
+        'outputDirectory' => './web/dist',
+        'fallbackFile' => 'index.html',
+    ],
 ];
 
 function getFramework(string $frameworkEnum, array $overrides)
@@ -153,9 +154,30 @@ function getFramework(string $frameworkEnum, array $overrides)
 }
 
 return [
+    [
+        'key' => 'lynx-starter',
+        'name' => 'Lynx Starter',
+        'tagline' => 'Sample application built with Lynx, a cross-platform framework focused on performance.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/lynx-starter-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/lynx-starter-light.png',
+        'frameworks' => [
+            getFramework('LYNX', [
+                'providerRootDirectory' => './lynx/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
     [
         'key' => 'vitepress',
         'name' => 'Vitepress',
+        'tagline' => 'Platform for documentation and knowledge sharing powered by Vite.',
+        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::DOCUMENTATION],
         'screenshotDark' => $url . '/images/sites/templates/vitepress-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/vitepress-light.png',
@@ -177,6 +199,8 @@ return [
     [
         'key' => 'vuepress',
         'name' => 'Vuepress',
+        'tagline' => 'Platform for documentation and knowledge sharing powered by Vue.',
+        'score' => 4, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::DOCUMENTATION],
         'screenshotDark' => $url . '/images/sites/templates/vuepress-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/vuepress-light.png',
@@ -198,6 +222,8 @@ return [
     [
         'key' => 'docusaurus',
         'name' => 'Docusaurus',
+        'tagline' => 'Platform for documentation and knowledge sharing powered by React.',
+        'score' => 4, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::DOCUMENTATION],
         'screenshotDark' => $url . '/images/sites/templates/docusaurus-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/docusaurus-light.png',
@@ -219,6 +245,8 @@ return [
     [
         'key' => 'nxt-lnk',
         'name' => 'Nxt Lnk',
+        'tagline' => 'Personal website for creators to merge all URLs to social profiles.',
+        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::PORTFOLIO],
         'screenshotDark' => $url . '/images/sites/templates/nxt-lnk-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/nxt-lnk-light.png',
@@ -236,6 +264,8 @@ return [
     [
         'key' => 'magic-portfolio',
         'name' => 'Magic Portfolio',
+        'tagline' => 'Complex personal website to showcase your projects, articles, and more.',
+        'score' => 7, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::PORTFOLIO],
         'screenshotDark' => $url . '/images/sites/templates/magic-portfolio-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/magic-portfolio-light.png',
@@ -253,6 +283,8 @@ return [
     [
         'key' => 'littlelink',
         'name' => 'LittleLink',
+        'tagline' => 'Personal website for creators to merge all URLs to social profiles.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::PORTFOLIO],
         'screenshotDark' => $url . '/images/sites/templates/littlelink-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/littlelink-light.png',
@@ -270,6 +302,8 @@ return [
     [
         'key' => 'logspot',
         'name' => 'Logspot',
+        'tagline' => 'Website to publish changelogs of your application.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::BLOG],
         'screenshotDark' => $url . '/images/sites/templates/logspot-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/logspot-light.png',
@@ -290,6 +324,8 @@ return [
     [
         'key' => 'astro-nano',
         'name' => 'Astro Nano',
+        'tagline' => 'Minimal personal website to showcase your projects, articles, and more.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::PORTFOLIO],
         'screenshotDark' => $url . '/images/sites/templates/astro-nano-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/astro-nano-light.png',
@@ -309,6 +345,8 @@ return [
     [
         'key' => 'astro-starlight',
         'name' => 'Astro Starlight',
+        'tagline' => 'Platform for documentation and knowledge sharing powered by Astro.',
+        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::DOCUMENTATION],
         'screenshotDark' => $url . '/images/sites/templates/astro-starlight-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/astro-starlight-light.png',
@@ -328,6 +366,8 @@ return [
     [
         'key' => 'astro-sphere',
         'name' => 'Astro Sphere',
+        'tagline' => 'Modern personal website to showcase your projects, articles, and more.',
+        'score' => 7, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::PORTFOLIO],
         'screenshotDark' => $url . '/images/sites/templates/astro-sphere-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/astro-sphere-light.png',
@@ -347,6 +387,8 @@ return [
     [
         'key' => 'astro-starlog',
         'name' => 'Astro Starlog',
+        'tagline' => 'Platform for publishing written content and media powered by Astro.',
+        'score' => 5, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::BLOG],
         'screenshotDark' => $url . '/images/sites/templates/astro-starlog-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/astro-starlog-light.png',
@@ -366,6 +408,8 @@ return [
     [
         'key' => 'onelink',
         'name' => 'Onelink',
+        'tagline' => 'Personal website for creators to merge all URLs to social profiles.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::PORTFOLIO],
         'screenshotDark' => $url . '/images/sites/templates/onelink-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/onelink-light.png',
@@ -387,6 +431,8 @@ return [
         'key' => 'starter-for-flutter',
         'name' => 'Flutter starter',
         'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple Flutter application integrated with Appwrite SDK.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'screenshotDark' => $url . '/images/sites/templates/starter-for-flutter-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/starter-for-flutter-light.png',
         'frameworks' => [
@@ -430,6 +476,8 @@ return [
         'key' => 'starter-for-js',
         'name' => 'JavaScript starter',
         'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple JavaScript application integrated with Appwrite SDK.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'screenshotDark' => $url . '/images/sites/templates/starter-for-js-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/starter-for-js-light.png',
         'frameworks' => [
@@ -472,6 +520,8 @@ return [
         'key' => 'starter-for-angular',
         'name' => 'Angular starter',
         'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple Angular application integrated with Appwrite SDK.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'screenshotDark' => $url . '/images/sites/templates/starter-for-angular-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/starter-for-angular-light.png',
         'frameworks' => [
@@ -516,6 +566,8 @@ return [
         'key' => 'starter-for-svelte',
         'name' => 'Svelte starter',
         'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple Svelte application integrated with Appwrite SDK.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'screenshotDark' => $url . '/images/sites/templates/starter-for-svelte-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/starter-for-svelte-light.png',
         'frameworks' => [
@@ -558,6 +610,8 @@ return [
         'key' => 'starter-for-react',
         'name' => 'React starter',
         'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple React application integrated with Appwrite SDK.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'screenshotDark' => $url . '/images/sites/templates/starter-for-react-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/starter-for-react-light.png',
         'frameworks' => [
@@ -600,6 +654,8 @@ return [
         'key' => 'starter-for-vue',
         'name' => 'Vue starter',
         'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple Vue application integrated with Appwrite SDK.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'screenshotDark' => $url . '/images/sites/templates/starter-for-vue-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/starter-for-vue-light.png',
         'frameworks' => [
@@ -642,6 +698,8 @@ return [
         'key' => 'starter-for-react-native',
         'name' => 'React Native starter',
         'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple React Native application integrated with Appwrite SDK.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'screenshotDark' => $url . '/images/sites/templates/starter-for-react-native-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/starter-for-react-native-light.png',
         'frameworks' => [
@@ -685,6 +743,8 @@ return [
         'key' => 'starter-for-nextjs',
         'name' => 'Next.js starter',
         'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple Next.js application integrated with Appwrite SDK.',
+        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'screenshotDark' => $url . '/images/sites/templates/starter-for-nextjs-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/starter-for-nextjs-light.png',
         'frameworks' => [
@@ -727,6 +787,8 @@ return [
         'key' => 'starter-for-nuxt',
         'name' => 'Nuxt starter',
         'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple Nuxt application integrated with Appwrite SDK.',
+        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'screenshotDark' => $url . '/images/sites/templates/starter-for-nuxt-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/starter-for-nuxt-light.png',
         'frameworks' => [
@@ -768,6 +830,8 @@ return [
     [
         'key' => 'template-for-event',
         'name' => 'Event template',
+        'tagline' => 'Hackathon landing page with support for project submissions.',
+        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::EVENTS],
         'screenshotDark' => $url . '/images/sites/templates/template-for-event-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/template-for-event-light.png',
@@ -804,6 +868,8 @@ return [
     [
         'key' => 'template-for-portfolio',
         'name' => 'Portfolio template',
+        'tagline' => 'Simple personal website to showcase your projects, articles, and more.',
+        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::PORTFOLIO],
         'screenshotDark' => $url . '/images/sites/templates/template-for-portfolio-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/template-for-portfolio-light.png',
@@ -821,6 +887,8 @@ return [
     [
         'key' => 'template-for-store',
         'name' => 'Store template',
+        'tagline' => 'E-commerce platform for selling products with Stripe integration.',
+        'score' => 7, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::ECOMMERCE],
         'screenshotDark' => $url . '/images/sites/templates/template-for-store-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/template-for-store-light.png',
@@ -863,6 +931,8 @@ return [
     [
         'key' => 'template-for-blog',
         'name' => 'Blog template',
+        'tagline' => 'Platform for publishing written content and media.',
+        'score' => 7, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::BLOG],
         'screenshotDark' => $url . '/images/sites/templates/template-for-blog-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/template-for-blog-light.png',
@@ -880,6 +950,8 @@ return [
     [
         'key' => 'astro-starter',
         'name' => 'Astro starter',
+        'tagline' => 'Sample application built with Astro, a content-driven web framework.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::STARTER],
         'screenshotDark' => $url . '/images/sites/templates/astro-starter-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/astro-starter-light.png',
@@ -897,6 +969,8 @@ return [
     [
         'key' => 'remix-starter',
         'name' => 'Remix starter',
+        'tagline' => 'Sample application built with Remix, a React meta-framework.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
         'useCases' => [UseCases::STARTER],
         'screenshotDark' => $url . '/images/sites/templates/remix-starter-dark.png',
         'screenshotLight' => $url . '/images/sites/templates/remix-starter-light.png',
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 3f105484e1..5ce0a03471 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -269,8 +269,13 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $resource->getAttribute('runtime', '') . '" is not supported');
         }
 
-        if ($deployment->getAttribute('status') !== 'ready') {
-            throw new AppwriteException(AppwriteException::BUILD_NOT_READY);
+        $allowAnyStatus = !\is_null($apiKey) && $apiKey->isDeploymentStatusIgnored();
+        if (!$allowAnyStatus && $deployment->getAttribute('status') !== 'ready') {
+            if ($deployment->getAttribute('status') === 'failed') {
+                throw new AppwriteException(AppwriteException::BUILD_FAILED);
+            } else {
+                throw new AppwriteException(AppwriteException::BUILD_NOT_READY);
+            }
         }
 
         if ($type === 'function') {
diff --git a/app/views/general/404.phtml b/app/views/general/404.phtml
index 7ec1cfbf21..5e63344c8a 100644
--- a/app/views/general/404.phtml
+++ b/app/views/general/404.phtml
@@ -7,6 +7,8 @@
     <title>404 Not Found</title>
 
     <style>
+        @import url(https://fonts.bunny.net/css?family=fira-code:400|inter:400);
+
         * {
             margin: 0;
             padding: 0;
@@ -36,7 +38,7 @@
             background: var(--color-overlay-on-neutral, rgba(0, 0, 0, 0.06));
             color: var(--color-fgColor-neutral-secondary, #56565C);
             text-align: center;
-            font-family: var(--font-family-sansSerif, Inter);
+            font-family: var(--font-family-sansSerif, Inter), sans-serif;
             font-size: var(--font-size-S, 14px);
             font-style: normal;
             font-weight: 400;
@@ -47,7 +49,7 @@
         h1 {
             color: var(--color-fgColor-neutral-primary, #2D2D31);
             text-align: center;
-            font-family: var(--font-family-sansSerif, Inter);
+            font-family: var(--font-family-sansSerif, Inter), sans-serif;
             font-size: var(--font-size-XXXL, 32px);
             font-style: normal;
             font-weight: 400;
@@ -59,7 +61,7 @@
 
         button {
             border-radius: var(--border-radius-S, 8px);
-            font-family: var(--font-family-sansSerif, Inter);
+            font-family: var(--font-family-sansSerif, Inter), sans-serif;
             font-size: var(--font-size-S, 14px);
             font-style: normal;
             font-weight: 500;
@@ -88,7 +90,7 @@
         }
 
         .brand p {
-            font-family: var(--font-family-monospace, "Aeonik Fono");
+            font-family: var(--font-family-monospace, "Fira Code"), monospace;
             font-size: var(--font-size-XS, 12px);
             font-style: normal;
             font-weight: 400;
diff --git a/composer.lock b/composer.lock
index 88cb3586d6..33550a105c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -709,16 +709,16 @@
         },
         {
             "name": "google/protobuf",
-            "version": "v4.30.1",
+            "version": "v4.30.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/protocolbuffers/protobuf-php.git",
-                "reference": "f29ba8a30dfd940efb3a8a75dc44446539101f24"
+                "reference": "a4c4d8565b40b9f76debc9dfeb221412eacb8ced"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/f29ba8a30dfd940efb3a8a75dc44446539101f24",
-                "reference": "f29ba8a30dfd940efb3a8a75dc44446539101f24",
+                "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/a4c4d8565b40b9f76debc9dfeb221412eacb8ced",
+                "reference": "a4c4d8565b40b9f76debc9dfeb221412eacb8ced",
                 "shasum": ""
             },
             "require": {
@@ -747,9 +747,9 @@
                 "proto"
             ],
             "support": {
-                "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.30.1"
+                "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.30.2"
             },
-            "time": "2025-03-13T21:08:17+00:00"
+            "time": "2025-03-26T18:01:50+00:00"
         },
         {
             "name": "jean85/pretty-package-versions",
@@ -5089,16 +5089,16 @@
     "packages-dev": [
         {
             "name": "appwrite/sdk-generator",
-            "version": "0.40.10",
+            "version": "0.40.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "054ac96285caf4f77879087b2416a5ddb8263051"
+                "reference": "0ec5f4a60c15e33e208bc3444ba6148b1d0f0027"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/054ac96285caf4f77879087b2416a5ddb8263051",
-                "reference": "054ac96285caf4f77879087b2416a5ddb8263051",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/0ec5f4a60c15e33e208bc3444ba6148b1d0f0027",
+                "reference": "0ec5f4a60c15e33e208bc3444ba6148b1d0f0027",
                 "shasum": ""
             },
             "require": {
@@ -5134,9 +5134,9 @@
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
             "support": {
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/0.40.10"
+                "source": "https://github.com/appwrite/sdk-generator/tree/0.40.11"
             },
-            "time": "2025-03-25T13:44:16+00:00"
+            "time": "2025-03-26T10:53:16+00:00"
         },
         {
             "name": "doctrine/annotations",
diff --git a/public/images/sites/templates/lynx-starter-dark.png b/public/images/sites/templates/lynx-starter-dark.png
new file mode 100644
index 0000000000..017b00907f
Binary files /dev/null and b/public/images/sites/templates/lynx-starter-dark.png differ
diff --git a/public/images/sites/templates/lynx-starter-light.png b/public/images/sites/templates/lynx-starter-light.png
new file mode 100644
index 0000000000..0ffb0cfa43
Binary files /dev/null and b/public/images/sites/templates/lynx-starter-light.png differ
diff --git a/src/Appwrite/Auth/Key.php b/src/Appwrite/Auth/Key.php
index 89c28c4727..44a75a6ee3 100644
--- a/src/Appwrite/Auth/Key.php
+++ b/src/Appwrite/Auth/Key.php
@@ -24,6 +24,7 @@ class Key
         protected bool $bannerDisabled = false,
         protected bool $projectCheckDisabled = false,
         protected bool $previewAuthDisabled = false,
+        protected bool $deploymentStatusIgnored = false,
     ) {
     }
 
@@ -79,6 +80,11 @@ class Key
         return $this->previewAuthDisabled;
     }
 
+    public function isDeploymentStatusIgnored(): bool
+    {
+        return $this->deploymentStatusIgnored;
+    }
+
     public function isProjectCheckDisabled(): bool
     {
         return $this->projectCheckDisabled;
@@ -139,6 +145,7 @@ class Key
                 $bannerDisabled = $payload['bannerDisabled'] ?? false;
                 $projectCheckDisabled = $payload['projectCheckDisabled'] ?? false;
                 $previewAuthDisabled = $payload['previewAuthDisabled'] ?? false;
+                $deploymentStatusIgnored = $payload['deploymentStatusIgnored'] ?? false;
                 $scopes = \array_merge($payload['scopes'] ?? [], $scopes);
 
                 if (!$projectCheckDisabled && $projectId !== $project->getId()) {
@@ -156,7 +163,8 @@ class Key
                     $hostnameOverride,
                     $bannerDisabled,
                     $projectCheckDisabled,
-                    $previewAuthDisabled
+                    $previewAuthDisabled,
+                    $deploymentStatusIgnored
                 );
             case API_KEY_STANDARD:
                 $key = $project->find(
diff --git a/src/Appwrite/Extend/Exception.php b/src/Appwrite/Extend/Exception.php
index db8f5f7134..338da29403 100644
--- a/src/Appwrite/Extend/Exception.php
+++ b/src/Appwrite/Extend/Exception.php
@@ -174,6 +174,7 @@ class Exception extends \Exception
     public const BUILD_NOT_READY                   = 'build_not_ready';
     public const BUILD_IN_PROGRESS                 = 'build_in_progress';
     public const BUILD_ALREADY_COMPLETED           = 'build_already_completed';
+    public const BUILD_FAILED                      = 'build_failed';
 
     /** Execution */
     public const EXECUTION_NOT_FOUND               = 'execution_not_found';
diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
index 3f28e7a7ce..18e52e7e16 100644
--- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
@@ -41,6 +41,8 @@ use Utopia\Storage\Device\Local;
 use Utopia\System\System;
 use Utopia\VCS\Adapter\Git\GitHub;
 
+use function Swoole\Coroutine\batch;
+
 class Builds extends Action
 {
     public static function getName(): string
@@ -783,7 +785,6 @@ class Builds extends Action
             $deployment->setAttribute('buildStartAt', DateTime::format((new \DateTime())->setTimestamp(floor($response['startTime']))));
             $deployment->setAttribute('buildEndAt', $endTime);
             $deployment->setAttribute('buildDuration', \intval(\ceil($durationEnd - $durationStart)));
-            $deployment->setAttribute('status', 'ready');
             $deployment->setAttribute('buildPath', $response['path']);
             $deployment->setAttribute('buildSize', $response['size']);
             $deployment->setAttribute('totalSize', $deployment->getAttribute('buildSize', 0) + $deployment->getAttribute('sourceSize', 0));
@@ -792,25 +793,16 @@ class Builds extends Action
             foreach ($response['output'] as $log) {
                 $logs .= $log['content'];
             }
+            $logs .= "Capturing screenshots ...\n";
             $deployment->setAttribute('buildLogs', $logs);
 
-            $deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment);
-
-            if ($deployment->getInternalId() === $resource->getAttribute('latestDeploymentInternalId', '')) {
-                $resource = $resource->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
-                $dbForProject->updateDocument($resource->getCollection(), $resource->getId(), $resource);
-            }
+            $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
 
             $queueForRealtime
                 ->setPayload($deployment->getArrayCopy())
                 ->trigger();
 
-            if ($isVcsEnabled) {
-                $this->runGitAction('ready', $github, $providerCommitHash, $owner, $repositoryName, $project, $resource, $deployment->getId(), $dbForProject, $dbForPlatform);
-            }
-
-            Console::success("Build id: $deploymentId created");
-
+            /** Screenshot site */
             if ($resource->getCollection() === 'sites') {
                 try {
                     $rule = Authorization::skip(fn () => $dbForPlatform->findOne('rules', [
@@ -848,72 +840,89 @@ class Builds extends Action
                         'bannerDisabled' => true,
                         'projectCheckDisabled' => true,
                         'previewAuthDisabled' => true,
+                        'deploymentStatusIgnored' => true
                     ]);
 
-                    // TODO: @Meldiron if becomes too slow, do concurrently
-                    foreach ($configs as $key => $config) {
-                        $config['headers'] = \array_merge($config['headers'] ?? [], [
-                            'x-appwrite-key' => API_KEY_DYNAMIC . '_' . $apiKey
-                        ]);
+                    $screenshotError = null;
+                    $screenshots = batch(\array_map(function ($key) use ($configs, $deviceForFiles, $apiKey, $resource, $client, $bucket, $project, $dbForPlatform, &$screenshotError) {
+                        return function () use ($key, $configs, $deviceForFiles, $apiKey, $resource, $client, $bucket, $project, $dbForPlatform, &$screenshotError) {
+                            try {
+                                $config = $configs[$key];
 
-                        $config['sleep'] = 3000;
+                                $config['headers'] = \array_merge($config['headers'] ?? [], [
+                                    'x-appwrite-key' => API_KEY_DYNAMIC . '_' . $apiKey
+                                ]);
+                                $config['sleep'] = 3000;
 
-                        $frameworks = Config::getParam('frameworks', []);
-                        $framework = $frameworks[$resource->getAttribute('framework', '')] ?? null;
-                        if (!is_null($framework)) {
-                            $config['sleep'] = $framework['screenshotSleep'];
-                        }
+                                $frameworks = Config::getParam('frameworks', []);
+                                $framework = $frameworks[$resource->getAttribute('framework', '')] ?? null;
+                                if (!is_null($framework)) {
+                                    $config['sleep'] = $framework['screenshotSleep'];
+                                }
 
-                        $response = $client->fetch(
-                            url: 'http://appwrite-browser:3000/v1/screenshots',
-                            method: 'POST',
-                            body: $config
-                        );
+                                $fetchResponse = $client->fetch(
+                                    url: 'http://appwrite-browser:3000/v1/screenshots',
+                                    method: 'POST',
+                                    body: $config
+                                );
 
-                        if ($response->getStatusCode() >= 400) {
-                            throw new \Exception($response->getBody());
-                        }
+                                if ($fetchResponse->getStatusCode() >= 400) {
+                                    throw new \Exception($fetchResponse->getBody());
+                                }
 
-                        $screenshot = $response->getBody();
+                                $screenshot = $fetchResponse->getBody();
 
-                        $fileId = ID::unique();
-                        $fileName = $fileId . '.png';
-                        $path = $deviceForFiles->getPath($fileName);
-                        $path = str_ireplace($deviceForFiles->getRoot(), $deviceForFiles->getRoot() . DIRECTORY_SEPARATOR . $bucket->getId(), $path); // Add bucket id to path after root
-                        $success = $deviceForFiles->write($path, $screenshot, "image/png");
+                                $fileId = ID::unique();
+                                $fileName = $fileId . '.png';
+                                $path = $deviceForFiles->getPath($fileName);
+                                $path = str_ireplace($deviceForFiles->getRoot(), $deviceForFiles->getRoot() . DIRECTORY_SEPARATOR . $bucket->getId(), $path); // Add bucket id to path after root
+                                $success = $deviceForFiles->write($path, $screenshot, "image/png");
 
-                        if (!$success) {
-                            throw new \Exception("Screenshot failed to save");
-                        }
+                                if (!$success) {
+                                    throw new \Exception("Screenshot failed to save");
+                                }
 
-                        $teamId = $project->getAttribute('teamId', '');
-                        $file = new Document([
-                            '$id' => $fileId,
-                            '$permissions' => [
-                                Permission::read(Role::team(ID::custom($teamId))),
-                            ],
-                            'bucketId' => $bucket->getId(),
-                            'bucketInternalId' => $bucket->getInternalId(),
-                            'name' => $fileName,
-                            'path' => $path,
-                            'signature' => $deviceForFiles->getFileHash($path),
-                            'mimeType' => $deviceForFiles->getFileMimeType($path),
-                            'sizeOriginal' => \strlen($screenshot),
-                            'sizeActual' => $deviceForFiles->getFileSize($path),
-                            'algorithm' => Compression::GZIP,
-                            'comment' => '',
-                            'chunksTotal' => 1,
-                            'chunksUploaded' => 1,
-                            'openSSLVersion' => null,
-                            'openSSLCipher' => null,
-                            'openSSLTag' => null,
-                            'openSSLIV' => null,
-                            'search' => implode(' ', [$fileId, $fileName]),
-                            'metadata' => ['content_type' => $deviceForFiles->getFileMimeType($path)],
-                        ]);
-                        $file = Authorization::skip(fn () => $dbForPlatform->createDocument('bucket_' . $bucket->getInternalId(), $file));
+                                $teamId = $project->getAttribute('teamId', '');
+                                $file = new Document([
+                                    '$id' => $fileId,
+                                    '$permissions' => [
+                                        Permission::read(Role::team(ID::custom($teamId))),
+                                    ],
+                                    'bucketId' => $bucket->getId(),
+                                    'bucketInternalId' => $bucket->getInternalId(),
+                                    'name' => $fileName,
+                                    'path' => $path,
+                                    'signature' => $deviceForFiles->getFileHash($path),
+                                    'mimeType' => $deviceForFiles->getFileMimeType($path),
+                                    'sizeOriginal' => \strlen($screenshot),
+                                    'sizeActual' => $deviceForFiles->getFileSize($path),
+                                    'algorithm' => Compression::GZIP,
+                                    'comment' => '',
+                                    'chunksTotal' => 1,
+                                    'chunksUploaded' => 1,
+                                    'openSSLVersion' => null,
+                                    'openSSLCipher' => null,
+                                    'openSSLTag' => null,
+                                    'openSSLIV' => null,
+                                    'search' => implode(' ', [$fileId, $fileName]),
+                                    'metadata' => ['content_type' => $deviceForFiles->getFileMimeType($path)],
+                                ]);
+                                $file = Authorization::skip(fn () => $dbForPlatform->createDocument('bucket_' . $bucket->getInternalId(), $file));
 
-                        $deployment->setAttribute($key, $fileId);
+                                return [ 'key' => $key, 'fileId' => $fileId ];
+                            } catch (\Throwable $th) {
+                                $screenshotError = $th->getMessage();
+                                return;
+                            }
+                        };
+                    }, \array_keys($configs)));
+
+                    if (!\is_null($screenshotError)) {
+                        throw new \Exception($screenshotError);
+                    }
+
+                    foreach ($screenshots as $screenshot) {
+                        $deployment->setAttribute($screenshot['key'], $screenshot['fileId']);
                     }
 
                     $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
@@ -928,6 +937,25 @@ class Builds extends Action
                 }
             }
 
+            /** Update the status */
+            $deployment->setAttribute('status', 'ready');
+            $deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment);
+
+            if ($deployment->getInternalId() === $resource->getAttribute('latestDeploymentInternalId', '')) {
+                $resource = $resource->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
+                $dbForProject->updateDocument($resource->getCollection(), $resource->getId(), $resource);
+            }
+
+            $queueForRealtime
+                ->setPayload($deployment->getArrayCopy())
+                ->trigger();
+
+            if ($isVcsEnabled) {
+                $this->runGitAction('ready', $github, $providerCommitHash, $owner, $repositoryName, $project, $resource, $deployment->getId(), $dbForProject, $dbForPlatform);
+            }
+
+            Console::success("Build id: $deploymentId created");
+
             /** Set auto deploy */
             if ($deployment->getAttribute('activate') === true) {
                 $resource->setAttribute('live', true);
@@ -1066,6 +1094,12 @@ class Builds extends Action
                 Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
             }
         } catch (\Throwable $th) {
+            Console::warning('Build failed:');
+            Console::error($th->getMessage());
+            Console::error($th->getFile());
+            Console::error($th->getLine());
+            Console::error($th->getTraceAsString());
+
             if ($dbForProject->getDocument('deployments', $deploymentId)->getAttribute('status') === 'canceled') {
                 Console::info('Build has been canceled');
                 return;
diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Templates/Get.php b/src/Appwrite/Platform/Modules/Sites/Http/Templates/Get.php
index 5d6a7aa3ba..25183d768a 100644
--- a/src/Appwrite/Platform/Modules/Sites/Http/Templates/Get.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Templates/Get.php
@@ -29,7 +29,7 @@ class Get extends Base
             ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
             ->setHttpPath('/v1/sites/templates/:templateId')
             ->desc('Get site template')
-            ->groups(['api', 'sites'])
+            ->groups(['api'])
             ->label('scope', 'public')
             ->label('resourceType', RESOURCE_TYPE_SITES)
             ->label('sdk', new Method(
diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Templates/XList.php b/src/Appwrite/Platform/Modules/Sites/Http/Templates/XList.php
index 9ab6942da3..dd87a60dd0 100644
--- a/src/Appwrite/Platform/Modules/Sites/Http/Templates/XList.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Templates/XList.php
@@ -30,7 +30,7 @@ class XList extends Base
             ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
             ->setHttpPath('/v1/sites/templates')
             ->desc('List templates')
-            ->groups(['api', 'sites'])
+            ->groups(['api'])
             ->label('scope', 'public')
             ->label('resourceType', RESOURCE_TYPE_SITES)
             ->label('sdk', new Method(
@@ -76,10 +76,15 @@ class XList extends Base
             });
         }
 
-        $responseTemplates = \array_slice($templates, $offset, $limit);
+        \usort($templates, function ($a, $b) {
+            return $b['score'] <=> $a['score'];
+        });
+
+        $templates = \array_slice($templates, $offset, $limit);
+
         $response->dynamic(new Document([
-            'templates' => $responseTemplates,
-            'total' => \count($responseTemplates),
+            'templates' => $templates,
+            'total' => \count($templates),
         ]), Response::MODEL_TEMPLATE_SITE_LIST);
     }
 }
diff --git a/src/Appwrite/Transformation/Adapter/Preview.php b/src/Appwrite/Transformation/Adapter/Preview.php
index 94f1454593..352dc97204 100644
--- a/src/Appwrite/Transformation/Adapter/Preview.php
+++ b/src/Appwrite/Transformation/Adapter/Preview.php
@@ -33,6 +33,8 @@ class Preview extends Adapter
 
         $banner = <<<EOT
         <style>
+            @import url(https://fonts.bunny.net/css?family=fira-code:400|inter:400);
+            
             #appwrite-preview {
                 padding: 0;
                 margin: 0;
@@ -80,7 +82,7 @@ class Preview extends Adapter
                 padding: 0;
                 margin: 0;
                 color: var(--color-fgColor-neutral-secondary, #56565C);
-                font-family: var(--font-family-sansSerif, Inter);
+                font-family: var(--font-family-sansSerif, Inter), sans-serif;
                 font-size: var(--font-size-XS, 12px);
                 font-style: normal;
                 font-weight: 500;
@@ -97,7 +99,7 @@ class Preview extends Adapter
                 padding: var(--space-1, 2px) var(--space-2, 4px);
                 color: var(--color-fgColor-neutral-secondary, #56565C);
                 text-align: center;
-                font-family: var(--font-family-sansSerif, Inter);
+                font-family: var(--font-family-sansSerif, Inter), sans-serif;
                 font-size: var(--font-size-XS, 12px);
                 font-style: normal;
                 font-weight: 400;
@@ -120,7 +122,7 @@ class Preview extends Adapter
 
                 #appwrite-preview-text {
                 color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-                    font-family: var(--font-family-sansSerif, Inter);
+                    font-family: var(--font-family-sansSerif, Inter), sans-serif;
                     font-size: var(--font-size-XS, 12px);
                 }
 
diff --git a/src/Appwrite/Utopia/Response/Model/TemplateSite.php b/src/Appwrite/Utopia/Response/Model/TemplateSite.php
index fe123bde53..053742dfdb 100644
--- a/src/Appwrite/Utopia/Response/Model/TemplateSite.php
+++ b/src/Appwrite/Utopia/Response/Model/TemplateSite.php
@@ -22,6 +22,12 @@ class TemplateSite extends Model
                 'default' => '',
                 'example' => 'Starter site',
             ])
+            ->addRule('tagline', [
+                'type' => self::TYPE_STRING,
+                'description' => 'Short description of template',
+                'default' => '',
+                'example' => 'Minimal web app integrating with Appwrite.',
+            ])
             ->addRule('demoUrl', [
                 'type' => self::TYPE_STRING,
                 'description' => 'URL hosting a template demo.',
diff --git a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
index c7e65cc2ef..4e27457b05 100644
--- a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
@@ -614,19 +614,26 @@ class RealtimeConsoleClientTest extends Scope
 
             $previousBuildLogs = $response['data']['payload']['buildLogs'];
 
-            $this->assertThat(
-                $response['data']['payload']['status'],
-                $this->logicalOr(
-                    $this->equalTo('building'),
-                    $this->equalTo('ready'),
-                ),
-            );
+            $this->assertEquals('building', $response['data']['payload']['status']);
 
-            if ($response['data']['payload']['status'] === 'ready') {
+            if (!empty($response['data']['payload']['buildEndAt'])) {
+                $this->assertNotEmpty($response['data']['payload']['buildEndAt']);
+                $this->assertNotEmpty($response['data']['payload']['buildStartAt']);
+                $this->assertNotEmpty($response['data']['payload']['buildDuration']);
+                $this->assertNotEmpty($response['data']['payload']['buildPath']);
+                $this->assertNotEmpty($response['data']['payload']['buildSize']);
+                $this->assertNotEmpty($response['data']['payload']['totalSize']);
+                $this->assertNotEmpty($response['data']['payload']['buildLogs']);
                 break;
             }
         }
 
+        $response = json_decode($client->receive(), true);
+        $this->assertContains("functions.{$functionId}.deployments.{$deploymentId}.update", $response['data']['events']);
+        $this->assertContains('console', $response['data']['channels']);
+        $this->assertContains("projects.{$projectId}", $response['data']['channels']);
+        $this->assertEquals("ready", $response['data']['payload']['status']);
+
         $client->close();
     }
 }
diff --git a/tests/e2e/Services/Sites/SitesCustomClientTest.php b/tests/e2e/Services/Sites/SitesCustomClientTest.php
index 256c753d74..ad1a218c3c 100644
--- a/tests/e2e/Services/Sites/SitesCustomClientTest.php
+++ b/tests/e2e/Services/Sites/SitesCustomClientTest.php
@@ -37,6 +37,7 @@ class SitesCustomClientTest extends Scope
             $this->assertArrayHasKey('variables', $template);
             $this->assertArrayHasKey('screenshotDark', $template);
             $this->assertArrayHasKey('screenshotLight', $template);
+            $this->assertArrayHasKey('tagline', $template);
         }
 
         // List templates with pagination
@@ -126,6 +127,7 @@ class SitesCustomClientTest extends Scope
         $this->assertEquals('React starter', $template['body']['name']);
         $this->assertEquals(['starter'], $template['body']['useCases']);
         $this->assertEquals('github', $template['body']['vcsProvider']);
+        $this->assertEquals('Simple React application integrated with Appwrite SDK.', $template['body']['tagline']);
         $this->assertIsArray($template['body']['frameworks']);
         $this->assertEquals('http://localhost/images/sites/templates/starter-for-react-dark.png', $template['body']['screenshotDark']);
         $this->assertEquals('http://localhost/images/sites/templates/starter-for-react-light.png', $template['body']['screenshotLight']);
diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php
index ec941a9f56..bfef38ee10 100644
--- a/tests/e2e/Services/Sites/SitesCustomServerTest.php
+++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php
@@ -2394,6 +2394,43 @@ class SitesCustomServerTest extends Scope
         $this->cleanupSite($siteId);
     }
 
+    public function testDomainForFailedDeloyment(): void
+    {
+        $siteId = $this->setupSite([
+            'siteId' => ID::unique(),
+            'name' => 'Test Site',
+            'framework' => 'astro',
+            'buildRuntime' => 'node-22',
+            'buildCommand' => 'cd random'
+        ]);
+
+        $this->assertNotEmpty($siteId);
+
+        $domain = $this->setupSiteDomain($siteId);
+        $this->assertNotEmpty($domain);
+        $proxyClient = new Client();
+        $proxyClient->setEndpoint('http://' . $domain);
+
+        $deployment = $this->createDeployment($siteId, [
+            'code' => $this->packageSite('astro'),
+            'activate' => true
+        ]);
+        $this->assertEquals(202, $deployment['headers']['status-code']);
+
+        $deploymentId = $deployment['body']['$id'];
+        $this->assertNotEmpty($deploymentId);
+
+        $this->assertEventually(function () use ($siteId, $deploymentId) {
+            $deployment = $this->getDeployment($siteId, $deploymentId);
+            $this->assertEquals('failed', $deployment['body']['status'], json_encode($deployment['body'], JSON_PRETTY_PRINT));
+        }, 100000, 500);
+
+        $response = $proxyClient->call(Client::METHOD_GET, '/');
+        $this->assertStringContainsString('build_failed', $response['body']);
+
+        $this->cleanupSite($siteId);
+    }
+
     public function testPermanentRedirect(): void
     {
         $siteId = $this->setupSite([