diff --git a/src/routes/(public)/template-[template]/+page.svelte b/src/routes/(public)/template-[template]/+page.svelte
index 2262fe075..5ec88102b 100644
--- a/src/routes/(public)/template-[template]/+page.svelte
+++ b/src/routes/(public)/template-[template]/+page.svelte
@@ -5,19 +5,13 @@
     import { SvgIcon } from '$lib/components/index.js';
     import { Button, Form, InputSelect } from '$lib/elements/forms';
     import { getFlagUrl } from '$lib/helpers/flag.js';
-    import type { Region } from '$lib/sdk/billing.js';
+    import type { AllowedRegions, Region as RegionType } from '$lib/sdk/billing.js';
     import { app } from '$lib/stores/app';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { getFrameworkIcon } from '$lib/stores/sites.js';
     import { isCloud } from '$lib/system';
-    import {
-        ID,
-        OAuthProvider,
-        Query,
-        type Models,
-        type Region as AppwriteRegion
-    } from '@appwrite.io/console';
+    import { ID, OAuthProvider, Query, type Models, Region } from '@appwrite.io/console';
     import { IconGithub, IconPencil, IconPlus } from '@appwrite.io/pink-icons-svelte';
     import {
         Card,
@@ -39,8 +33,8 @@
     );
     let projectName = $state<string>();
     let showCustomId = $state(false);
-    let region = $state<string>();
-    let regions = $state<Array<Region>>([]);
+    let region = $state<AllowedRegions>();
+    let regions = $state<Array<RegionType>>([]);
     let id = $state<string>();
 
     function getRegions() {
@@ -101,7 +95,7 @@
                     id ?? ID.unique(),
                     projectName,
                     selectedOrg,
-                    region as AppwriteRegion
+                    isCloud ? (region as Region) : Region.Default
                 );
                 trackEvent(Submit.ProjectCreate, {
                     customId: !!id,
@@ -124,7 +118,6 @@
 
     $effect(() => {
         if (selectedOrg !== undefined) {
-            console.log('test');
             fetchProjects();
         }
     });
@@ -240,7 +233,7 @@
                                         isProject
                                         bind:id />
                                 </Layout.Stack>
-                                {#if isCloud && regions.length > 0}
+                                {#if isCloud}
                                     <Layout.Stack gap="xs">
                                         <Input.Select
                                             bind:value={region}
diff --git a/src/routes/(public)/template-[template]/+page.ts b/src/routes/(public)/template-[template]/+page.ts
index 7ea2afe98..473ba7df7 100644
--- a/src/routes/(public)/template-[template]/+page.ts
+++ b/src/routes/(public)/template-[template]/+page.ts
@@ -4,10 +4,9 @@ import { ID, type Models } from '@appwrite.io/console';
 import { isCloud } from '$lib/system.js';
 import { redirect } from '@sveltejs/kit';
 import { error } from '@sveltejs/kit';
+import type { OrganizationList } from '$lib/stores/organization.js';
 
 export const load = async ({ parent, url, params }) => {
-    if (!isCloud) redirect(303, '/');
-
     const { account } = await parent();
 
     if (!url.searchParams.has('type')) {
@@ -27,10 +26,13 @@ export const load = async ({ parent, url, params }) => {
         default:
             error(404, 'Type is not valid');
     }
-    const organizations = account?.$id
-        ? await sdk.forConsole.billing.listOrganization()
-        : undefined;
-    // const organizations = account?.$id ? await sdk.forConsole.teams.list() : undefined;
+
+    let organizations: Models.TeamList<Record<string, unknown>> | OrganizationList | undefined;
+    if (isCloud) {
+        organizations = account?.$id ? await sdk.forConsole.billing.listOrganization() : undefined;
+    } else {
+        organizations = account?.$id ? await sdk.forConsole.teams.list() : undefined;
+    }
 
     if (!organizations?.total && account?.$id) {
         await sdk.forConsole.billing.createOrganization(