diff --git a/package.json b/package.json
index 39ab9e694..bf2ec1519 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "e2e:ui": "playwright test tests/e2e --ui"
     },
     "dependencies": {
-        "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08ec153",
+        "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@dd94b87a ",
         "@appwrite.io/pink-legacy": "^1.0.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cc8c25867..498d91905 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,8 +12,8 @@ importers:
   .:
     dependencies:
       '@appwrite.io/console':
-        specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08ec153
-        version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08ec153
+        specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb
+        version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb
       '@appwrite.io/pink-icons':
         specifier: 0.25.0
         version: 0.25.0
@@ -214,8 +214,8 @@ packages:
   '@analytics/type-utils@0.6.2':
     resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==}
 
-  '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08ec153':
-    resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08ec153}
+  '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb':
+    resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb}
     version: 1.2.1
 
   '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@317beac01fca89faa03f4fd8897f01b9d49170e3':
@@ -4100,7 +4100,11 @@ snapshots:
 
   '@analytics/type-utils@0.6.2': {}
 
-  '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08ec153': {}
+  '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb': {}
+
+  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@317beac01fca89faa03f4fd8897f01b9d49170e3(svelte@4.2.19)':
+    dependencies:
+      svelte: 4.2.19
 
   '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@317beac01fca89faa03f4fd8897f01b9d49170e3(svelte@4.2.19)':
     dependencies:
diff --git a/src/lib/pages/domains/wizard/step1.svelte b/src/lib/pages/domains/wizard/step1.svelte
index f6cac57dd..a9c2df49b 100644
--- a/src/lib/pages/domains/wizard/step1.svelte
+++ b/src/lib/pages/domains/wizard/step1.svelte
@@ -19,6 +19,7 @@
                 await sdk.forProject.proxy.deleteRule($domain.$id);
             }
 
+            // TODO: move to new api methods
             $domain = await sdk.forProject.proxy.createRule(
                 $domain.domain,
                 $typeStore,
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index b33a0bd8e..6aaef310d 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -90,3 +90,9 @@ export const sdk = {
         return getSdkForProject(projectId);
     }
 };
+
+export enum RuleType {
+    DEPLOYMENT = 'deployment',
+    API = 'api',
+    REDIRECT = 'redirect'
+}
diff --git a/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte b/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte
index ad7c9f938..812ea1dca 100644
--- a/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte
@@ -7,7 +7,7 @@
     import { Wizard } from '$lib/layout';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
-    import { ResourceType, type Models } from '@appwrite.io/console';
+    import { type Models } from '@appwrite.io/console';
     import {
         Badge,
         Divider,
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts b/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
index 54ed89d66..576a7b9e1 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
@@ -5,6 +5,7 @@ import Breadcrumbs from './breadcrumbs.svelte';
 import Header from './header.svelte';
 import { error } from '@sveltejs/kit';
 import { Query } from '@appwrite.io/console';
+import { RuleType } from '$lib/stores/sdk';
 
 export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.FUNCTION);
@@ -14,8 +15,8 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         const [func, proxyRuleList] = await Promise.all([
             sdk.forProject.functions.get(params.function),
             sdk.forProject.proxy.listRules([
-                Query.equal('resourceType', 'function'),
-                Query.equal('resourceId', params.function),
+                Query.equal('type', RuleType.DEPLOYMENT),
+                Query.equal('automation', `function=${params.function}`),
                 Query.limit(1)
             ])
         ]);
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts
index e5f407297..d6fb50833 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts
@@ -1,6 +1,6 @@
 import { Dependencies } from '$lib/constants';
