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 60282b7e7..6ab9a4ab1 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
@@ -1,5 +1,13 @@
 <script lang="ts">
-    import { CardGrid, Box, DropList, DropListItem, Copy } from '$lib/components';
+    import {
+        CardGrid,
+        Box,
+        DropList,
+        DropListItem,
+        Copy,
+        Empty,
+        EventModal
+    } from '$lib/components';
     import { Container } from '$lib/layout';
     import { Button, InputNumber, InputText, InputCron, Form, FormList } from '$lib/elements/forms';
     import { base } from '$app/paths';
@@ -18,6 +26,8 @@
     import { breadcrumbs, title } from '$lib/stores/layout';
     import { Permissions } from '$lib/components/permissions';
     import { difference } from '$lib/helpers/array';
+    import TableList from '$lib/elements/table/tableList.svelte';
+    import { TableCell, TableCellText } from '$lib/elements/table';
 
     const functionId = $page.params.function;
     let showDelete = false;
@@ -31,6 +41,9 @@
     let functionName: string = null;
     let permissions: string[] = [];
     let arePermsDisabled = true;
+    let eventSet = new Set<string>();
+    let showEvents = false;
+    let areEventsDisabled = true;
 
     onMount(async () => {
         if ($func?.$id !== functionId) {
@@ -41,6 +54,7 @@
         timeout ??= $func.timeout;
         functionName ??= $func.name;
         permissions ??= $func.execute;
+        eventSet = new Set($func.events);
     });
 
     async function updateName() {
@@ -77,6 +91,26 @@
             });
         }
     }
+    async function updateEvents() {
+        try {
+            await sdkForProject.functions.update(
+                functionId,
+                $func.name,
+                $func.execute,
+                Array.from(eventSet)
+            );
+            $func.events = Array.from(eventSet);
+            addNotification({
+                message: 'Permissions have been updated',
+                type: 'success'
+            });
+        } catch (error) {
+            addNotification({
+                message: error.message,
+                type: 'error'
+            });
+        }
+    }
 
     async function updateTimeout() {
         try {
@@ -178,11 +212,28 @@
         }
     }
 
+    function handleEvent(event: CustomEvent) {
+        eventSet.add(event.detail);
+        eventSet = eventSet;
+    }
+
     $: if (permissions) {
-        if (difference(permissions, $func.execute).length) {
+        if (
+            difference(permissions, $func.execute).length ||
+            difference($func.execute, permissions).length
+        ) {
             arePermsDisabled = false;
         } else arePermsDisabled = true;
     }
+
+    $: if (eventSet) {
+        if (
+            difference(Array.from(eventSet), $func.events).length ||
+            difference($func.events, Array.from(eventSet)).length
+        ) {
+            areEventsDisabled = false;
+        } else areEventsDisabled = true;
+    }
 </script>
 
 <Container>
@@ -261,6 +312,52 @@
         </CardGrid>
     </Form>
 
+    <Form on:submit={updateEvents}>
+        <CardGrid>
+            <h6 class="heading-level-7">Update Events</h6>
+            <p>Set the events that will trigger your function. Maximum 100 events allowed.</p>
+            <svelte:fragment slot="aside">
+                {#if eventSet.size}
+                    <TableList>
+                        {#each Array.from(eventSet) as event}
+                            <li class="table-row">
+                                <TableCellText title="id">
+                                    {event}
+                                </TableCellText>
+                                <TableCell showOverflow title="options" width={40}>
+                                    <button
+                                        class="button is-text is-only-icon"
+                                        aria-label="delete id"
+                                        on:click|preventDefault={() => {
+                                            eventSet.delete(event);
+                                            eventSet = eventSet;
+                                        }}>
+                                        <span class="icon-x" aria-hidden="true" />
+                                    </button>
+                                </TableCell>
+                            </li>
+                        {/each}
+                    </TableList>
+                {:else}
+                    <Empty isButton on:click={() => (showEvents = !showEvents)}
+                        >Add a event to get started
+                    </Empty>
+                {/if}
+
+                <div class="u-flex u-margin-block-start-16">
+                    <Button text noMargin on:click={() => (showEvents = !showEvents)}>
+                        <span class="icon-plus" aria-hidden="true" />
+                        <span class="u-text">Add event</span>
+                    </Button>
+                </div>
+            </svelte:fragment>
+
+            <svelte:fragment slot="actions">
+                <Button disabled={areEventsDisabled} submit>Update</Button>
+            </svelte:fragment>
+        </CardGrid>
+    </Form>
+
     <Form on:submit={() => console.log($func.schedule)}>
         <CardGrid>
             <h2 class="heading-level-6">Update CRON Schedule</h2>
@@ -460,4 +557,10 @@
         on:updated={handleVariableUpdated} />
 {/if}
 
-<Upload bind:show={showVariablesUpload} on:uploaded={handleVariableCreated} />
+{#if showVariablesUpload}
+    <Upload bind:show={showVariablesUpload} on:uploaded={handleVariableCreated} />
+{/if}
+
+{#if showEvents}
+    <EventModal bind:showCreate={showEvents} on:created={handleEvent} />
+{/if}