diff --git a/bun.lock b/bun.lock
index 0a5f69472f..2a74992a07 100644
--- a/bun.lock
+++ b/bun.lock
@@ -6,7 +6,7 @@
       "name": "@appwrite/console",
       "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@297fbee",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@41152f5",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@df765cc",
         "@appwrite.io/pink-legacy": "^1.0.3",
@@ -109,7 +109,7 @@
 
     "@analytics/type-utils": ["@analytics/type-utils@0.6.4", "", {}, "sha512-Ou1gQxFakOWLcPnbFVsrPb8g1wLLUZYYJXDPjHkG07+5mustGs5yqACx42UAu4A6NszNN6Z5gGxhyH45zPWRxw=="],
 
-    "@appwrite.io/console": ["@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@297fbee", { "dependencies": { "json-bigint": "1.0.0" } }],
+    "@appwrite.io/console": ["@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@41152f5", { "dependencies": { "json-bigint": "1.0.0" } }],
 
     "@appwrite.io/pink-icons": ["@appwrite.io/pink-icons@0.25.0", "", {}, "sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q=="],
 
diff --git a/package.json b/package.json
index ecf9902458..b4d8f490ac 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@297fbee",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@41152f5",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@df765cc",
         "@appwrite.io/pink-legacy": "^1.0.3",
diff --git a/src/lib/stores/migration.ts b/src/lib/stores/migration.ts
index 3ecb71e42f..53ec933ddc 100644
--- a/src/lib/stores/migration.ts
+++ b/src/lib/stores/migration.ts
@@ -43,6 +43,10 @@ const initialFormData = {
     sites: {
         root: false,
         deploymentInactive: false
+    },
+    messaging: {
+        root: false,
+        messages: false
     }
 };
 
@@ -76,7 +80,11 @@ export const ResourcesFriendly = {
     row: { singular: 'Row', plural: 'Rows' },
     site: { singular: 'Site', plural: 'Sites' },
     'site-deployment': { singular: 'Site Deployment', plural: 'Site Deployments' },
-    'site-variable': { singular: 'Site Variable', plural: 'Site Variables' }
+    'site-variable': { singular: 'Site Variable', plural: 'Site Variables' },
+    provider: { singular: 'Provider', plural: 'Providers' },
+    topic: { singular: 'Topic', plural: 'Topics' },
+    subscriber: { singular: 'Subscriber', plural: 'Subscribers' },
+    message: { singular: 'Message', plural: 'Messages' }
 };
 
 export const providerResources: ProviderResourceMap = {
@@ -132,6 +140,14 @@ export const migrationFormToResources = <P extends Provider>(
             addResource(ResourceType.Sitedeployment);
         }
     }
+    if (formData.messaging.root) {
+        addResource(ResourceType.Provider);
+        addResource(ResourceType.Topic);
+        addResource(ResourceType.Subscriber);
+    }
+    if (formData.messaging.messages) {
+        addResource(ResourceType.Message);
+    }
 
     return resources as ProviderResourceMap[P];
 };
@@ -194,6 +210,12 @@ export const resourcesToMigrationForm = (resources: MigrationResource[]): Migrat
     if (resources.includes(ResourceType.Sitedeployment)) {
         formData.sites.deploymentInactive = true;
     }
+    if (resources.includes(ResourceType.Provider)) {
+        formData.messaging.root = true;
+    }
+    if (resources.includes(ResourceType.Message)) {
+        formData.messaging.messages = true;
+    }
 
     return formData;
 };
diff --git a/src/routes/(console)/(migration-wizard)/resource-form.svelte b/src/routes/(console)/(migration-wizard)/resource-form.svelte
index ad57fd720b..bd51765b5f 100644
--- a/src/routes/(console)/(migration-wizard)/resource-form.svelte
+++ b/src/routes/(console)/(migration-wizard)/resource-form.svelte
@@ -108,6 +108,10 @@
             return resources.includes(ResourceType.Site);
         }
 
+        if (groupKey === 'messaging') {
+            return resources.includes(ResourceType.Provider);
+        }
+
         const groupToResource: Record<string, MigrationResource> = {
             users: ResourceType.User,
             databases: ResourceType.Database
@@ -127,7 +131,8 @@
             databases: 'database',
             functions: 'function',
             storage: 'bucket',
-            sites: 'site'
+            sites: 'site',
+            messaging: 'provider'
         };
         return map[groupKey] || groupKey;
     };
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte
index 684095010a..26410e3e69 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte
@@ -105,7 +105,7 @@
                     commands: installCommand || undefined,
                     scopes: selectedScopes?.length ? selectedScopes : undefined,
                     providerSilentMode: false,
