diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte b/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte
index d925ef4e8..9cd56ffcb 100644
--- a/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte
@@ -48,7 +48,7 @@
     let runtime: Runtime;
     let entrypoint = '';
     let buildCommand = '';
-    let scopes: string[] = [];
+    let roles: string[] = [];
     let variables: Partial<Models.Variable>[] = [];
     let files: FileList;
     let specification = specificationOptions[0].value;
@@ -61,7 +61,7 @@
                 id || ID.unique(),
                 name,
                 runtime,
-                undefined,
+                roles?.length ? roles : undefined,
                 undefined,
                 undefined,
                 undefined,
@@ -69,7 +69,7 @@
                 undefined,
                 entrypoint,
                 undefined,
-                scopes,
+                undefined,
                 undefined,
                 undefined,
                 undefined,
@@ -188,7 +188,7 @@
                 options={runtimeOptions}
                 showEntrypoint />
 
-            <Configuration bind:buildCommand bind:scopes />
+            <Configuration bind:buildCommand bind:roles />
         </Layout.Stack>
     </Form>
     <svelte:fragment slot="aside">
diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte b/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte
index 8487e6759..8f3091f39 100644
--- a/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte
+++ b/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte
@@ -5,7 +5,7 @@
     import { Accordion, Fieldset, Layout } from '@appwrite.io/pink-svelte';
 
     export let buildCommand = '';
-    export let scopes: string[] = [];
+    export let roles: string[] = [];
 </script>
 
 <Fieldset legend="Settings">
@@ -28,7 +28,7 @@
                         >Learn more</Link>
                 </span>
 
-                <Roles bind:roles={scopes} />
+                <Roles bind:roles />
             </Layout.Stack>
         </Accordion>
     </Layout.Stack>