diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/connectRepoModal.svelte b/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/connectRepoModal.svelte
index 0d7e074e3..628312fe4 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/connectRepoModal.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/connectRepoModal.svelte
@@ -8,7 +8,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { trackEvent } from '$lib/actions/analytics';
     import { onMount } from 'svelte';
-    import type { Models } from '@appwrite.io/console';
+    import { BuildRuntime, Framework, ServeRuntime, type Models } from '@appwrite.io/console';
     import { IconArrowSmRight } from '@appwrite.io/pink-icons-svelte';
     import { Link } from '$lib/elements';
 
@@ -38,14 +38,15 @@
             await sdk.forProject.sites.update(
                 site.$id,
                 site.name,
-                site.framework,
+                Framework[site.framework],
                 site.enabled,
                 site.timeout,
                 site.installCommand,
                 site.buildCommand,
                 site.outputDirectory,
-                site.buildRuntime,
-                site.serveRuntime,
+                BuildRuntime[site.buildRuntime],
+                ServeRuntime[site.serveRuntime],
+                site.fallbackFile,
                 selectedInstallationId,
                 selectedRepository
             );
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
index 2b2fc2141..d27204734 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
@@ -41,6 +41,7 @@
                 outputDirectory || undefined,
                 BuildRuntime[site?.buildRuntime] || undefined,
                 ServeRuntime[site?.serveRuntime] || undefined,
+                site.fallbackFile || undefined,
                 site.installationId || undefined,
                 site.providerRepositoryId || undefined,
                 site.providerBranch || undefined,
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte
index 04eb69e68..e931d1f17 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte
@@ -29,6 +29,7 @@
                 site.outputDirectory || undefined,
                 BuildRuntime[site?.buildRuntime] || undefined,
                 ServeRuntime[site?.serveRuntime] || undefined,
+                site.fallbackFile || undefined,
                 site.installationId || undefined,
                 site.providerRepositoryId || undefined,
                 site.providerBranch || undefined,
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte
index 5a18bd48d..7b2388a2d 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte
@@ -76,6 +76,7 @@
                 site.outputDirectory || undefined,
                 BuildRuntime[site?.buildRuntime] || undefined,
                 ServeRuntime[site?.serveRuntime] || undefined,
+                site.fallbackFile || undefined,
                 site.installationId || undefined,
                 site.providerRepositoryId || undefined,
                 selectedBranch || undefined,
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte
index 866a68c76..2824f3a57 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte
@@ -45,6 +45,7 @@
                 site.outputDirectory || undefined,
                 BuildRuntime[site?.buildRuntime] || undefined,
                 ServeRuntime[site?.serveRuntime] || undefined,
+                site.fallbackFile || undefined,
                 site.installationId || undefined,
                 site.providerRepositoryId || undefined,
                 site.providerBranch || undefined,
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte
index f78198409..4f0577e52 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateSPA.svelte
@@ -16,7 +16,8 @@
     let fallback = '';
 
     onMount(async () => {
-        fallback ??= site.name; //TODO: fix
+        fallback ??= site.fallbackFile;
+        if (fallback !== undefined) spa = true;
     });
 
     async function updateSPA() {
@@ -32,6 +33,7 @@
                 site.outputDirectory || undefined,
                 BuildRuntime[site?.buildRuntime] || undefined,
                 ServeRuntime[site?.serveRuntime] || undefined,
+                fallback,
                 site.installationId || undefined,
                 site.providerRepositoryId || undefined,
                 site.providerBranch || undefined,
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte
index 1c14314ee..d9ee574a9 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte
@@ -30,6 +30,7 @@
                 site.outputDirectory || undefined,
                 BuildRuntime[site?.buildRuntime] || undefined,
                 ServeRuntime[site?.serveRuntime] || undefined,
+                site.fallbackFile || undefined,
                 site.installationId || undefined,
                 site.providerRepositoryId || undefined,
                 site.providerBranch || undefined,