-                    specification: specification || undefined
+                    buildSpecification: specification || undefined
                 });
 
             // Add domain
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte
index 1a2b1ab93c..514a2b5d98 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte
@@ -73,7 +73,7 @@
                 enabled: true,
                 entrypoint,
                 commands: buildCommand,
-                specification: specification || undefined
+                buildSpecification: specification || undefined
             });
 
             // Add domain
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte
index 20dcb484c7..7993e419df 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte
@@ -119,7 +119,7 @@
                     providerBranch: branch,
                     providerSilentMode: silentMode,
                     providerRootDirectory: rootDir,
-                    specification: specification || undefined
+                    buildSpecification: specification || undefined
                 });
 
             // Add domain
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte
index eee490a432..8aef379d1a 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte
@@ -154,7 +154,7 @@
                         providerBranch: branch,
                         providerSilentMode: silentMode,
                         providerRootDirectory: rootDir,
-                        specification: specification || undefined
+                        buildSpecification: specification || undefined
                     });
 
                 // Add domain
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateBuildCommand.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateBuildCommand.svelte
index 1625ebfa8f..bab13e4b42 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateBuildCommand.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateBuildCommand.svelte
@@ -36,7 +36,7 @@
                 providerBranch: func.providerBranch || undefined,
                 providerSilentMode: func.providerSilentMode || undefined,
                 providerRootDirectory: func.providerRootDirectory || undefined,
-                specification: func.specification || undefined
+                buildSpecification: func.buildSpecification || undefined
             });
 
             await invalidate(Dependencies.FUNCTION);
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte
index bd171cd6f8..662daa9f80 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte
@@ -47,7 +47,7 @@
                 providerBranch: $func.providerBranch || undefined,
                 providerSilentMode: $func.providerSilentMode || undefined,
                 providerRootDirectory: $func.providerRootDirectory || undefined,
-                specification: $func.specification || undefined
+                buildSpecification: $func.buildSpecification || undefined
             });
             await invalidate(Dependencies.FUNCTION);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte
index a943d03ca1..08aaa8a013 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte
@@ -37,7 +37,7 @@
                 providerBranch: func.providerBranch || undefined,
                 providerSilentMode: func.providerSilentMode || undefined,
                 providerRootDirectory: func.providerRootDirectory || undefined,
-                specification: func.specification || undefined
+                buildSpecification: func.buildSpecification || undefined
             });
             await invalidate(Dependencies.FUNCTION);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte
index 0bf82a0ddd..60762ba04f 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte
@@ -42,7 +42,7 @@
                 providerBranch: $func.providerBranch || undefined,
                 providerSilentMode: $func.providerSilentMode || undefined,
                 providerRootDirectory: $func.providerRootDirectory || undefined,
-                specification: $func.specification || undefined
+                buildSpecification: $func.buildSpecification || undefined
             });
             await invalidate(Dependencies.FUNCTION);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte
index a8e5ad7912..a68e5918ad 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte
@@ -47,7 +47,7 @@
                 providerBranch: $func.providerBranch || undefined,
                 providerSilentMode: $func.providerSilentMode || undefined,
                 providerRootDirectory: $func.providerRootDirectory || undefined,
-                specification: $func.specification || undefined
+                buildSpecification: $func.buildSpecification || undefined
             });
             await invalidate(Dependencies.FUNCTION);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte
index 691b5b9b33..3fe393723a 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte
@@ -18,9 +18,9 @@
     export let func: Models.Function;
     export let specs: Models.SpecificationList;
 
-    let specification = func.specification;
-    let originalSpecification = func.specification;
-    $: originalSpecification = func.specification;
+    let specification = func.buildSpecification;
+    let originalSpecification = func.buildSpecification;
+    $: originalSpecification = func.buildSpecification;
 
     async function updateLogging() {
         try {
@@ -45,7 +45,7 @@
                 providerBranch: func.providerBranch || undefined,
                 providerSilentMode: func.providerSilentMode || undefined,
                 providerRootDirectory: func.providerRootDirectory || undefined,
-                specification: specification || undefined
+                buildSpecification: specification || undefined
             });
 
             await invalidate(Dependencies.FUNCTION);
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte
index bf6722c982..e1b46ae30f 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte
@@ -46,7 +46,7 @@
                 providerBranch: $func.providerBranch || undefined,
                 providerSilentMode: $func.providerSilentMode || undefined,
                 providerRootDirectory: $func.providerRootDirectory || undefined,