-import { sdk } from '$lib/stores/sdk';
-import { Query, ResourceType } from '@appwrite.io/console';
+import { RuleType, sdk } from '$lib/stores/sdk';
+import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ depends, params }) => {
@@ -8,8 +8,8 @@ export const load: PageLoad = async ({ depends, params }) => {
 
     return {
         rules: await sdk.forProject.proxy.listRules([
-            Query.equal('resourceType', ResourceType.Function),
-            Query.equal('resourceId', params.function)
+            Query.equal('type', RuleType.DEPLOYMENT),
+            Query.equal('automantion', `function=${params.function}`)
         ])
     };
 };
diff --git a/src/routes/(console)/project-[project]/settings/domains/+page.ts b/src/routes/(console)/project-[project]/settings/domains/+page.ts
index 4aea55576..08399a158 100644
--- a/src/routes/(console)/project-[project]/settings/domains/+page.ts
+++ b/src/routes/(console)/project-[project]/settings/domains/+page.ts
@@ -1,8 +1,9 @@
 import { Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
-import { Query, ResourceType } from '@appwrite.io/console';
+import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 import { getSearch } from '$lib/helpers/load';
+import { RuleType } from '$lib/stores/sdk';
 
 export const load: PageLoad = async ({ depends, url }) => {
     depends(Dependencies.DOMAINS);
@@ -12,7 +13,7 @@ export const load: PageLoad = async ({ depends, url }) => {
     return {
         search,
         rules: await sdk.forProject.proxy.listRules(
-            [Query.equal('resourceType', [ResourceType.Site, ResourceType.Api])],
+            [Query.equal('type', RuleType.API)],
             search || undefined
         ),
         create: url.searchParams.get('create') !== null
diff --git a/src/routes/(console)/project-[project]/settings/domains/create/+page.svelte b/src/routes/(console)/project-[project]/settings/domains/create/+page.svelte
index f5d3de859..dd739c707 100644
--- a/src/routes/(console)/project-[project]/settings/domains/create/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/domains/create/+page.svelte
@@ -9,7 +9,6 @@
     import { InputDomain } from '$lib/elements/forms';
     import { goto } from '$app/navigation';
     import { sdk } from '$lib/stores/sdk';
-    import { ResourceType } from '@appwrite.io/console';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     let showExitModal = false;
@@ -26,7 +25,7 @@
                 await sdk.forProject.proxy.deleteRule(data.$id);
             }
 
-            const value = await sdk.forProject.proxy.createRule(domain, ResourceType.Api);
+            const value = await sdk.forProject.proxy.createAPIRule(domain);
 
             trackEvent(Submit.DomainCreate);
             goto(`${base}/project-${$page.params.project}/settings/domains/create/${value.$id}`);
diff --git a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte
index a59c4af1b..a6ef905d9 100644
--- a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte
+++ b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte
@@ -30,7 +30,7 @@
     export let variant: 'primary' | 'secondary' = 'primary';
 
     let show = false;
-    const siteUrl = proxyRuleList.total > 0 ? proxyRuleList.rules[0].domain : deployment.domain;
+    const siteUrl = proxyRuleList.total > 0 ? proxyRuleList.rules[0].domain : undefined;
 
     $: totalSize = humanFileSize((deployment?.buildSize ?? 0) + (deployment?.size ?? 0));
 
diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.ts b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.ts
index 5dc9e83c5..65afb6d6a 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.ts
+++ b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.ts
@@ -1,4 +1,4 @@
-import { sdk } from '$lib/stores/sdk';
+import { RuleType, sdk } from '$lib/stores/sdk';
 import { error } from '@sveltejs/kit';
 import { Query } from '@appwrite.io/console';
 import { Dependencies } from '$lib/constants';
@@ -10,8 +10,8 @@ export const load = async ({ url, depends }) => {
     const [site, proxyRuleList] = await Promise.all([
         sdk.forProject.sites.get(siteId),
         sdk.forProject.proxy.listRules([
-            Query.equal('resourceId', siteId),
-            Query.equal('resourceType', 'site')
+            Query.equal('type', RuleType.DEPLOYMENT),
+            Query.equal('automation', `site=${siteId}`)
         ])
     ]);
     return {
diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
index ad9c15e8c..35fe55c34 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
@@ -15,7 +15,7 @@
     import Details from '../../details.svelte';
     import ProductionBranch from '../../productionBranch.svelte';
     import Aside from '../../aside.svelte';
-    import { BuildRuntime, Framework, ID, ResourceType, Type } from '@appwrite.io/console';
+    import { BuildRuntime, ConsoleResourceType, Framework, ID, Type } from '@appwrite.io/console';
     import type { Models } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import Configuration from '../../configuration.svelte';
@@ -70,7 +70,7 @@
         try {
             await sdk.forConsole.console.getResource(
                 `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`,
-                'rules' as unknown as Type //TODO: fix after Matej fixes backend
+                ConsoleResourceType.Rules
             );
             return true;
         } catch {
@@ -126,9 +126,8 @@
                 );
 
                 // Add domain
-                await sdk.forProject.proxy.createRule(
+                await sdk.forProject.proxy.createSiteRule(
                     `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`,
-                    ResourceType.Site,
                     site.$id
                 );
 
diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte
index e2e259034..bdd91363a 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte
@@ -26,7 +26,7 @@
     import ProductionBranch from '../../productionBranch.svelte';
     import Configuration from './configuration.svelte';
     import Aside from '../../aside.svelte';
-    import { BuildRuntime, Framework, ID, ResourceType } from '@appwrite.io/console';
+    import { Adapter, BuildRuntime, Framework, ID } from '@appwrite.io/console';
     import Domain from '../../domain.svelte';
     import { NewRepository, Repositories, RepositoryBehaviour } from '$lib/components/git';
     import { getFrameworkIcon } from '../../../store';
@@ -133,7 +133,7 @@
                     framework.installCommand,
                     framework.buildCommand,
                     framework.outputDirectory,
-                    framework.adapter,
+                    framework.adapter as unknown as Adapter,
                     connectBehaviour === 'later' ? undefined : selectedInstallationId || undefined,
                     framework.fallbackFile,
                     selectedRepository || undefined,
@@ -143,9 +143,8 @@
                 );
 
                 // Add domain
-                await sdk.forProject.proxy.createRule(
+                await sdk.forProject.proxy.createSiteRule(
                     `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`,
-                    ResourceType.Site,
                     site.$id
                 );
 
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts
index ecd413552..417ee2caf 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts
@@ -1,6 +1,7 @@
 import { sdk } from '$lib/stores/sdk';
 import { Dependencies } from '$lib/constants';
 import { Query } from '@appwrite.io/console';
+import { RuleType } from '$lib/stores/sdk';
 
 export const load = async ({ params, depends, parent }) => {
     depends(Dependencies.SITE);
@@ -16,8 +17,8 @@ export const load = async ({ params, depends, parent }) => {
             // Query.equal('live', true)
         ]),
         sdk.forProject.proxy.listRules([
-            Query.equal('resourceType', 'site'),
-            Query.equal('resourceId', params.site),
+            Query.equal('type', RuleType.DEPLOYMENT),
+            Query.equal('automation', `site=${params.site}`),
             Query.orderDesc('')
         ])
     ]);
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts
index 122527316..ff8a90fac 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts
@@ -2,6 +2,7 @@ import { sdk } from '$lib/stores/sdk';
 import { Dependencies } from '$lib/constants';
 import type { PageLoad } from './$types';
 import { Query } from '@appwrite.io/console';
+import { RuleType } from '$lib/stores/sdk';
 
 export const load: PageLoad = async ({ params, depends, parent }) => {
     depends(Dependencies.DEPLOYMENT);
@@ -11,8 +12,8 @@ export const load: PageLoad = async ({ params, depends, parent }) => {
     const [deployment, proxyRuleList] = await Promise.all([
         sdk.forProject.sites.getDeployment(params.site, params.deployment),
         sdk.forProject.proxy.listRules([
-            Query.equal('resourceId', params.deployment),
-            Query.equal('resourceType', 'deployment')
+            Query.equal('type', RuleType.DEPLOYMENT),
+            Query.equal('value', params.deployment)
         ])
     ]);
 
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.ts
index e87f94bc1..a5706b1a9 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.ts
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.ts
@@ -1,8 +1,9 @@
-import { Query, ResourceType } from '@appwrite.io/console';
+import { Query } from '@appwrite.io/console';
 import { sdk } from '$lib/stores/sdk';
 import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load';
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import { queries, queryParamToMap } from '$lib/components/filters';
+import { RuleType } from '$lib/stores/sdk';
 
 export const load = async ({ params, depends, url, route }) => {
     depends(Dependencies.SITES_DOMAINS);
@@ -22,8 +23,8 @@ export const load = async ({ params, depends, url, route }) => {
         search,
         domains: await sdk.forProject.proxy.listRules(
             [
-                Query.equal('resourceType', ResourceType.Site),
-                Query.equal('resourceId', params.site),
+                Query.equal('type', RuleType.DEPLOYMENT),
+                Query.equal('automation', `site=${params.site}`),
                 Query.limit(limit),
                 Query.offset(offset),
                 Query.orderDesc(''),
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte
index e8ebf7fed..036ecfb06 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte
@@ -7,7 +7,7 @@
     import { Wizard } from '$lib/layout';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
-    import { ResourceType, type Models } from '@appwrite.io/console';
+    import { type Models } from '@appwrite.io/console';
     import {
         Badge,
         Divider,
@@ -27,11 +27,7 @@
 
     async function addDomain() {
         try {
-            domainData = await sdk.forProject.proxy.createRule(
-                domain,
-                ResourceType.Site,
-                $page.params.site
-            );
+            domainData = await sdk.forProject.proxy.createSiteRule(domain, $page.params.site);
             console.log(domainData);
             invalidate(Dependencies.SITES_DOMAINS);
         } catch (error) {