diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
index 9e5bd18b6..c2f4fb73d 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
@@ -22,19 +22,12 @@
     } from '$lib/elements/forms';
     import { humanFileSize } from '$lib/helpers/sizeConvertion';
     import { calculateTime } from '$lib/helpers/timeConversion';
-    import {
-        WizardSecondaryContainer,
-        WizardSecondaryContent,
-        WizardSecondaryFooter
-    } from '$lib/layout';
+    import { WizardSecondaryContent, WizardSecondaryFooter } from '$lib/layout';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { ExecutionMethod, type Models } from '@appwrite.io/console';
     import { writable } from 'svelte/store';
-    import DeploymentSource from '../../deploymentSource.svelte';
-    import DeploymentDomains from '../../deploymentDomains.svelte';
     import { proxyRuleList } from '../../store';
-    import DeploymentCreatedBy from '../../deploymentCreatedBy.svelte';
     import {
         isSameDay,
         toLocaleDateISO,
@@ -45,6 +38,7 @@
     import { Icon, Tooltip } from '@appwrite.io/pink-svelte';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
     import Wizard from '$lib/layout/wizard.svelte';
+    import { DeploymentCreatedBy, DeploymentDomains, DeploymentSource } from '$lib/components/git';
 
     let previousPage: string = `${base}/project-${$page.params.project}/functions/function-${$page.params.function}/executions`;
 
@@ -377,7 +371,7 @@
                     <div class="u-flex-vertical u-gap-8">
                         <p class="u-color-text-offline">Domains</p>
                         <span>
-                            <DeploymentDomains domain={$proxyRuleList} />
+                            <DeploymentDomains domains={$proxyRuleList} />
                         </span>
                     </div>
                 {/if}
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
index 0b1820c6d..48ecdd002 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
@@ -77,7 +77,7 @@
     {/if}
     <ExecuteFunction />
     <UpdateName />
-    <UpdateRuntime />
+    <UpdateRuntime runtimesList={data.runtimesList} />
     <UpdateConfiguration />
     <UpdateLogging />
     <UpdatePermissions />
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts
index 818c56a6e..91d0ea7c0 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts
@@ -2,10 +2,12 @@ import { sdk } from '$lib/stores/sdk';
 import { Dependencies } from '$lib/constants';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ params, depends }) => {
+export const load: PageLoad = async ({ params, depends, parent }) => {
     depends(Dependencies.VARIABLES);
     depends(Dependencies.FUNCTIONS);
 
+    const { runtimesList } = await parent();
+
     const [globalVariables, variables] = await Promise.all([
         sdk.forProject.projectApi.listVariables(),
         sdk.forProject.functions.listVariables(params.function)
@@ -31,6 +33,7 @@ export const load: PageLoad = async ({ params, depends }) => {
 
     return {
         variables,
-        globalVariables
+        globalVariables,
+        runtimesList
     };
 };
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
index b8b0233d3..46a273527 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
@@ -1,4 +1,4 @@
-<script lang="ts">
+<!-- <script lang="ts">
     import { invalidate } from '$app/navigation';
     import { page } from '$app/stores';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
@@ -32,9 +32,7 @@
     import DisconnectRepo from './disconnectRepo.svelte';
     import { Pill } from '$lib/elements';
     import { wizard } from '$lib/stores/wizard';
-    import ConnectExisting from '$lib/wizards/functions/connectExisting.svelte';
     import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte';
-    import { installations } from '$lib/wizards/functions/store';
     import { isSelfHosted } from '$lib/system';
     import { consoleVariables } from '$routes/(console)/store';
     import { isValueOfStringEnum } from '$lib/helpers/types';
@@ -342,4 +340,4 @@
     <GitConfigurationModal bind:show={showGit} />
 {/if}
 
-<DisconnectRepo bind:show={showDisconnect} on:success={loadRepository} />
+<DisconnectRepo bind:show={showDisconnect} on:success={loadRepository} /> -->
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
index 71043f585..217ee3a63 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
@@ -3,7 +3,7 @@
     import { page } from '$app/stores';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { CardGrid } from '$lib/components';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
@@ -11,13 +11,10 @@
     import { func } from '../store';
     import InputSelect from '$lib/elements/forms/inputSelect.svelte';
     import { specificationsList } from '$lib/stores/specifications';
-    import { runtimesList } from '$lib/stores/runtimes';
     import { isValueOfStringEnum } from '$lib/helpers/types';
-    import { Runtime } from '@appwrite.io/console';
-    import { isCloud } from '$lib/system';
-    import { organization } from '$lib/stores/organization';
-    import SpecificationsTooltip from '$lib/wizards/functions/components/specificationsTooltip.svelte';
+    import { Runtime, type Models } from '@appwrite.io/console';
 
+    export let runtimesList: Models.RuntimeList;
     const functionId = $page.params.function;
     let runtime: string = null;
     let specification: string = null;
@@ -29,9 +26,8 @@
         runtime ??= $func.runtime;
         specification ??= $func.specification;
 
-        let runtimes = await $runtimesList;
         let allowedSpecifications = (await $specificationsList).specifications;
-        options = runtimes.runtimes.map((runtime) => ({
+        options = runtimesList.runtimes.map((runtime) => ({
             label: `${runtime.name} - ${runtime.version}`,
             value: runtime.$id
         }));
@@ -99,19 +95,14 @@
                     placeholder="Select runtime"
                     bind:value={runtime}
                     {options}
-                    required
-                    hideRequired />
+                    required />
                 <InputSelect
                     label="CPU and memory"
                     id="size"
                     placeholder="Select runtime specification"
                     bind:value={specification}
                     options={specificationOptions}
-                    popover={isCloud && $organization?.billingPlan === BillingPlan.FREE
-                        ? SpecificationsTooltip
-                        : null}
-                    required
-                    hideRequired />
+                    required />
             </FormList>
         </svelte:fragment>