-                specification: $func.specification || undefined
+                buildSpecification: $func.buildSpecification || undefined
             });
             await invalidate(Dependencies.FUNCTION);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte
index 0535226444..8cbe7f8306 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte
@@ -47,7 +47,7 @@
                 providerBranch: $func.providerBranch || undefined,
                 providerSilentMode: $func.providerSilentMode || undefined,
                 providerRootDirectory: $func.providerRootDirectory || undefined,
-                specification: $func.specification || undefined
+                buildSpecification: $func.buildSpecification || undefined
             });
             await invalidate(Dependencies.FUNCTION);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte
index 36b78a0aee..23a4bfb0c3 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte
@@ -45,7 +45,7 @@
                 providerBranch: $func.providerBranch || undefined,
                 providerSilentMode: $func.providerSilentMode || undefined,
                 providerRootDirectory: $func.providerRootDirectory || undefined,
-                specification: $func.specification || undefined
+                buildSpecification: $func.buildSpecification || undefined
             });
             await invalidate(Dependencies.FUNCTION);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte
index 533367984b..75f1d12429 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte
@@ -42,7 +42,7 @@
                 providerBranch: $func.providerBranch || undefined,
                 providerSilentMode: $func.providerSilentMode || undefined,
                 providerRootDirectory: $func.providerRootDirectory || undefined,
-                specification: $func.specification || undefined
+                buildSpecification: $func.buildSpecification || undefined
             });
             await invalidate(Dependencies.FUNCTION);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte
index e2cb67015b..4dbebc2174 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte
@@ -29,6 +29,10 @@
         sites: {
             root: 'Sites',
             deploymentInactive: 'Include inactive deployments'
+        },
+        messaging: {
+            root: 'Messaging',
+            messages: 'Include messages'
         }
     };
 
@@ -48,6 +52,10 @@
         sites: {
             root: 'Import all sites and their active deployment',
             deploymentInactive: 'Import all deployments that are not currently active'
+        },
+        messaging: {
+            root: 'Import all messaging providers, topics and subscribers',
+            messages: 'Import all messages'
         }
     };
 
diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte
index 584a36d370..9b9337f5a8 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte
@@ -106,6 +106,11 @@
                 Scopes.BucketsRead,
                 Scopes.FunctionsRead,
                 Scopes.ExecutionRead,
+                Scopes.SitesRead,
+                Scopes.ProvidersRead,
+                Scopes.TopicsRead,
+                Scopes.SubscribersRead,
+                Scopes.MessagesRead,
                 Scopes.LocaleRead,
                 Scopes.AvatarsRead,
                 Scopes.HealthRead
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte
index 363f84d11f..93d31addbf 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte
@@ -77,7 +77,7 @@
             providerBranch: nextBranch,
             providerSilentMode: data.site?.providerSilentMode ?? undefined,
             providerRootDirectory: data.site?.providerRootDirectory ?? undefined,
-            specification: data.site?.specification || undefined
+            buildSpecification: data.site?.buildSpecification || undefined
         });
         invalidate(Dependencies.SITE);
     }
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts
index d71de3091a..f07f7542f5 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts
@@ -39,8 +39,8 @@ export const load = async ({ params, depends, parent }) => {
     });
 
     const enabledSpecs = specificationsList?.specifications?.filter((s) => s.enabled) ?? [];
-    if (!enabledSpecs.some((s) => s.slug === site.specification)) {
-        site.specification = enabledSpecs[0]?.slug;
+    if (!enabledSpecs.some((s) => s.slug === site.buildSpecification)) {
+        site.buildSpecification = enabledSpecs[0]?.slug;
     }
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
index 0f4cbeef36..75f0f21837 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
@@ -112,8 +112,8 @@
                 site.adapter = adapter;
             }
             if (specs && specs.specifications?.length) {
-                if (!specs.specifications.some((s) => s.slug === site.specification)) {
-                    site.specification = specs.specifications[0].slug;
+                if (!specs.specifications.some((s) => s.slug === site.buildSpecification)) {
+                    site.buildSpecification = specs.specifications[0].slug;
                 }
             }
         }
@@ -128,10 +128,10 @@
         }
         // only allow enabled specsification for it
         const enabledSpecs = specs?.specifications?.filter((s) => s.enabled) ?? [];
-        let specToSend = enabledSpecs.some((s) => s.slug === site.specification)
-            ? site.specification
+        let specToSend = enabledSpecs.some((s) => s.slug === site.buildSpecification)
+            ? site.buildSpecification
             : enabledSpecs[0]?.slug;
-        site.specification = specToSend;
+        site.buildSpecification = specToSend;
         try {
             await sdk.forProject(page.params.region, page.params.project).sites.update({
                 siteId: site.$id,
@@ -151,7 +151,7 @@
                 providerBranch: site.providerBranch || undefined,
                 providerSilentMode: site.providerSilentMode || undefined,
                 providerRootDirectory: site.providerRootDirectory || undefined,
-                specification: specToSend || undefined
+                buildSpecification: specToSend || undefined
             });
             await invalidate(Dependencies.SITE);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateLogging.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateLogging.svelte
index 6b019116ce..a8b532e56d 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateLogging.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateLogging.svelte
@@ -33,7 +33,7 @@
                 providerBranch: site?.providerBranch || undefined,
                 providerSilentMode: site?.providerSilentMode || undefined,
                 providerRootDirectory: site?.providerRootDirectory || undefined,
-                specification: site?.specification || undefined
+                buildSpecification: site?.buildSpecification || undefined
             });
             await invalidate(Dependencies.SITE);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateName.svelte
index d8ae2e838e..79ffddcd0a 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateName.svelte
@@ -37,7 +37,7 @@
                 providerBranch: site?.providerBranch || undefined,
                 providerSilentMode: site?.providerSilentMode || undefined,
                 providerRootDirectory: site?.providerRootDirectory || undefined,
-                specification: site?.specification || undefined
+                buildSpecification: site?.buildSpecification || undefined
             });
             await invalidate(Dependencies.SITE);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRepository.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRepository.svelte
index 8386f52227..48fc077a18 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRepository.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRepository.svelte
@@ -86,7 +86,7 @@
                 providerBranch: selectedBranch || undefined,
                 providerSilentMode: silentMode || undefined,
                 providerRootDirectory: selectedDir || undefined,
-                specification: site?.specification || undefined
+                buildSpecification: site?.buildSpecification || undefined
             });
             await invalidate(Dependencies.SITE);
             addNotification({
@@ -152,7 +152,7 @@
             providerBranch: nextBranch,
             providerSilentMode: site?.providerSilentMode ?? undefined,
             providerRootDirectory: site?.providerRootDirectory ?? undefined,
-            specification: site?.specification || undefined
+            buildSpecification: site?.buildSpecification || undefined
         });
 
         invalidate(Dependencies.SITE);
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateResourceLimits.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateResourceLimits.svelte
index 01a56b0d62..a5379154eb 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateResourceLimits.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateResourceLimits.svelte
@@ -17,8 +17,8 @@
     export let site: Models.Site;
     export let specs: Models.SpecificationList;
 
-    let specification = site.specification;
-    let originalSpecification = site.specification;
+    let specification = site.buildSpecification;
+    let originalSpecification = site.buildSpecification;
 
     async function updateLogging() {
         try {
@@ -40,7 +40,7 @@
                 providerBranch: site?.providerBranch || undefined,
                 providerSilentMode: site?.providerSilentMode || undefined,
                 providerRootDirectory: site?.providerRootDirectory || undefined,
-                specification: specification || undefined
+                buildSpecification: specification || undefined
             });
             await invalidate(Dependencies.SITE);
             originalSpecification = specification;
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte
index 3f7ceccc2e..cdc6f1850e 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte
@@ -43,7 +43,7 @@
                 providerBranch: site?.providerBranch || undefined,
                 providerSilentMode: site?.providerSilentMode || undefined,
                 providerRootDirectory: site?.providerRootDirectory || undefined,
-                specification: site?.specification || undefined
+                buildSpecification: site?.buildSpecification || undefined
             });
             await invalidate(Dependencies.SITE);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateTimeout.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateTimeout.svelte
index 9a4493aac3..cd5ac82974 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateTimeout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateTimeout.svelte
@@ -36,7 +36,7 @@
                 providerBranch: site?.providerBranch || undefined,
                 providerSilentMode: site?.providerSilentMode || undefined,
                 providerRootDirectory: site?.providerRootDirectory || undefined,
-                specification: site?.specification || undefined
+                buildSpecification: site?.buildSpecification || undefined
             });
             await invalidate(Dependencies.SITE);
             addNotification({