diff --git a/cmd/seed/main.go b/cmd/seed/main.go
index a37738e26..51bbfe2dc 100644
--- a/cmd/seed/main.go
+++ b/cmd/seed/main.go
@@ -7,6 +7,7 @@ import (
 	"runtime/debug"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/user"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
@@ -16,6 +17,7 @@ import (
 	"github.com/iota-uz/iota-sdk/pkg/application"
 	"github.com/iota-uz/iota-sdk/pkg/composables"
 	"github.com/iota-uz/iota-sdk/pkg/configuration"
+	"github.com/iota-uz/iota-sdk/pkg/constants"
 	"github.com/iota-uz/iota-sdk/pkg/eventbus"
 
 	"github.com/jackc/pgx/v5/pgxpool"
@@ -69,7 +71,16 @@ func main() {
 	if err != nil {
 		panicWithStack(err)
 	}
+
+	// Add default tenant to context
+	defaultTenant := &composables.Tenant{
+		ID:     uuid.MustParse("00000000-0000-0000-0000-000000000001"),
+		Name:   "Default",
+		Domain: "default.localhost",
+	}
+
 	seeder.Register(
+		coreseed.CreateDefaultTenant,
 		coreseed.CreateCurrencies,
 		coreseed.CreatePermissions,
 		coreseed.UserSeedFunc(usr),
@@ -78,17 +89,26 @@ func main() {
 			"User",
 			internet.MustParseEmail("ai@llm.com"),
 			user.UILanguageEN,
+			user.WithTenantID(defaultTenant.ID),
 		)),
 		websiteseed.AIChatConfigSeedFunc(aichatconfig.MustNew(
 			"gemma-12b-it",
 			aichatconfig.AIModelTypeOpenAI,
 			"https://llm2.eai.uz/v1",
+			aichatconfig.WithTenantID(defaultTenant.ID),
 		)),
 	)
-	if err := seeder.Seed(composables.WithTx(ctx, tx), app); err != nil {
+
+	ctxWithTenant := context.WithValue(
+		composables.WithTx(ctx, tx),
+		constants.TenantKey,
+		defaultTenant,
+	)
+
+	if err := seeder.Seed(ctxWithTenant, app); err != nil {
 		panicWithStack(err)
 	}
-	if err := tx.Commit(ctx); err != nil {
+	if err := tx.Commit(ctxWithTenant); err != nil {
 		panicWithStack(err)
 	}
 }
diff --git a/components/sidebar/sidebar.templ b/components/sidebar/sidebar.templ
index 50d735479..686b52b5c 100644
--- a/components/sidebar/sidebar.templ
+++ b/components/sidebar/sidebar.templ
@@ -20,6 +20,7 @@ templ Sidebar(props Props) {
 		}
 		<nav class="py-4 flex-1">
 			<ul
+				id="sidebar-navigation"
 				class="flex flex-col gap-2 overflow-y-auto h-[calc(100vh-12rem)] px-6 hide-scrollbar"
 			>
 				for _, item := range props.Items {
diff --git a/components/sidebar/sidebar_templ.go b/components/sidebar/sidebar_templ.go
index 931d05fed..fa3f55f49 100644
--- a/components/sidebar/sidebar_templ.go
+++ b/components/sidebar/sidebar_templ.go
@@ -58,7 +58,7 @@ func Sidebar(props Props) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<nav class=\"py-4 flex-1\"><ul class=\"flex flex-col gap-2 overflow-y-auto h-[calc(100vh-12rem)] px-6 hide-scrollbar\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<nav class=\"py-4 flex-1\"><ul id=\"sidebar-navigation\" class=\"flex flex-col gap-2 overflow-y-auto h-[calc(100vh-12rem)] px-6 hide-scrollbar\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -145,7 +145,7 @@ func AccordionGroup(group Group) templ.Component {
 		var templ_7745c5c3_Var3 string
 		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(group.Text())
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `components/sidebar/sidebar.templ`, Line: 48, Col: 17}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `components/sidebar/sidebar.templ`, Line: 49, Col: 17}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
@@ -235,7 +235,7 @@ func AccordionLink(link Link) templ.Component {
 			var templ_7745c5c3_Var6 string
 			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(link.Text())
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `components/sidebar/sidebar.templ`, Line: 79, Col: 16}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `components/sidebar/sidebar.templ`, Line: 80, Col: 16}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 			if templ_7745c5c3_Err != nil {
diff --git a/e2e/cypress/e2e/users/realtime.cy.js b/e2e/cypress/e2e/users/realtime.cy.js
index e23d38629..432e72091 100644
--- a/e2e/cypress/e2e/users/realtime.cy.js
+++ b/e2e/cypress/e2e/users/realtime.cy.js
@@ -6,6 +6,10 @@ describe("user realtime behavior", () => {
         cy.task("seedDatabase");
     });
 
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+    });
+
     afterEach(() => {
         cy.logout();
     });
diff --git a/e2e/cypress/e2e/users/register.cy.js b/e2e/cypress/e2e/users/register.cy.js
index 23dc396a0..fb7e9d72e 100644
--- a/e2e/cypress/e2e/users/register.cy.js
+++ b/e2e/cypress/e2e/users/register.cy.js
@@ -6,6 +6,10 @@ describe("user auth and registration flow", () => {
 		cy.task("seedDatabase");
 	});
 
+	beforeEach(() => {
+		cy.viewport(1280, 720);
+	});
+
 	afterEach(() => {
 		cy.logout();
 	});
@@ -71,5 +75,13 @@ describe("user auth and registration flow", () => {
 		cy.visit("http://localhost:3200/users");
 		cy.url().should("include", "/users");
 	});
+	
+	it("newly created user should see tabs in the sidebar", () => {
+		cy.login("test1@gmail.com", "TestPass123!");
+		cy.visit("http://localhost:3200/");
+		
+		// Check that the sidebar contains at least one tab/link
+		cy.get("#sidebar-navigation li").should("have.length.at.least", 1);
+	});
 });
 
diff --git a/go.mod b/go.mod
index 0c5372171..3184bb371 100644
--- a/go.mod
+++ b/go.mod
@@ -57,6 +57,7 @@ require (
 	cloud.google.com/go/auth v0.11.0 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
 	cloud.google.com/go/compute/metadata v0.6.0 // indirect
+	github.com/PuerkitoBio/goquery v1.10.1 // indirect
 	github.com/agnivade/levenshtein v1.2.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 // indirect
diff --git a/go.sum b/go.sum
index 5fca21500..0986f2d92 100644
--- a/go.sum
+++ b/go.sum
@@ -24,8 +24,8 @@ github.com/Oudwins/tailwind-merge-go v0.2.1 h1:jxRaEqGtwwwF48UuFIQ8g8XT7YSualNuG
 github.com/Oudwins/tailwind-merge-go v0.2.1/go.mod h1:kkZodgOPvZQ8f7SIrlWkG/w1g9JTbtnptnePIh3V72U=
 github.com/PaulSonOfLars/gotgbot/v2 v2.0.0-rc.31 h1:SIkzqC6Nv+znY4NGbWlJceWdns8QVmf9cwAYXd7Cg8k=
 github.com/PaulSonOfLars/gotgbot/v2 v2.0.0-rc.31/go.mod h1:kL1v4iIjlalwm3gCYGvF4NLa3hs+aKEfRkNJvj4aoDU=
-github.com/PuerkitoBio/goquery v1.9.3 h1:mpJr/ikUA9/GNJB/DBZcGeFDXUtosHRyRrwh7KGdTG0=
-github.com/PuerkitoBio/goquery v1.9.3/go.mod h1:1ndLHPdTz+DyQPICCWYlYQMPl0oXZj0G6D4LCYA6u4U=
+github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU=
+github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY=
 github.com/Rhymond/go-money v1.0.15 h1:rdcIcO8FxCqEwBSt5VZf4hLMfovtcDIiY5/cQWE+7Vo=
 github.com/Rhymond/go-money v1.0.15/go.mod h1:iHvCuIvitxu2JIlAlhF0g9jHqjRSr+rpdOs7Omqlupg=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
@@ -42,8 +42,8 @@ github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc
 github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
-github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
-github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
+github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
+github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
diff --git a/migrations/changes-1740741698.sql b/migrations/changes-1740741698.sql
index f0ef329fa..d0b7a6eb1 100644
--- a/migrations/changes-1740741698.sql
+++ b/migrations/changes-1740741698.sql
@@ -4,13 +4,14 @@
 CREATE TABLE uploads (
 	id         SERIAL8 PRIMARY KEY,
 	name       VARCHAR(255) NOT NULL,
-	hash       VARCHAR(255) NOT NULL UNIQUE,
+	hash       VARCHAR(255) NOT NULL,
 	path       VARCHAR(1024) DEFAULT '' NOT NULL,
 	size       INT8 DEFAULT 0 NOT NULL,
 	mimetype   VARCHAR(255) NOT NULL,
 	type       VARCHAR(255) NOT NULL,
 	created_at TIMESTAMPTZ DEFAULT now(),
-	updated_at TIMESTAMPTZ DEFAULT now()
+	updated_at TIMESTAMPTZ DEFAULT now(),
+  CONSTRAINT uploads_hash_key UNIQUE (hash)
 );
 
 -- Change CREATE_TABLE: clients
@@ -61,20 +62,22 @@ CREATE TABLE positions (
 -- Change CREATE_TABLE: permissions
 CREATE TABLE permissions (
 	id          UUID DEFAULT gen_random_uuid() NOT NULL PRIMARY KEY,
-	name        VARCHAR(255) NOT NULL UNIQUE,
+	name        VARCHAR(255) NOT NULL,
 	resource    VARCHAR(255) NOT NULL,
 	action      VARCHAR(255) NOT NULL,
 	modifier    VARCHAR(255) NOT NULL,
-	description TEXT
+	description TEXT,
+  CONSTRAINT permissions_name_key UNIQUE (name)
 );
 
 -- Change CREATE_TABLE: roles
 CREATE TABLE roles (
 	id          SERIAL8 PRIMARY KEY,
-	name        VARCHAR(255) NOT NULL UNIQUE,
+	name        VARCHAR(255) NOT NULL,
 	description TEXT,
 	created_at  TIMESTAMPTZ DEFAULT now(),
-	updated_at  TIMESTAMPTZ DEFAULT now()
+	updated_at  TIMESTAMPTZ DEFAULT now(),
+  CONSTRAINT roles_name_key UNIQUE (name)
 );
 
 -- Change CREATE_TABLE: warehouse_orders
@@ -122,11 +125,12 @@ CREATE TABLE inventory (
 CREATE TABLE warehouse_positions (
 	id          SERIAL8 PRIMARY KEY,
 	title       VARCHAR(255) NOT NULL,
-	barcode     VARCHAR(255) NOT NULL UNIQUE,
+	barcode     VARCHAR(255) NOT NULL,
 	description TEXT,
 	unit_id     INT8 REFERENCES warehouse_units (id) ON DELETE SET NULL,
 	created_at  TIMESTAMPTZ DEFAULT now(),
-	updated_at  TIMESTAMPTZ DEFAULT now()
+	updated_at  TIMESTAMPTZ DEFAULT now(),
+  CONSTRAINT warehouse_positions_barcode_key UNIQUE (barcode)
 );
 
 -- Change CREATE_TABLE: employees
@@ -135,7 +139,7 @@ CREATE TABLE employees (
 	first_name         VARCHAR(255) NOT NULL,
 	last_name          VARCHAR(255) NOT NULL,
 	middle_name        VARCHAR(255),
-	email              VARCHAR(255) NOT NULL UNIQUE,
+	email              VARCHAR(255) NOT NULL,
 	phone              VARCHAR(255),
 	salary             DECIMAL(9,2) NOT NULL,
 	salary_currency_id VARCHAR(3) REFERENCES currencies (code) ON DELETE SET NULL,
@@ -143,7 +147,8 @@ CREATE TABLE employees (
 	coefficient        FLOAT8 NOT NULL,
 	avatar_id          INT8 REFERENCES uploads (id) ON DELETE SET NULL,
 	created_at         TIMESTAMPTZ DEFAULT now(),
-	updated_at         TIMESTAMPTZ DEFAULT now()
+	updated_at         TIMESTAMPTZ DEFAULT now(),
+  CONSTRAINT employees_email_key UNIQUE (email)
 );
 
 -- Change CREATE_TABLE: warehouse_position_images
@@ -159,7 +164,7 @@ CREATE TABLE users (
 	first_name  VARCHAR(255) NOT NULL,
 	last_name   VARCHAR(255) NOT NULL,
 	middle_name VARCHAR(255),
-	email       VARCHAR(255) NOT NULL UNIQUE,
+	email       VARCHAR(255) NOT NULL,
 	password    VARCHAR(255),
 	ui_language VARCHAR(3) NOT NULL,
 	avatar_id   INT8 REFERENCES uploads (id) ON DELETE SET NULL,
@@ -167,7 +172,8 @@ CREATE TABLE users (
 	last_ip     VARCHAR(255) NULL,
 	last_action TIMESTAMPTZ NULL,
 	created_at  TIMESTAMPTZ DEFAULT now() NOT NULL,
-	updated_at  TIMESTAMPTZ DEFAULT now() NOT NULL
+	updated_at  TIMESTAMPTZ DEFAULT now() NOT NULL,
+  CONSTRAINT users_email_key UNIQUE (email)
 );
 
 -- Change CREATE_TABLE: role_permissions
@@ -229,10 +235,11 @@ CREATE TABLE employee_meta (
 CREATE TABLE warehouse_products (
 	id          SERIAL8 PRIMARY KEY,
 	position_id INT8 NOT NULL REFERENCES warehouse_positions (id) ON DELETE CASCADE,
-	rfid        VARCHAR(255) NULL UNIQUE,
+	rfid        VARCHAR(255) NULL,
 	status      VARCHAR(255) NOT NULL,
 	created_at  TIMESTAMPTZ DEFAULT now(),
-	updated_at  TIMESTAMPTZ DEFAULT now()
+	updated_at  TIMESTAMPTZ DEFAULT now(),
+  CONSTRAINT warehouse_products_rfid UNIQUE (rfid)
 );
 
 -- Change CREATE_TABLE: authentication_logs
@@ -292,7 +299,7 @@ CREATE TABLE tabs (
 	href       VARCHAR(255) NOT NULL,
 	user_id    INT8 NOT NULL REFERENCES users (id) ON DELETE CASCADE,
 	"position" INT8 DEFAULT 0 NOT NULL,
-	UNIQUE (href, user_id)
+	CONSTRAINT tabs_href_user_id_key UNIQUE (href, user_id)
 );
 
 -- Change CREATE_TABLE: counterparty_contacts
diff --git a/migrations/changes-1740935243.sql b/migrations/changes-1740935243.sql
index a6f102cdb..3dae9cbf6 100644
--- a/migrations/changes-1740935243.sql
+++ b/migrations/changes-1740935243.sql
@@ -35,7 +35,10 @@ ALTER TABLE clients
 
 -- Change ADD_COLUMN: phone
 ALTER TABLE users
-    ADD COLUMN phone VARCHAR(255) UNIQUE;
+    ADD COLUMN phone VARCHAR(255);
+
+ALTER TABLE users
+    ADD CONSTRAINT users_phone_key UNIQUE (phone);
 
 -- Change CREATE_TABLE: client_contacts
 CREATE TABLE client_contacts (
diff --git a/migrations/changes-1741630199.sql b/migrations/changes-1741630199.sql
index f3ed9ccfa..97da02e23 100644
--- a/migrations/changes-1741630199.sql
+++ b/migrations/changes-1741630199.sql
@@ -2,10 +2,11 @@
 -- Change CREATE_TABLE: user_groups
 CREATE TABLE user_groups (
     id uuid DEFAULT gen_random_uuid () PRIMARY KEY,
-    name varchar(255) NOT NULL UNIQUE,
+    name varchar(255) NOT NULL,
     description text,
     created_at timestamp DEFAULT now(),
-    updated_at timestamp DEFAULT now()
+    updated_at timestamp DEFAULT now(),
+    CONSTRAINT user_groups_name_key UNIQUE (name)
 );
 
 -- Change CREATE_TABLE: group_roles
diff --git a/migrations/changes-1744627696.sql b/migrations/changes-1744627696.sql
new file mode 100644
index 000000000..ebbf28ebc
--- /dev/null
+++ b/migrations/changes-1744627696.sql
@@ -0,0 +1,619 @@
+-- +migrate Up
+-- Change CREATE_TABLE: tenants
+CREATE TABLE tenants (
+    id uuid DEFAULT gen_random_uuid () PRIMARY KEY,
+    name varchar(255) NOT NULL UNIQUE,
+    domain VARCHAR(255),
+    is_active bool DEFAULT TRUE NOT NULL,
+    created_at timestamptz DEFAULT now(),
+    updated_at timestamptz DEFAULT now()
+);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE prompts
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE permissions
+    DROP CONSTRAINT IF EXISTS permissions_name_key;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE permissions
+    ADD COLUMN tenant_id UUID REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE permissions
+    ADD UNIQUE (tenant_id, name);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE money_accounts
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE money_accounts
+    ADD UNIQUE (tenant_id, account_number);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE message_templates
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE warehouse_orders
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE counterparty
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE counterparty
+    ADD UNIQUE (tenant_id, tin);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE positions
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE positions
+    ADD UNIQUE (tenant_id, name);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE transactions
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE passports
+    DROP CONSTRAINT IF EXISTS passports_passport_number_series_key;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE passports
+    ADD COLUMN tenant_id UUID REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE passports
+    ADD CONSTRAINT passports_tenant_passport_number_series_key UNIQUE (tenant_id, passport_number, series);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE user_groups
+    ADD COLUMN tenant_id UUID REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE user_groups
+    DROP CONSTRAINT IF EXISTS user_groups_name_key;
+
+ALTER TABLE user_groups
+    ADD UNIQUE (tenant_id, name);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE uploads
+    ADD COLUMN tenant_id UUID REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE uploads
+    DROP CONSTRAINT IF EXISTS uploads_hash_key;
+
+ALTER TABLE uploads
+    ADD UNIQUE (tenant_id, hash);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE inventory
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE inventory
+    ADD UNIQUE (tenant_id, name);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE users
+    ADD COLUMN tenant_id UUID REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE users
+    DROP CONSTRAINT IF EXISTS users_email_key;
+
+ALTER TABLE users
+    DROP CONSTRAINT IF EXISTS users_phone_key;
+
+ALTER TABLE users
+    ADD UNIQUE (tenant_id, email);
+
+ALTER TABLE users
+    ADD UNIQUE (tenant_id, phone);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE warehouse_units
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE warehouse_units
+    ADD UNIQUE (tenant_id, title);
+
+ALTER TABLE warehouse_units
+    ADD UNIQUE (tenant_id, short_title);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE authentication_logs
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE expense_categories
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE expense_categories
+    ADD UNIQUE (tenant_id, name);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE roles
+    ADD COLUMN tenant_id UUID REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE roles
+    DROP CONSTRAINT IF EXISTS roles_name_key;
+
+ALTER TABLE roles
+    ADD UNIQUE (tenant_id, name);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE sessions
+    ADD COLUMN tenant_id UUID REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE clients
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE warehouse_positions
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE warehouse_positions
+    DROP CONSTRAINT IF EXISTS warehouse_positions_barcode_key;
+
+ALTER TABLE warehouse_positions
+    ADD UNIQUE (tenant_id, barcode);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE tabs
+    ADD COLUMN tenant_id UUID REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE tabs
+    DROP CONSTRAINT IF EXISTS tabs_href_user_id_key;
+
+ALTER TABLE tabs
+    ADD UNIQUE (tenant_id, href, user_id);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE inventory_checks
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE companies
+    ADD COLUMN tenant_id UUID REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE companies
+    ADD UNIQUE (tenant_id, name);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE chats
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE dialogues
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE employees
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE employees
+    DROP CONSTRAINT IF EXISTS employees_email_key;
+
+ALTER TABLE employees
+    ADD UNIQUE (tenant_id, email);
+
+ALTER TABLE employees
+    ADD UNIQUE (tenant_id, phone);
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE inventory_check_results
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE action_logs
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+-- Change ADD_COLUMN: tenant_id
+ALTER TABLE warehouse_products
+    ADD COLUMN tenant_id UUID NOT NULL REFERENCES tenants (id) ON DELETE CASCADE;
+
+ALTER TABLE warehouse_products
+    DROP CONSTRAINT IF EXISTS warehouse_products_rfid;
+
+ALTER TABLE warehouse_products
+    ADD UNIQUE (tenant_id, rfid);
+
+-- Change CREATE_INDEX: user_groups_tenant_id_idx
+CREATE INDEX user_groups_tenant_id_idx ON user_groups (tenant_id);
+
+-- Change CREATE_INDEX: counterparty_tenant_id_idx
+CREATE INDEX counterparty_tenant_id_idx ON counterparty (tenant_id);
+
+-- Change CREATE_INDEX: action_logs_tenant_id_idx
+CREATE INDEX action_logs_tenant_id_idx ON action_logs (tenant_id);
+
+-- Change CREATE_INDEX: employees_tenant_id_idx
+CREATE INDEX employees_tenant_id_idx ON employees (tenant_id);
+
+-- Change CREATE_INDEX: warehouse_units_tenant_id_idx
+CREATE INDEX warehouse_units_tenant_id_idx ON warehouse_units (tenant_id);
+
+-- Change CREATE_INDEX: warehouse_positions_tenant_id_idx
+CREATE INDEX warehouse_positions_tenant_id_idx ON warehouse_positions (tenant_id);
+
+-- Change CREATE_INDEX: users_tenant_id_idx
+CREATE INDEX users_tenant_id_idx ON users (tenant_id);
+
+-- Change CREATE_INDEX: inventory_checks_tenant_id_idx
+CREATE INDEX inventory_checks_tenant_id_idx ON inventory_checks (tenant_id);
+
+-- Change CREATE_INDEX: employees_first_name_idx
+CREATE INDEX employees_first_name_idx ON employees (first_name);
+
+-- Change CREATE_INDEX: inventory_tenant_id_idx
+CREATE INDEX inventory_tenant_id_idx ON inventory (tenant_id);
+
+-- Change CREATE_INDEX: authentication_logs_tenant_id_idx
+CREATE INDEX authentication_logs_tenant_id_idx ON authentication_logs (tenant_id);
+
+-- Change CREATE_INDEX: dialogues_tenant_id_idx
+CREATE INDEX dialogues_tenant_id_idx ON dialogues (tenant_id);
+
+-- Change CREATE_INDEX: employees_email_idx
+CREATE INDEX employees_email_idx ON employees (email);
+
+-- Change CREATE_INDEX: inventory_check_results_tenant_id_idx
+CREATE INDEX inventory_check_results_tenant_id_idx ON inventory_check_results (tenant_id);
+
+-- Change CREATE_INDEX: sessions_tenant_id_idx
+CREATE INDEX sessions_tenant_id_idx ON sessions (tenant_id);
+
+-- Change CREATE_INDEX: prompts_tenant_id_idx
+CREATE INDEX prompts_tenant_id_idx ON prompts (tenant_id);
+
+-- Change CREATE_INDEX: warehouse_products_tenant_id_idx
+CREATE INDEX warehouse_products_tenant_id_idx ON warehouse_products (tenant_id);
+
+-- Change CREATE_INDEX: transactions_tenant_id_idx
+CREATE INDEX transactions_tenant_id_idx ON transactions (tenant_id);
+
+-- Change CREATE_INDEX: idx_message_templates_tenant_id
+CREATE INDEX idx_message_templates_tenant_id ON message_templates (tenant_id);
+
+-- Change CREATE_INDEX: positions_tenant_id_idx
+CREATE INDEX positions_tenant_id_idx ON positions (tenant_id);
+
+-- Change CREATE_INDEX: warehouse_orders_tenant_id_idx
+CREATE INDEX warehouse_orders_tenant_id_idx ON warehouse_orders (tenant_id);
+
+-- Change CREATE_INDEX: permissions_tenant_id_idx
+CREATE INDEX permissions_tenant_id_idx ON permissions (tenant_id);
+
+-- Change CREATE_INDEX: idx_chats_tenant_id
+CREATE INDEX idx_chats_tenant_id ON chats (tenant_id);
+
+-- Change CREATE_INDEX: expense_categories_tenant_id_idx
+CREATE INDEX expense_categories_tenant_id_idx ON expense_categories (tenant_id);
+
+-- Change CREATE_INDEX: employees_phone_idx
+CREATE INDEX employees_phone_idx ON employees (phone);
+
+-- Change CREATE_INDEX: roles_tenant_id_idx
+CREATE INDEX roles_tenant_id_idx ON roles (tenant_id);
+
+-- Change CREATE_INDEX: uploads_tenant_id_idx
+CREATE INDEX uploads_tenant_id_idx ON uploads (tenant_id);
+
+-- Change CREATE_INDEX: tabs_tenant_id_idx
+CREATE INDEX tabs_tenant_id_idx ON tabs (tenant_id);
+
+-- Change CREATE_INDEX: money_accounts_tenant_id_idx
+CREATE INDEX money_accounts_tenant_id_idx ON money_accounts (tenant_id);
+
+-- Change CREATE_INDEX: idx_clients_tenant_id
+CREATE INDEX idx_clients_tenant_id ON clients (tenant_id);
+
+-- Change CREATE_INDEX: employees_last_name_idx
+CREATE INDEX employees_last_name_idx ON employees (last_name);
+
+-- +migrate Down
+-- Undo CREATE_INDEX: employees_last_name_idx
+DROP INDEX employees_last_name_idx;
+
+-- Undo CREATE_INDEX: idx_clients_tenant_id
+DROP INDEX idx_clients_tenant_id;
+
+-- Undo CREATE_INDEX: money_accounts_tenant_id_idx
+DROP INDEX money_accounts_tenant_id_idx;
+
+-- Undo CREATE_INDEX: tabs_tenant_id_idx
+DROP INDEX tabs_tenant_id_idx;
+
+-- Undo CREATE_INDEX: uploads_tenant_id_idx
+DROP INDEX uploads_tenant_id_idx;
+
+-- Undo CREATE_INDEX: roles_tenant_id_idx
+DROP INDEX roles_tenant_id_idx;
+
+-- Undo CREATE_INDEX: employees_phone_idx
+DROP INDEX employees_phone_idx;
+
+-- Undo CREATE_INDEX: expense_categories_tenant_id_idx
+DROP INDEX expense_categories_tenant_id_idx;
+
+-- Undo CREATE_INDEX: idx_chats_tenant_id
+DROP INDEX idx_chats_tenant_id;
+
+-- Undo CREATE_INDEX: permissions_tenant_id_idx
+DROP INDEX permissions_tenant_id_idx;
+
+-- Undo CREATE_INDEX: warehouse_orders_tenant_id_idx
+DROP INDEX warehouse_orders_tenant_id_idx;
+
+-- Undo CREATE_INDEX: positions_tenant_id_idx
+DROP INDEX positions_tenant_id_idx;
+
+-- Undo CREATE_INDEX: idx_message_templates_tenant_id
+DROP INDEX idx_message_templates_tenant_id;
+
+-- Undo CREATE_INDEX: transactions_tenant_id_idx
+DROP INDEX transactions_tenant_id_idx;
+
+-- Undo CREATE_INDEX: warehouse_products_tenant_id_idx
+DROP INDEX warehouse_products_tenant_id_idx;
+
+-- Undo CREATE_INDEX: prompts_tenant_id_idx
+DROP INDEX prompts_tenant_id_idx;
+
+-- Undo CREATE_INDEX: sessions_tenant_id_idx
+DROP INDEX sessions_tenant_id_idx;
+
+-- Undo CREATE_INDEX: inventory_check_results_tenant_id_idx
+DROP INDEX inventory_check_results_tenant_id_idx;
+
+-- Undo CREATE_INDEX: employees_email_idx
+DROP INDEX employees_email_idx;
+
+-- Undo CREATE_INDEX: dialogues_tenant_id_idx
+DROP INDEX dialogues_tenant_id_idx;
+
+-- Undo CREATE_INDEX: authentication_logs_tenant_id_idx
+DROP INDEX authentication_logs_tenant_id_idx;
+
+-- Undo CREATE_INDEX: inventory_tenant_id_idx
+DROP INDEX inventory_tenant_id_idx;
+
+-- Undo CREATE_INDEX: employees_first_name_idx
+DROP INDEX employees_first_name_idx;
+
+-- Undo CREATE_INDEX: inventory_checks_tenant_id_idx
+DROP INDEX inventory_checks_tenant_id_idx;
+
+-- Undo CREATE_INDEX: users_tenant_id_idx
+DROP INDEX users_tenant_id_idx;
+
+-- Undo CREATE_INDEX: warehouse_positions_tenant_id_idx
+DROP INDEX warehouse_positions_tenant_id_idx;
+
+-- Undo CREATE_INDEX: warehouse_units_tenant_id_idx
+DROP INDEX warehouse_units_tenant_id_idx;
+
+-- Undo CREATE_INDEX: employees_tenant_id_idx
+DROP INDEX employees_tenant_id_idx;
+
+-- Undo CREATE_INDEX: action_logs_tenant_id_idx
+DROP INDEX action_logs_tenant_id_idx;
+
+-- Undo CREATE_INDEX: counterparty_tenant_id_idx
+DROP INDEX counterparty_tenant_id_idx;
+
+-- Undo CREATE_INDEX: user_groups_tenant_id_idx
+DROP INDEX user_groups_tenant_id_idx;
+
+ALTER TABLE warehouse_products
+    DROP CONSTRAINT IF EXISTS warehouse_products_tenant_id_rfid_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE warehouse_products
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE warehouse_products
+    ADD CONSTRAINT warehouse_products_rfid UNIQUE (rfid);
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE action_logs
+    DROP COLUMN IF EXISTS tenant_id;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE inventory_check_results
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE employees
+    DROP CONSTRAINT IF EXISTS employees_tenant_id_phone_key;
+
+ALTER TABLE employees
+    DROP CONSTRAINT IF EXISTS employees_tenant_id_email_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE employees
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE employees
+    ADD CONSTRAINT employees_email_key UNIQUE (email);
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE dialogues
+    DROP COLUMN IF EXISTS tenant_id;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE chats
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE companies
+    DROP CONSTRAINT IF EXISTS companies_tenant_id_name_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE companies
+    DROP COLUMN IF EXISTS tenant_id;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE inventory_checks
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE tabs
+    DROP CONSTRAINT IF EXISTS tabs_tenant_id_href_user_id_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE tabs
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE tabs
+    ADD CONSTRAINT tabs_href_user_id_key UNIQUE (href, user_id);
+
+ALTER TABLE warehouse_positions
+    DROP CONSTRAINT IF EXISTS warehouse_positions_tenant_id_barcode_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE warehouse_positions
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE warehouse_positions
+    ADD CONSTRAINT warehouse_positions_barcode_key UNIQUE (barcode);
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE clients
+    DROP COLUMN IF EXISTS tenant_id;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE sessions
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE roles
+    DROP CONSTRAINT IF EXISTS roles_tenant_id_name_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE roles
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE roles
+    ADD CONSTRAINT roles_name_key UNIQUE (name);
+
+ALTER TABLE expense_categories
+    DROP CONSTRAINT IF EXISTS expense_categories_tenant_id_name_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE expense_categories
+    DROP COLUMN IF EXISTS tenant_id;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE authentication_logs
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE warehouse_units
+    DROP CONSTRAINT IF EXISTS warehouse_units_tenant_id_short_title_key;
+
+ALTER TABLE warehouse_units
+    DROP CONSTRAINT IF EXISTS warehouse_units_tenant_id_title_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE warehouse_units
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE users
+    DROP CONSTRAINT IF EXISTS users_tenant_id_phone_key;
+
+ALTER TABLE users
+    DROP CONSTRAINT IF EXISTS users_tenant_id_email_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE users
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE users
+    ADD CONSTRAINT users_phone_key UNIQUE (phone);
+
+ALTER TABLE users
+    ADD CONSTRAINT users_email_key UNIQUE (email);
+
+ALTER TABLE inventory
+    DROP CONSTRAINT IF EXISTS inventory_tenant_id_name_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE inventory
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE uploads
+    DROP CONSTRAINT IF EXISTS uploads_tenant_id_hash_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE uploads
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE uploads
+    ADD CONSTRAINT uploads_hash_key UNIQUE (hash);
+
+ALTER TABLE user_groups
+    DROP CONSTRAINT IF EXISTS user_groups_tenant_id_name_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE user_groups
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE user_groups
+    ADD CONSTRAINT user_groups_name_key UNIQUE (name);
+
+ALTER TABLE passports
+    DROP CONSTRAINT IF EXISTS passports_tenant_passport_number_series_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE passports
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE passports
+    ADD CONSTRAINT passports_passport_number_series_key UNIQUE (passport_number, series);
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE transactions
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE positions
+    DROP CONSTRAINT IF EXISTS positions_tenant_id_name_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE positions
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE counterparty
+    DROP CONSTRAINT IF EXISTS counterparty_tenant_id_tin_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE counterparty
+    DROP COLUMN IF EXISTS tenant_id;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE warehouse_orders
+    DROP COLUMN IF EXISTS tenant_id;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE message_templates
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE money_accounts
+    DROP CONSTRAINT IF EXISTS money_accounts_tenant_id_account_number_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE money_accounts
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE permissions
+    DROP CONSTRAINT IF EXISTS permissions_tenant_id_name_key;
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE permissions
+    DROP COLUMN IF EXISTS tenant_id;
+
+ALTER TABLE permissions
+    ADD CONSTRAINT permissions_name_key UNIQUE (name);
+
+-- Undo ADD_COLUMN: tenant_id
+ALTER TABLE prompts
+    DROP COLUMN IF EXISTS tenant_id;
+
+-- Undo CREATE_TABLE: tenants
+DROP TABLE IF EXISTS tenants CASCADE;
+
diff --git a/migrations/changes-1745997548.sql b/migrations/changes-1745997548.sql
index f7bcdf775..fded7c8d9 100644
--- a/migrations/changes-1745997548.sql
+++ b/migrations/changes-1745997548.sql
@@ -8,6 +8,7 @@ CREATE TABLE chat_members (
     client_contact_id int8 UNIQUE REFERENCES client_contacts (id) ON DELETE SET NULL ON UPDATE CASCADE,
     transport varchar(20) NOT NULL,
     transport_meta jsonb,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     created_at timestamp(3) DEFAULT now() NOT NULL,
     updated_at timestamp(3) DEFAULT now() NOT NULL
 );
diff --git a/migrations/changes-1746435765.sql b/migrations/changes-1746435765.sql
index 3538de9b9..bd355676d 100644
--- a/migrations/changes-1746435765.sql
+++ b/migrations/changes-1746435765.sql
@@ -10,12 +10,14 @@ CREATE TABLE IF NOT EXISTS ai_chat_configs (
     access_token varchar(1024) NOT NULL,
     max_tokens integer NOT NULL DEFAULT 1024,
     is_default boolean NOT NULL DEFAULT FALSE,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     created_at timestamp with time zone NOT NULL DEFAULT NOW(),
     updated_at timestamp with time zone NOT NULL DEFAULT NOW()
 );
 
 -- Add unique index to ensure only one default AIChat config
-CREATE UNIQUE INDEX IF NOT EXISTS idx_ai_chat_configs_unique_default ON ai_chat_configs (is_default) WHERE (is_default = true);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_ai_chat_configs_unique_default ON ai_chat_configs (is_default)
+WHERE (is_default = TRUE);
 
 -- +migrate Down
 -- Undo CREATE_TABLE: ai_chat_configs
@@ -24,4 +26,3 @@ DROP TABLE IF EXISTS ai_chat_configs CASCADE;
 -- Remove unique index
 DROP INDEX IF EXISTS idx_ai_chat_configs_unique_default;
 
-
diff --git a/modules/bichat/domain/entities/dialogue/dialogue.go b/modules/bichat/domain/entities/dialogue/dialogue.go
index 7381d7897..27a6e9ea1 100644
--- a/modules/bichat/domain/entities/dialogue/dialogue.go
+++ b/modules/bichat/domain/entities/dialogue/dialogue.go
@@ -3,6 +3,7 @@ package dialogue
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/bichat/domain/entities/llm"
 )
 
@@ -10,6 +11,7 @@ type Messages []llm.ChatCompletionMessage
 
 type Dialogue interface {
 	ID() uint
+	TenantID() uuid.UUID
 	UserID() uint
 	Label() string
 	Messages() Messages
diff --git a/modules/bichat/domain/entities/dialogue/dialogue_impl.go b/modules/bichat/domain/entities/dialogue/dialogue_impl.go
index 375944ebb..d98de182e 100644
--- a/modules/bichat/domain/entities/dialogue/dialogue_impl.go
+++ b/modules/bichat/domain/entities/dialogue/dialogue_impl.go
@@ -3,11 +3,13 @@ package dialogue
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/bichat/domain/entities/llm"
 )
 
-func New(userID uint, label string) Dialogue {
+func New(tenantID uuid.UUID, userID uint, label string) Dialogue {
 	return &dialogue{
+		tenantID:  tenantID,
 		userID:    userID,
 		label:     label,
 		messages:  Messages{},
@@ -16,9 +18,10 @@ func New(userID uint, label string) Dialogue {
 	}
 }
 
-func NewWithID(id uint, userID uint, label string, messages Messages, createdAt, updatedAt time.Time) Dialogue {
+func NewWithID(id uint, tenantID uuid.UUID, userID uint, label string, messages Messages, createdAt, updatedAt time.Time) Dialogue {
 	return &dialogue{
 		id:        id,
+		tenantID:  tenantID,
 		userID:    userID,
 		label:     label,
 		messages:  messages,
@@ -29,6 +32,7 @@ func NewWithID(id uint, userID uint, label string, messages Messages, createdAt,
 
 type dialogue struct {
 	id        uint
+	tenantID  uuid.UUID
 	userID    uint
 	label     string
 	messages  Messages
@@ -40,6 +44,10 @@ func (d *dialogue) ID() uint {
 	return d.id
 }
 
+func (d *dialogue) TenantID() uuid.UUID {
+	return d.tenantID
+}
+
 func (d *dialogue) UserID() uint {
 	return d.userID
 }
@@ -71,6 +79,7 @@ func (d *dialogue) UpdatedAt() time.Time {
 func (d *dialogue) AddMessages(messages ...llm.ChatCompletionMessage) Dialogue {
 	return &dialogue{
 		id:        d.id,
+		tenantID:  d.tenantID,
 		userID:    d.userID,
 		label:     d.label,
 		messages:  append(d.messages, messages...),
@@ -82,6 +91,7 @@ func (d *dialogue) AddMessages(messages ...llm.ChatCompletionMessage) Dialogue {
 func (d *dialogue) SetMessages(messages Messages) Dialogue {
 	return &dialogue{
 		id:        d.id,
+		tenantID:  d.tenantID,
 		userID:    d.userID,
 		label:     d.label,
 		messages:  messages,
@@ -95,6 +105,7 @@ func (d *dialogue) SetLastMessage(msg llm.ChatCompletionMessage) Dialogue {
 	messages[len(messages)-1] = msg
 	return &dialogue{
 		id:        d.id,
+		tenantID:  d.tenantID,
 		userID:    d.userID,
 		label:     d.label,
 		messages:  messages,
diff --git a/modules/bichat/infrastructure/persistence/bichat_mappers.go b/modules/bichat/infrastructure/persistence/bichat_mappers.go
index 3c4dfa04c..541bf2a23 100644
--- a/modules/bichat/infrastructure/persistence/bichat_mappers.go
+++ b/modules/bichat/infrastructure/persistence/bichat_mappers.go
@@ -3,6 +3,7 @@ package persistence
 import (
 	"encoding/json"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/bichat/domain/entities/dialogue"
 	"github.com/iota-uz/iota-sdk/modules/bichat/domain/entities/llm"
 	"github.com/iota-uz/iota-sdk/modules/bichat/infrastructure/persistence/models"
@@ -31,6 +32,7 @@ func toDBDialogue(entity dialogue.Dialogue) (*models.Dialogue, error) {
 	}
 	return &models.Dialogue{
 		ID:        entity.ID(),
+		TenantID:  entity.TenantID().String(),
 		UserID:    entity.UserID(),
 		Label:     entity.Label(),
 		Messages:  dbMessages,
@@ -44,8 +46,13 @@ func toDomainDialogue(dbDialogue *models.Dialogue) (dialogue.Dialogue, error) {
 	if err != nil {
 		return nil, err
 	}
+	tenantID, err := uuid.Parse(dbDialogue.TenantID)
+	if err != nil {
+		return nil, err
+	}
 	return dialogue.NewWithID(
 		dbDialogue.ID,
+		tenantID,
 		dbDialogue.UserID,
 		dbDialogue.Label,
 		messages,
diff --git a/modules/bichat/infrastructure/persistence/dialogue_repository.go b/modules/bichat/infrastructure/persistence/dialogue_repository.go
index 189e6f0ed..5f092a2cc 100644
--- a/modules/bichat/infrastructure/persistence/dialogue_repository.go
+++ b/modules/bichat/infrastructure/persistence/dialogue_repository.go
@@ -20,6 +20,7 @@ var (
 const (
 	dialogueFindQuery = `
 		SELECT id,
+		       tenant_id,
 		       user_id,
 		       label,
 		       messages,
@@ -31,28 +32,33 @@ const (
 
 	dialogueInsertQuery = `
 		INSERT INTO dialogues (
+			tenant_id,
 			user_id,
 			label,
 			messages,
 			created_at,
 			updated_at
-		) VALUES ($1, $2, $3, $4, $5) RETURNING id`
+		) VALUES ($1, $2, $3, $4, $5, $6) RETURNING id`
 
 	dialogueUpdateQuery = `
 		UPDATE dialogues SET
 			   label = $1,
 		       messages = $2,
 		       updated_at = $3
-		 WHERE id = $4`
+		 WHERE id = $4 AND tenant_id = $5`
 
-	dialogueDeleteQuery = `DELETE FROM dialogues WHERE id = $1`
+	dialogueDeleteQuery = `DELETE FROM dialogues WHERE id = $1 AND tenant_id = $2`
 )
 
 type GormDialogueRepository struct{}
 
 func (g *GormDialogueRepository) GetByUserID(ctx context.Context, userID uint) ([]dialogue.Dialogue, error) {
-	//TODO implement me
-	panic("implement me")
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	return g.queryDialogues(ctx, dialogueFindQuery+" WHERE user_id = $1 AND tenant_id = $2", userID, tenant.ID)
 }
 
 func NewDialogueRepository() dialogue.Repository {
@@ -60,11 +66,16 @@ func NewDialogueRepository() dialogue.Repository {
 }
 
 func (g *GormDialogueRepository) GetPaginated(ctx context.Context, params *dialogue.FindParams) ([]dialogue.Dialogue, error) {
-	var args []interface{}
-	where := []string{"1 = 1"}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	where := []string{"tenant_id = $1"}
+	args := []interface{}{tenant.ID}
 
 	if params.Query != "" && params.Field != "" {
-		where = append(where, fmt.Sprintf("%s::VARCHAR ILIKE $%d", params.Field, len(where)))
+		where = append(where, fmt.Sprintf("%s::VARCHAR ILIKE $%d", params.Field, len(args)+1))
 		args = append(args, "%"+params.Query+"%")
 	}
 
@@ -81,19 +92,35 @@ func (g *GormDialogueRepository) Count(ctx context.Context) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	var count int64
-	if err := tx.QueryRow(ctx, dialogueCountQuery).Scan(&count); err != nil {
+	if err := tx.QueryRow(ctx, dialogueCountQuery+" WHERE tenant_id = $1", tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *GormDialogueRepository) GetAll(ctx context.Context) ([]dialogue.Dialogue, error) {
-	return g.queryDialogues(ctx, dialogueFindQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	return g.queryDialogues(ctx, dialogueFindQuery+" WHERE tenant_id = $1", tenant.ID)
 }
 
 func (g *GormDialogueRepository) GetByID(ctx context.Context, id uint) (dialogue.Dialogue, error) {
-	dialogues, err := g.queryDialogues(ctx, repo.Join(dialogueFindQuery, "WHERE id = $1"), id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	dialogues, err := g.queryDialogues(ctx, repo.Join(dialogueFindQuery, "WHERE id = $1 AND tenant_id = $2"), id, tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get dialogue by id")
 	}
@@ -108,13 +135,22 @@ func (g *GormDialogueRepository) Create(ctx context.Context, d dialogue.Dialogue
 	if err != nil {
 		return nil, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	dbDialogue, err := toDBDialogue(d)
 	if err != nil {
 		return nil, err
 	}
+	dbDialogue.TenantID = tenant.ID.String()
+
 	row := tx.QueryRow(
 		ctx,
 		dialogueInsertQuery,
+		dbDialogue.TenantID,
 		dbDialogue.UserID,
 		dbDialogue.Label,
 		dbDialogue.Messages,
@@ -131,10 +167,17 @@ func (g *GormDialogueRepository) Create(ctx context.Context, d dialogue.Dialogue
 }
 
 func (g *GormDialogueRepository) Update(ctx context.Context, d dialogue.Dialogue) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	dbDialogue, err := toDBDialogue(d)
 	if err != nil {
 		return err
 	}
+	dbDialogue.TenantID = tenant.ID.String()
+
 	return g.execQuery(
 		ctx,
 		dialogueUpdateQuery,
@@ -142,11 +185,17 @@ func (g *GormDialogueRepository) Update(ctx context.Context, d dialogue.Dialogue
 		dbDialogue.Messages,
 		dbDialogue.UpdatedAt,
 		dbDialogue.ID,
+		dbDialogue.TenantID,
 	)
 }
 
 func (g *GormDialogueRepository) Delete(ctx context.Context, id uint) error {
-	return g.execQuery(ctx, dialogueDeleteQuery, id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	return g.execQuery(ctx, dialogueDeleteQuery, id, tenant.ID)
 }
 
 func (g *GormDialogueRepository) queryDialogues(ctx context.Context, query string, args ...interface{}) ([]dialogue.Dialogue, error) {
@@ -166,6 +215,7 @@ func (g *GormDialogueRepository) queryDialogues(ctx context.Context, query strin
 		var d models.Dialogue
 		if err := rows.Scan(
 			&d.ID,
+			&d.TenantID,
 			&d.UserID,
 			&d.Label,
 			&d.Messages,
diff --git a/modules/bichat/infrastructure/persistence/models/models.go b/modules/bichat/infrastructure/persistence/models/models.go
index 8c3798771..a82e0aa19 100644
--- a/modules/bichat/infrastructure/persistence/models/models.go
+++ b/modules/bichat/infrastructure/persistence/models/models.go
@@ -14,6 +14,7 @@ type Prompt struct {
 
 type Dialogue struct {
 	ID        uint
+	TenantID  string
 	UserID    uint
 	Label     string
 	Messages  string
diff --git a/modules/bichat/infrastructure/persistence/schema/bichat-schema.sql b/modules/bichat/infrastructure/persistence/schema/bichat-schema.sql
index f13b3e295..614803e5d 100644
--- a/modules/bichat/infrastructure/persistence/schema/bichat-schema.sql
+++ b/modules/bichat/infrastructure/persistence/schema/bichat-schema.sql
@@ -1,5 +1,6 @@
 CREATE TABLE prompts (
     id varchar(30) PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     title varchar(255) NOT NULL,
     description text NOT NULL,
     prompt text NOT NULL,
@@ -8,6 +9,7 @@ CREATE TABLE prompts (
 
 CREATE TABLE dialogues (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     user_id int NOT NULL REFERENCES users (id) ON DELETE CASCADE,
     label varchar(255) NOT NULL,
     messages json NOT NULL,
@@ -17,3 +19,7 @@ CREATE TABLE dialogues (
 
 CREATE INDEX dialogues_user_id_idx ON dialogues (user_id);
 
+CREATE INDEX dialogues_tenant_id_idx ON dialogues (tenant_id);
+
+CREATE INDEX prompts_tenant_id_idx ON prompts (tenant_id);
+
diff --git a/modules/bichat/services/dialogue_service.go b/modules/bichat/services/dialogue_service.go
index 2f3ec0171..552096919 100644
--- a/modules/bichat/services/dialogue_service.go
+++ b/modules/bichat/services/dialogue_service.go
@@ -249,7 +249,12 @@ func (s *DialogueService) StartDialogue(ctx context.Context, message string, mod
 	if err != nil {
 		return nil, err
 	}
+	tenant, err := localComposables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
 	data := dialogue.New(
+		tenant.ID,
 		u.ID(),
 		"Новый чат",
 	).AddMessages(
diff --git a/modules/core/domain/aggregates/group/group.go b/modules/core/domain/aggregates/group/group.go
index 28f7c4e2d..2cb175da2 100644
--- a/modules/core/domain/aggregates/group/group.go
+++ b/modules/core/domain/aggregates/group/group.go
@@ -21,6 +21,7 @@ const (
 type Group interface {
 	ID() uuid.UUID
 	Type() Type
+	TenantID() uuid.UUID
 	Name() string
 	Description() string
 	Users() []user.User
@@ -38,6 +39,7 @@ type Group interface {
 	SetRoles(roles []role.Role) Group
 	SetName(name string) Group
 	SetDescription(desc string) Group
+	SetTenantID(tenantID uuid.UUID) Group
 }
 
 // ---- Implementations ----
@@ -54,6 +56,12 @@ func WithType(_type Type) Option {
 	}
 }
 
+func WithTenantID(tenantID uuid.UUID) Option {
+	return func(g *group) {
+		g.tenantID = tenantID
+	}
+}
+
 func WithDescription(desc string) Option {
 	return func(g *group) {
 		g.description = desc
@@ -88,6 +96,7 @@ func New(name string, opts ...Option) Group {
 	g := &group{
 		id:        uuid.New(),
 		type_:     TypeUser,
+		tenantID:  uuid.Nil,
 		name:      name,
 		createdAt: time.Now(),
 		updatedAt: time.Now(),
@@ -102,6 +111,7 @@ func New(name string, opts ...Option) Group {
 type group struct {
 	id          uuid.UUID
 	type_       Type
+	tenantID    uuid.UUID
 	name        string
 	description string
 	roles       []role.Role
@@ -116,6 +126,10 @@ func (g *group) ID() uuid.UUID {
 
 func (g *group) Type() Type { return g.type_ }
 
+func (g *group) TenantID() uuid.UUID {
+	return g.tenantID
+}
+
 func (g *group) Name() string {
 	return g.name
 }
@@ -162,6 +176,13 @@ func (g *group) SetDescription(desc string) Group {
 	return &r
 }
 
+func (g *group) SetTenantID(tenantID uuid.UUID) Group {
+	r := *g
+	r.tenantID = tenantID
+	r.updatedAt = time.Now()
+	return &r
+}
+
 func (g *group) AssignRole(r role.Role) Group {
 	res := *g
 	res.roles = append(res.roles, r)
diff --git a/modules/core/domain/aggregates/group/group_repository.go b/modules/core/domain/aggregates/group/group_repository.go
index baf40a8dc..bdeb657c0 100644
--- a/modules/core/domain/aggregates/group/group_repository.go
+++ b/modules/core/domain/aggregates/group/group_repository.go
@@ -12,6 +12,7 @@ type Field = int
 const (
 	CreatedAtField Field = iota
 	UpdatedAtField
+	TenantIDField
 )
 
 type SortBy = repo.SortBy[Field]
@@ -25,6 +26,15 @@ type FindParams struct {
 	Filters []Filter
 }
 
+func (f *FindParams) FilterBy(field Field, filter repo.Filter) *FindParams {
+	res := *f
+	res.Filters = append(res.Filters, Filter{
+		Column: field,
+		Filter: filter,
+	})
+	return &res
+}
+
 type Repository interface {
 	Count(ctx context.Context, params *FindParams) (int64, error)
 	GetPaginated(ctx context.Context, params *FindParams) ([]Group, error)
diff --git a/modules/core/domain/aggregates/role/role.go b/modules/core/domain/aggregates/role/role.go
index b1f2111e3..2d7a64d26 100644
--- a/modules/core/domain/aggregates/role/role.go
+++ b/modules/core/domain/aggregates/role/role.go
@@ -3,6 +3,7 @@ package role
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/permission"
 )
 
@@ -46,6 +47,7 @@ func WithUpdatedAt(t time.Time) Option {
 
 type Role interface {
 	ID() uint
+	TenantID() uuid.UUID
 	Type() Type
 	Name() string
 	Description() string
@@ -59,6 +61,7 @@ type Role interface {
 
 	SetName(name string) Role
 	SetDescription(description string) Role
+	SetTenantID(tenantID uuid.UUID) Role
 
 	AddPermission(p *permission.Permission) Role
 	SetPermissions(permissions []*permission.Permission) Role
@@ -70,6 +73,12 @@ func WithDescription(description string) Option {
 	}
 }
 
+func WithTenantID(tenantID uuid.UUID) Option {
+	return func(r *role) {
+		r.tenantID = tenantID
+	}
+}
+
 func New(
 	name string,
 	opts ...Option,
@@ -77,6 +86,7 @@ func New(
 	r := &role{
 		id:          0,
 		type_:       TypeUser,
+		tenantID:    uuid.Nil,
 		name:        name,
 		description: "",
 		permissions: []*permission.Permission{},
@@ -92,6 +102,7 @@ func New(
 type role struct {
 	id          uint
 	type_       Type
+	tenantID    uuid.UUID
 	name        string
 	description string
 	permissions []*permission.Permission
@@ -107,6 +118,10 @@ func (r *role) Type() Type {
 	return r.type_
 }
 
+func (r *role) TenantID() uuid.UUID {
+	return r.tenantID
+}
+
 func (r *role) Name() string {
 	return r.name
 }
@@ -158,6 +173,13 @@ func (r *role) SetDescription(description string) Role {
 	return &result
 }
 
+func (r *role) SetTenantID(tenantID uuid.UUID) Role {
+	result := *r
+	result.tenantID = tenantID
+	result.updatedAt = time.Now()
+	return &result
+}
+
 func (r *role) AddPermission(p *permission.Permission) Role {
 	result := *r
 	result.permissions = append(result.permissions, p)
diff --git a/modules/core/domain/aggregates/role/role_repository.go b/modules/core/domain/aggregates/role/role_repository.go
index eeb849abf..c2668a31b 100644
--- a/modules/core/domain/aggregates/role/role_repository.go
+++ b/modules/core/domain/aggregates/role/role_repository.go
@@ -13,6 +13,7 @@ const (
 	DescriptionField
 	CreatedAtField
 	PermissionIDField
+	TenantIDField
 )
 
 type Filter = repo.FieldFilter[Field]
diff --git a/modules/core/domain/aggregates/user/user.go b/modules/core/domain/aggregates/user/user.go
index 7bc1ffdd8..3a959b6d8 100644
--- a/modules/core/domain/aggregates/user/user.go
+++ b/modules/core/domain/aggregates/user/user.go
@@ -38,6 +38,12 @@ func WithType(type_ Type) Option {
 	}
 }
 
+func WithTenantID(id uuid.UUID) Option {
+	return func(u *user) {
+		u.tenantID = id
+	}
+}
+
 func WithMiddleName(middleName string) Option {
 	return func(u *user) {
 		u.middleName = middleName
@@ -124,6 +130,7 @@ func WithPhone(p phone.Phone) Option {
 type User interface {
 	ID() uint
 	Type() Type
+	TenantID() uuid.UUID
 	FirstName() string
 	LastName() string
 	MiddleName() string
@@ -180,6 +187,7 @@ func New(
 	u := &user{
 		id:          0,
 		type_:       TypeUser,
+		tenantID:    uuid.Nil,
 		firstName:   firstName,
 		lastName:    lastName,
 		middleName:  "",
@@ -206,6 +214,7 @@ func New(
 
 type user struct {
 	id          uint
+	tenantID    uuid.UUID
 	type_       Type
 	firstName   string
 	lastName    string
@@ -235,6 +244,10 @@ func (u *user) Type() Type {
 	return u.type_
 }
 
+func (u *user) TenantID() uuid.UUID {
+	return u.tenantID
+}
+
 func (u *user) FirstName() string {
 	return u.firstName
 }
diff --git a/modules/core/domain/aggregates/user/user_repository.go b/modules/core/domain/aggregates/user/user_repository.go
index c679ef123..59a34c1f7 100644
--- a/modules/core/domain/aggregates/user/user_repository.go
+++ b/modules/core/domain/aggregates/user/user_repository.go
@@ -20,6 +20,7 @@ const (
 	LastLoginField
 	CreatedAtField
 	UpdatedAtField
+	TenantIDField
 )
 
 type SortBy = repo.SortBy[Field]
diff --git a/modules/core/domain/entities/authlog/authlog.go b/modules/core/domain/entities/authlog/authlog.go
index 71e255824..626e794e8 100644
--- a/modules/core/domain/entities/authlog/authlog.go
+++ b/modules/core/domain/entities/authlog/authlog.go
@@ -2,10 +2,13 @@ package authlog
 
 import (
 	"time"
+
+	"github.com/google/uuid"
 )
 
 type AuthenticationLog struct {
 	ID        uint
+	TenantID  uuid.UUID
 	UserID    uint
 	IP        string
 	UserAgent string
diff --git a/modules/core/domain/entities/passport/passport.go b/modules/core/domain/entities/passport/passport.go
index f9eaa7ef8..057634583 100644
--- a/modules/core/domain/entities/passport/passport.go
+++ b/modules/core/domain/entities/passport/passport.go
@@ -9,6 +9,7 @@ import (
 
 type Passport interface {
 	ID() uuid.UUID
+	TenantID() uuid.UUID
 	Series() string
 	Number() string
 	Identifier() string // Series + Number
@@ -39,6 +40,12 @@ func WithID(id uuid.UUID) Option {
 	}
 }
 
+func WithTenantID(tenantID uuid.UUID) Option {
+	return func(p *passport) {
+		p.tenantID = tenantID
+	}
+}
+
 func WithFullName(firstName, lastName, middleName string) Option {
 	return func(p *passport) {
 		p.firstName = firstName
@@ -135,6 +142,7 @@ func New(series, number string, opts ...Option) Passport {
 
 type passport struct {
 	id                  uuid.UUID
+	tenantID            uuid.UUID
 	firstName           string
 	lastName            string
 	middleName          string
@@ -159,6 +167,10 @@ func (p *passport) ID() uuid.UUID {
 	return p.id
 }
 
+func (p *passport) TenantID() uuid.UUID {
+	return p.tenantID
+}
+
 func (p *passport) Series() string {
 	return p.series
 }
diff --git a/modules/core/domain/entities/permission/permission.go b/modules/core/domain/entities/permission/permission.go
index 559acd131..d2a415a47 100644
--- a/modules/core/domain/entities/permission/permission.go
+++ b/modules/core/domain/entities/permission/permission.go
@@ -18,6 +18,7 @@ const (
 
 type Permission struct {
 	ID       uuid.UUID
+	TenantID uuid.UUID
 	Name     string
 	Resource Resource
 	Action   Action
diff --git a/modules/core/domain/entities/session/session.go b/modules/core/domain/entities/session/session.go
index bccaaea33..97e599e02 100644
--- a/modules/core/domain/entities/session/session.go
+++ b/modules/core/domain/entities/session/session.go
@@ -3,12 +3,14 @@ package session
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/pkg/configuration"
 )
 
 type Session struct {
 	Token     string `gorm:"primaryKey"`
 	UserID    uint
+	TenantID  uuid.UUID
 	IP        string
 	UserAgent string
 	ExpiresAt time.Time
@@ -18,6 +20,7 @@ type Session struct {
 type CreateDTO struct {
 	Token     string
 	UserID    uint
+	TenantID  uuid.UUID
 	IP        string
 	UserAgent string
 }
@@ -26,6 +29,7 @@ func (d *CreateDTO) ToEntity() *Session {
 	return &Session{
 		Token:     d.Token,
 		UserID:    d.UserID,
+		TenantID:  d.TenantID,
 		IP:        d.IP,
 		UserAgent: d.UserAgent,
 		ExpiresAt: time.Now().Add(configuration.Use().SessionDuration),
diff --git a/modules/core/domain/entities/tab/tab.go b/modules/core/domain/entities/tab/tab.go
index 47f2406f0..836446d31 100644
--- a/modules/core/domain/entities/tab/tab.go
+++ b/modules/core/domain/entities/tab/tab.go
@@ -1,8 +1,13 @@
 package tab
 
+import (
+	"github.com/google/uuid"
+)
+
 type Tab struct {
 	ID       uint
 	Href     string
 	UserID   uint
 	Position uint
+	TenantID uuid.UUID
 }
diff --git a/modules/core/domain/entities/tenant/tenant.go b/modules/core/domain/entities/tenant/tenant.go
new file mode 100644
index 000000000..ed2dc7143
--- /dev/null
+++ b/modules/core/domain/entities/tenant/tenant.go
@@ -0,0 +1,86 @@
+package tenant
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type Tenant struct {
+	id        uuid.UUID
+	name      string
+	domain    string
+	isActive  bool
+	createdAt time.Time
+	updatedAt time.Time
+}
+
+type Option func(*Tenant)
+
+func WithID(id uuid.UUID) Option {
+	return func(t *Tenant) {
+		t.id = id
+	}
+}
+
+func WithDomain(domain string) Option {
+	return func(t *Tenant) {
+		t.domain = domain
+	}
+}
+
+func WithIsActive(isActive bool) Option {
+	return func(t *Tenant) {
+		t.isActive = isActive
+	}
+}
+
+func WithCreatedAt(createdAt time.Time) Option {
+	return func(t *Tenant) {
+		t.createdAt = createdAt
+	}
+}
+
+func WithUpdatedAt(updatedAt time.Time) Option {
+	return func(t *Tenant) {
+		t.updatedAt = updatedAt
+	}
+}
+
+func New(name string, opts ...Option) *Tenant {
+	t := &Tenant{
+		id:        uuid.New(),
+		name:      name,
+		isActive:  true,
+		createdAt: time.Now(),
+		updatedAt: time.Now(),
+	}
+	for _, opt := range opts {
+		opt(t)
+	}
+	return t
+}
+
+func (t *Tenant) ID() uuid.UUID {
+	return t.id
+}
+
+func (t *Tenant) Name() string {
+	return t.name
+}
+
+func (t *Tenant) Domain() string {
+	return t.domain
+}
+
+func (t *Tenant) IsActive() bool {
+	return t.isActive
+}
+
+func (t *Tenant) CreatedAt() time.Time {
+	return t.createdAt
+}
+
+func (t *Tenant) UpdatedAt() time.Time {
+	return t.updatedAt
+}
diff --git a/modules/core/domain/entities/tenant/tenant_repository.go b/modules/core/domain/entities/tenant/tenant_repository.go
new file mode 100644
index 000000000..c75809253
--- /dev/null
+++ b/modules/core/domain/entities/tenant/tenant_repository.go
@@ -0,0 +1,16 @@
+package tenant
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+)
+
+type Repository interface {
+	GetByID(ctx context.Context, id uuid.UUID) (*Tenant, error)
+	GetByDomain(ctx context.Context, domain string) (*Tenant, error)
+	Create(ctx context.Context, tenant *Tenant) (*Tenant, error)
+	Update(ctx context.Context, tenant *Tenant) (*Tenant, error)
+	Delete(ctx context.Context, id uuid.UUID) error
+	List(ctx context.Context) ([]*Tenant, error)
+}
diff --git a/modules/core/domain/entities/upload/upload.go b/modules/core/domain/entities/upload/upload.go
index b9262dd37..29825c9ba 100644
--- a/modules/core/domain/entities/upload/upload.go
+++ b/modules/core/domain/entities/upload/upload.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/gabriel-vasile/mimetype"
+	"github.com/google/uuid"
 
 	"github.com/iota-uz/iota-sdk/modules/core/presentation/assets"
 	"github.com/iota-uz/iota-sdk/pkg/configuration"
@@ -38,6 +39,7 @@ type Size interface {
 
 type Upload interface {
 	ID() uint
+	TenantID() uuid.UUID
 	Type() UploadType
 	Hash() string
 	Path() string
@@ -66,6 +68,7 @@ func New(
 	}
 	return &upload{
 		id:        0,
+		tenantID:  uuid.Nil,
 		hash:      hash,
 		path:      path,
 		name:      name,
@@ -79,6 +82,7 @@ func New(
 
 func NewWithID(
 	id uint,
+	tenantID uuid.UUID,
 	hash, path, name string,
 	size int,
 	mimetype *mimetype.MIME,
@@ -87,6 +91,7 @@ func NewWithID(
 ) Upload {
 	return &upload{
 		id:        id,
+		tenantID:  tenantID,
 		hash:      hash,
 		path:      path,
 		name:      name,
@@ -100,6 +105,7 @@ func NewWithID(
 
 type upload struct {
 	id        uint
+	tenantID  uuid.UUID
 	hash      string
 	path      string
 	name      string
@@ -114,6 +120,10 @@ func (u *upload) ID() uint {
 	return u.id
 }
 
+func (u *upload) TenantID() uuid.UUID {
+	return u.tenantID
+}
+
 func (u *upload) Type() UploadType {
 	return u._type
 }
diff --git a/modules/core/handlers/tab_handler.go b/modules/core/handlers/tab_handler.go
index 7b6f556bc..1ac9035c1 100644
--- a/modules/core/handlers/tab_handler.go
+++ b/modules/core/handlers/tab_handler.go
@@ -50,19 +50,19 @@ func (h *TabHandler) createUserTabs(ctx context.Context, user user.User) {
 	items := h.app.NavItems(i18n.NewLocalizer(h.app.Bundle(), string(user.UILanguage())))
 	hrefs := h.getAccessibleNavItems(items, user)
 
-	tabs := make([]*tab.CreateDTO, 0, len(hrefs))
+	tabs := make([]*tab.Tab, 0, len(hrefs))
 	for i, href := range hrefs {
-		tabs = append(tabs, &tab.CreateDTO{
+		tabs = append(tabs, &tab.Tab{
 			UserID:   user.ID(),
 			Href:     href,
 			Position: uint(i),
+			TenantID: user.TenantID(),
 		})
 	}
 
 	if len(tabs) > 0 {
 		ctxWithUser := context.WithValue(ctx, constants.UserKey, user)
-		_, err := h.service.CreateManyUserTabs(ctxWithUser, user.ID(), tabs)
-		if err != nil {
+		if err := h.service.CreateManyUserTabs(ctxWithUser, user.ID(), tabs); err != nil {
 			h.logger.Errorf("Failed to create tabs for user %d: %v", user.ID(), err)
 			return
 		}
diff --git a/modules/core/infrastructure/persistence/authlog_repository.go b/modules/core/infrastructure/persistence/authlog_repository.go
index 378082728..473cab8c9 100644
--- a/modules/core/infrastructure/persistence/authlog_repository.go
+++ b/modules/core/infrastructure/persistence/authlog_repository.go
@@ -39,8 +39,14 @@ func (g *GormAuthLogRepository) GetPaginated(
 		where, args = append(where, fmt.Sprintf("user_id = $%d", len(args)+1)), append(args, params.UserID)
 	}
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+	where, args = append(where, fmt.Sprintf("tenant_id = $%d", len(args)+1)), append(args, tenant.ID)
+
 	rows, err := pool.Query(ctx, `
-		SELECT id, user_id, ip, user_agent, created_at
+		SELECT id, user_id, ip, user_agent, created_at, tenant_id
 		FROM authentication_logs
 		WHERE `+strings.Join(where, " AND ")+`
 		ORDER BY id DESC
@@ -60,6 +66,7 @@ func (g *GormAuthLogRepository) GetPaginated(
 			&log.IP,
 			&log.UserAgent,
 			&log.CreatedAt,
+			&log.TenantID,
 		); err != nil {
 			return nil, err
 		}
@@ -76,10 +83,16 @@ func (g *GormAuthLogRepository) Count(ctx context.Context) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, err
+	}
+
 	var count int64
 	if err := pool.QueryRow(ctx, `
-		SELECT COUNT(*) as count FROM authentication_logs
-	`).Scan(&count); err != nil {
+		SELECT COUNT(*) as count FROM authentication_logs WHERE tenant_id = $1
+	`, tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
@@ -109,10 +122,18 @@ func (g *GormAuthLogRepository) Create(ctx context.Context, data *authlog.Authen
 	if err != nil {
 		return err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return err
+	}
+
 	dbRow := toDBAuthenticationLog(data)
+	dbRow.TenantID = tenant.ID.String()
+
 	if err := tx.QueryRow(ctx, `
-		INSERT INTO authentication_logs (user_id, ip, user_agent) VALUES ($1, $2, $3)
-	`, dbRow.UserID, dbRow.IP, dbRow.UserAgent).Scan(&data.ID); err != nil {
+		INSERT INTO authentication_logs (user_id, ip, user_agent, tenant_id) VALUES ($1, $2, $3, $4)
+	`, dbRow.UserID, dbRow.IP, dbRow.UserAgent, dbRow.TenantID).Scan(&data.ID); err != nil {
 		return err
 	}
 	return nil
diff --git a/modules/core/infrastructure/persistence/core_mappers.go b/modules/core/infrastructure/persistence/core_mappers.go
index aa4e28cc9..3a38ace95 100644
--- a/modules/core/infrastructure/persistence/core_mappers.go
+++ b/modules/core/infrastructure/persistence/core_mappers.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/gabriel-vasile/mimetype"
+	"github.com/go-faster/errors"
 	"github.com/google/uuid"
 
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/group"
@@ -30,7 +31,11 @@ import (
 func ToDomainUser(dbUser *models.User, dbUpload *models.Upload, roles []role.Role, groupIDs []uuid.UUID, permissions []*permission.Permission) (user.User, error) {
 	var avatar upload.Upload
 	if dbUpload != nil {
-		avatar = ToDomainUpload(dbUpload)
+		var err error
+		avatar, err = ToDomainUpload(dbUpload)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	email, err := internet.NewEmail(dbUser.Email)
@@ -41,6 +46,7 @@ func ToDomainUser(dbUser *models.User, dbUpload *models.Upload, roles []role.Rol
 	options := []user.Option{
 		user.WithID(dbUser.ID),
 		user.WithType(user.Type(dbUser.Type)),
+		user.WithTenantID(uuid.MustParse(dbUser.TenantID)),
 		user.WithMiddleName(dbUser.MiddleName.String),
 		user.WithPassword(dbUser.Password.String),
 		user.WithRoles(roles),
@@ -93,6 +99,7 @@ func toDBUser(entity user.User) (*models.User, []*models.Role) {
 	return &models.User{
 		ID:         entity.ID(),
 		Type:       string(entity.Type()),
+		TenantID:   entity.TenantID().String(),
 		FirstName:  entity.FirstName(),
 		LastName:   entity.LastName(),
 		MiddleName: mapping.ValueToSQLNullString(entity.MiddleName()),
@@ -114,10 +121,16 @@ func toDomainRole(dbRole *models.Role, permissions []*models.Permission) (role.R
 	for i, p := range permissions {
 		dP, err := toDomainPermission(p)
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "failed to cast to domain permission")
 		}
 		domainPermissions[i] = dP
 	}
+
+	tenantID, err := uuid.Parse(dbRole.TenantID)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to parse uuid")
+	}
+
 	options := []role.Option{
 		role.WithID(dbRole.ID),
 		role.WithType(role.Type(dbRole.Type)),
@@ -125,6 +138,7 @@ func toDomainRole(dbRole *models.Role, permissions []*models.Permission) (role.R
 		role.WithPermissions(domainPermissions),
 		role.WithCreatedAt(dbRole.CreatedAt),
 		role.WithUpdatedAt(dbRole.UpdatedAt),
+		role.WithTenantID(tenantID),
 	}
 	return role.New(dbRole.Name, options...), nil
 }
@@ -137,6 +151,7 @@ func toDBRole(entity role.Role) (*models.Role, []*models.Permission) {
 	return &models.Role{
 		ID:          entity.ID(),
 		Type:        string(entity.Type()),
+		TenantID:    entity.TenantID().String(),
 		Name:        entity.Name(),
 		Description: mapping.ValueToSQLNullString(entity.Description()),
 		CreatedAt:   entity.CreatedAt(),
@@ -147,6 +162,7 @@ func toDBRole(entity role.Role) (*models.Role, []*models.Permission) {
 func toDBPermission(entity *permission.Permission) *models.Permission {
 	return &models.Permission{
 		ID:       entity.ID.String(),
+		TenantID: entity.TenantID.String(),
 		Name:     entity.Name,
 		Resource: string(entity.Resource),
 		Action:   string(entity.Action),
@@ -159,8 +175,15 @@ func toDomainPermission(dbPermission *models.Permission) (*permission.Permission
 	if err != nil {
 		return nil, err
 	}
+
+	tenantID, err := uuid.Parse(dbPermission.TenantID)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to parse uuid")
+	}
+
 	return &permission.Permission{
 		ID:       id,
+		TenantID: tenantID,
 		Name:     dbPermission.Name,
 		Resource: permission.Resource(dbPermission.Resource),
 		Action:   permission.Action(dbPermission.Action),
@@ -185,6 +208,7 @@ func ToDomainTin(s sql.NullString, c country.Country) (tax.Tin, error) {
 func ToDBUpload(upload upload.Upload) *models.Upload {
 	return &models.Upload{
 		ID:        upload.ID(),
+		TenantID:  upload.TenantID().String(),
 		Path:      upload.Path(),
 		Hash:      upload.Hash(),
 		Name:      upload.Name(),
@@ -196,13 +220,20 @@ func ToDBUpload(upload upload.Upload) *models.Upload {
 	}
 }
 
-func ToDomainUpload(dbUpload *models.Upload) upload.Upload {
+func ToDomainUpload(dbUpload *models.Upload) (upload.Upload, error) {
 	var mime *mimetype.MIME
 	if dbUpload.Mimetype != "" {
 		mime = mimetype.Lookup(dbUpload.Mimetype)
 	}
+
+	tenantID, err := uuid.Parse(dbUpload.TenantID)
+	if err != nil {
+		return nil, err
+	}
+
 	return upload.NewWithID(
 		dbUpload.ID,
+		tenantID,
 		dbUpload.Hash,
 		dbUpload.Path,
 		dbUpload.Name,
@@ -211,7 +242,7 @@ func ToDomainUpload(dbUpload *models.Upload) upload.Upload {
 		upload.UploadType(dbUpload.Type),
 		dbUpload.CreatedAt,
 		dbUpload.UpdatedAt,
-	)
+	), nil
 }
 
 func ToDBCurrency(entity *currency.Currency) *models.Currency {
@@ -246,21 +277,29 @@ func ToDBTab(tab *tab.Tab) *models.Tab {
 		Href:     tab.Href,
 		Position: tab.Position,
 		UserID:   tab.UserID,
+		TenantID: tab.TenantID.String(),
 	}
 }
 
 func ToDomainTab(dbTab *models.Tab) (*tab.Tab, error) {
+	tenantID, err := uuid.Parse(dbTab.TenantID)
+	if err != nil {
+		return nil, err
+	}
+
 	return &tab.Tab{
 		ID:       dbTab.ID,
 		Href:     dbTab.Href,
 		Position: dbTab.Position,
 		UserID:   dbTab.UserID,
+		TenantID: tenantID,
 	}, nil
 }
 
-func toDBSession(session *session.Session) *models.Session {
+func ToDBSession(session *session.Session) *models.Session {
 	return &models.Session{
 		UserID:    session.UserID,
+		TenantID:  session.TenantID.String(),
 		Token:     session.Token,
 		IP:        session.IP,
 		UserAgent: session.UserAgent,
@@ -269,9 +308,15 @@ func toDBSession(session *session.Session) *models.Session {
 	}
 }
 
-func toDomainSession(dbSession *models.Session) *session.Session {
+func ToDomainSession(dbSession *models.Session) *session.Session {
+	tenantID, err := uuid.Parse(dbSession.TenantID)
+	if err != nil {
+		tenantID = uuid.Nil
+	}
+
 	return &session.Session{
 		UserID:    dbSession.UserID,
+		TenantID:  tenantID,
 		Token:     dbSession.Token,
 		IP:        dbSession.IP,
 		UserAgent: dbSession.UserAgent,
@@ -283,6 +328,7 @@ func toDomainSession(dbSession *models.Session) *session.Session {
 func toDBAuthenticationLog(log *authlog.AuthenticationLog) *models.AuthenticationLog {
 	return &models.AuthenticationLog{
 		ID:        log.ID,
+		TenantID:  log.TenantID.String(),
 		UserID:    log.UserID,
 		IP:        log.IP,
 		UserAgent: log.UserAgent,
@@ -291,8 +337,14 @@ func toDBAuthenticationLog(log *authlog.AuthenticationLog) *models.Authenticatio
 }
 
 func toDomainAuthenticationLog(dbLog *models.AuthenticationLog) *authlog.AuthenticationLog {
+	tenantID, err := uuid.Parse(dbLog.TenantID)
+	if err != nil {
+		tenantID = uuid.Nil
+	}
+
 	return &authlog.AuthenticationLog{
 		ID:        dbLog.ID,
+		TenantID:  tenantID,
 		UserID:    dbLog.UserID,
 		IP:        dbLog.IP,
 		UserAgent: dbLog.UserAgent,
@@ -306,8 +358,15 @@ func ToDomainPassport(dbPassport *models.Passport) (passport.Passport, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	tenantID, err := uuid.Parse(dbPassport.TenantID)
+	if err != nil {
+		return nil, err
+	}
+
 	opts := []passport.Option{
 		passport.WithID(id),
+		passport.WithTenantID(tenantID),
 	}
 
 	if dbPassport.FirstName.Valid || dbPassport.LastName.Valid || dbPassport.MiddleName.Valid {
@@ -416,6 +475,7 @@ func ToDBPassport(passportEntity passport.Passport) (*models.Passport, error) {
 
 	return &models.Passport{
 		ID:                  passportEntity.ID().String(),
+		TenantID:            passportEntity.TenantID().String(),
 		FirstName:           mapping.ValueToSQLNullString(passportEntity.FirstName()),
 		LastName:            mapping.ValueToSQLNullString(passportEntity.LastName()),
 		MiddleName:          mapping.ValueToSQLNullString(passportEntity.MiddleName()),
@@ -445,9 +505,15 @@ func ToDomainGroup(dbGroup *models.Group, users []user.User, roles []role.Role)
 		return nil, err
 	}
 
+	tenantID, err := uuid.Parse(dbGroup.TenantID)
+	if err != nil {
+		return nil, err
+	}
+
 	opts := []group.Option{
 		group.WithID(groupID),
 		group.WithType(group.Type(dbGroup.Type)),
+		group.WithTenantID(tenantID),
 		group.WithDescription(dbGroup.Description.String),
 		group.WithUsers(users),
 		group.WithRoles(roles),
@@ -462,6 +528,7 @@ func ToDBGroup(g group.Group) *models.Group {
 	return &models.Group{
 		ID:          g.ID().String(),
 		Type:        string(g.Type()),
+		TenantID:    g.TenantID().String(),
 		Name:        g.Name(),
 		Description: mapping.ValueToSQLNullString(g.Description()),
 		CreatedAt:   g.CreatedAt(),
diff --git a/modules/core/infrastructure/persistence/group_repository.go b/modules/core/infrastructure/persistence/group_repository.go
index 42d00301e..984c0b174 100644
--- a/modules/core/infrastructure/persistence/group_repository.go
+++ b/modules/core/infrastructure/persistence/group_repository.go
@@ -26,7 +26,8 @@ const (
 			g.name,
 			g.description,
 			g.created_at,
-			g.updated_at
+			g.updated_at,
+			g.tenant_id
 		FROM user_groups g`
 
 	groupCountQuery = `SELECT COUNT(DISTINCT g.id) FROM user_groups g`
@@ -51,6 +52,7 @@ func NewGroupRepository(userRepo user.Repository, roleRepo role.Repository) grou
 		fieldMap: map[group.Field]string{
 			group.CreatedAtField: "g.created_at",
 			group.UpdatedAtField: "g.updated_at",
+			group.TenantIDField:  "g.tenant_id",
 		},
 	}
 }
@@ -126,7 +128,8 @@ func (g *PgGroupRepository) Count(ctx context.Context, params *group.FindParams)
 }
 
 func (g *PgGroupRepository) GetByID(ctx context.Context, id uuid.UUID) (group.Group, error) {
-	groups, err := g.queryGroups(ctx, groupFindQuery+" WHERE g.id = $1", id.String())
+	q := repo.Join(groupFindQuery, "WHERE g.id = $1")
+	groups, err := g.queryGroups(ctx, q, id.String())
 	if err != nil {
 		return nil, errors.Wrap(err, fmt.Sprintf("failed to query group with id: %s", id.String()))
 	}
@@ -143,7 +146,11 @@ func (g *PgGroupRepository) Exists(ctx context.Context, id uuid.UUID) (bool, err
 	}
 
 	var exists bool
-	err = tx.QueryRow(ctx, "SELECT EXISTS(SELECT 1 FROM user_groups WHERE id = $1)", id.String()).Scan(&exists)
+	err = tx.QueryRow(
+		ctx,
+		"SELECT EXISTS(SELECT 1 FROM user_groups WHERE id = $1)",
+		id.String(),
+	).Scan(&exists)
 	if err != nil {
 		return false, errors.Wrap(err, "failed to check if group exists")
 	}
@@ -182,6 +189,7 @@ func (g *PgGroupRepository) create(ctx context.Context, entity group.Group) (gro
 	fields := []string{
 		"id",
 		"type",
+		"tenant_id",
 		"name",
 		"description",
 		"created_at",
@@ -191,6 +199,7 @@ func (g *PgGroupRepository) create(ctx context.Context, entity group.Group) (gro
 	values := []interface{}{
 		dbGroup.ID,
 		dbGroup.Type,
+		dbGroup.TenantID,
 		dbGroup.Name,
 		dbGroup.Description,
 		dbGroup.CreatedAt,
@@ -303,6 +312,7 @@ func (g *PgGroupRepository) queryGroups(ctx context.Context, query string, args
 			&dbGroup.Description,
 			&dbGroup.CreatedAt,
 			&dbGroup.UpdatedAt,
+			&dbGroup.TenantID,
 		); err != nil {
 			return nil, errors.Wrap(err, "failed to scan group row")
 		}
diff --git a/modules/core/infrastructure/persistence/group_repository_test.go b/modules/core/infrastructure/persistence/group_repository_test.go
index 2aa349483..141c266e6 100644
--- a/modules/core/infrastructure/persistence/group_repository_test.go
+++ b/modules/core/infrastructure/persistence/group_repository_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
 	"github.com/iota-uz/iota-sdk/modules/core/infrastructure/persistence"
 	permissions "github.com/iota-uz/iota-sdk/modules/core/permissions"
+	"github.com/iota-uz/iota-sdk/pkg/composables"
 	"github.com/iota-uz/iota-sdk/pkg/repo"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -32,6 +33,9 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 	err := permissionRepository.Save(f.ctx, permissions.UserRead)
 	require.NoError(t, err)
 
+	tenant, err := composables.UseTenant(f.ctx)
+	require.NoError(t, err)
+
 	// First role
 	roleData := role.New(
 		"test-role",
@@ -39,6 +43,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 		role.WithPermissions([]*permission.Permission{
 			permissions.UserRead,
 		}),
+		role.WithTenantID(tenant.ID),
 	)
 
 	roleEntity, err := roleRepository.Create(f.ctx, roleData)
@@ -51,6 +56,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 		role.WithPermissions([]*permission.Permission{
 			permissions.UserRead,
 		}),
+		role.WithTenantID(tenant.ID),
 	)
 
 	secondRoleEntity, err := roleRepository.Create(f.ctx, secondRoleData)
@@ -65,7 +71,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 		"Doe",
 		email,
 		user.UILanguageEN,
-		user.WithMiddleName(""),
+		user.WithTenantID(tenant.ID),
 	)
 
 	createdUser, err := userRepository.Create(f.ctx, userEntity)
@@ -79,7 +85,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 		"Smith",
 		secondEmail,
 		user.UILanguageEN,
-		user.WithMiddleName(""),
+		user.WithTenantID(tenant.ID),
 	)
 
 	secondCreatedUser, err := userRepository.Create(f.ctx, secondUserEntity)
@@ -95,6 +101,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 			group.WithDescription("Test group description"),
 			group.WithUsers([]user.User{createdUser}),
 			group.WithRoles([]role.Role{roleEntity}),
+			group.WithTenantID(tenant.ID),
 		)
 
 		// Save the group
@@ -130,6 +137,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 			group.WithDescription("Second group description"),
 			group.WithUsers([]user.User{secondCreatedUser}),
 			group.WithRoles([]role.Role{secondRoleEntity}),
+			group.WithTenantID(tenant.ID),
 		)
 
 		secondSavedGroup, err := groupRepository.Save(f.ctx, secondGroupEntity)
@@ -151,6 +159,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 			group.WithDescription("Group for GetByID test"),
 			group.WithUsers([]user.User{createdUser}),
 			group.WithRoles([]role.Role{roleEntity}),
+			group.WithTenantID(tenant.ID),
 		)
 
 		savedGroup, err := groupRepository.Save(f.ctx, groupEntity)
@@ -183,6 +192,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 			group.WithDescription("Group for update test"),
 			group.WithUsers([]user.User{createdUser}),
 			group.WithRoles([]role.Role{roleEntity}),
+			group.WithTenantID(tenant.ID),
 		)
 
 		savedGroup, err := groupRepository.Save(f.ctx, groupEntity)
@@ -242,6 +252,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 			group.WithDescription("Group for removal test"),
 			group.WithUsers([]user.User{createdUser, secondCreatedUser}),
 			group.WithRoles([]role.Role{roleEntity, secondRoleEntity}),
+			group.WithTenantID(tenant.ID),
 		)
 
 		savedGroup, err := groupRepository.Save(f.ctx, groupEntity)
@@ -330,6 +341,7 @@ func TestPgGroupRepository_CRUD(t *testing.T) {
 			group.WithCreatedAt(pastTime.Add(-24*time.Hour)), // 2 days ago
 			group.WithUsers([]user.User{createdUser}),
 			group.WithRoles([]role.Role{roleEntity}),
+			group.WithTenantID(tenant.ID),
 		)
 
 		_, err := groupRepository.Save(f.ctx, customTimeGroupEntity)
diff --git a/modules/core/infrastructure/persistence/models/models.go b/modules/core/infrastructure/persistence/models/models.go
index 4e974a1bd..04673e8a3 100644
--- a/modules/core/infrastructure/persistence/models/models.go
+++ b/modules/core/infrastructure/persistence/models/models.go
@@ -5,8 +5,18 @@ import (
 	"time"
 )
 
+type Tenant struct {
+	ID        string
+	Name      string
+	Domain    sql.NullString
+	IsActive  bool
+	CreatedAt time.Time
+	UpdatedAt time.Time
+}
+
 type Upload struct {
 	ID        uint
+	TenantID  string
 	Hash      string
 	Path      string
 	Name      string
@@ -27,6 +37,7 @@ type Currency struct {
 
 type Company struct {
 	ID        uint
+	TenantID  string
 	Name      string
 	About     string
 	Address   string
@@ -39,6 +50,7 @@ type Company struct {
 
 type Permission struct {
 	ID          string
+	TenantID    string
 	Name        string
 	Resource    string
 	Action      string
@@ -54,6 +66,7 @@ type RolePermission struct {
 type Role struct {
 	ID          uint
 	Type        string
+	TenantID    string
 	Name        string
 	Description sql.NullString
 	CreatedAt   time.Time
@@ -62,6 +75,7 @@ type Role struct {
 
 type User struct {
 	ID         uint
+	TenantID   string // UUID stored as string
 	Type       string
 	FirstName  string
 	LastName   string
@@ -97,6 +111,7 @@ type UploadedImage struct {
 
 type Session struct {
 	Token     string
+	TenantID  string // UUID stored as string
 	UserID    uint
 	ExpiresAt time.Time
 	IP        string
@@ -106,6 +121,7 @@ type Session struct {
 
 type AuthenticationLog struct {
 	ID        uint
+	TenantID  string // UUID stored as string
 	UserID    uint
 	IP        string
 	UserAgent string
@@ -114,6 +130,7 @@ type AuthenticationLog struct {
 
 type Tab struct {
 	ID       uint
+	TenantID string
 	Href     string
 	Position uint
 	UserID   uint
@@ -121,6 +138,7 @@ type Tab struct {
 
 type Passport struct {
 	ID                  string
+	TenantID            string
 	FirstName           sql.NullString
 	LastName            sql.NullString
 	MiddleName          sql.NullString
@@ -146,6 +164,7 @@ type Passport struct {
 type Group struct {
 	ID          string
 	Type        string
+	TenantID    string
 	Name        string
 	Description sql.NullString
 	CreatedAt   time.Time
diff --git a/modules/core/infrastructure/persistence/passport_repository.go b/modules/core/infrastructure/persistence/passport_repository.go
index 7c3506b85..d3f79159f 100644
--- a/modules/core/infrastructure/persistence/passport_repository.go
+++ b/modules/core/infrastructure/persistence/passport_repository.go
@@ -18,7 +18,7 @@ var (
 
 const (
 	selectPassportQuery = `
-		SELECT 
+		SELECT
 			id,
 			first_name,
 			last_name,
@@ -39,7 +39,8 @@ const (
 			signature_image,
 			remarks,
 			created_at,
-			updated_at
+			updated_at,
+			tenant_id
 		FROM passports
 	`
 	insertPassportQuery = `
@@ -62,19 +63,20 @@ const (
 			machine_readable_zone,
 			biometric_data,
 			signature_image,
-			remarks
-		) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19) 
-		ON CONFLICT (passport_number, series) DO UPDATE SET
+			remarks,
+			tenant_id
+		) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)
+		ON CONFLICT (tenant_id, passport_number, series) DO UPDATE SET
 			first_name = COALESCE(NULLIF(EXCLUDED.first_name, ''), passports.first_name),
 			last_name = COALESCE(NULLIF(EXCLUDED.last_name, ''), passports.last_name),
 			middle_name = COALESCE(NULLIF(EXCLUDED.middle_name, ''), passports.middle_name)
 		RETURNING id
 	`
 	updatePassportQuery = `
-		UPDATE passports 
+		UPDATE passports
 		SET first_name = $1,
-			last_name = $2, 
-			middle_name = $3, 
+			last_name = $2,
+			middle_name = $3,
 			gender = $4,
 			birth_date = $5,
 			birth_place = $6,
@@ -140,6 +142,7 @@ func (r *PassportRepository) queryPassports(ctx context.Context, query string, a
 			&p.Remarks,
 			&p.CreatedAt,
 			&p.UpdatedAt,
+			&p.TenantID,
 		); err != nil {
 			return nil, err
 		}
@@ -169,8 +172,14 @@ func (r *PassportRepository) exists(ctx context.Context, id string) (bool, error
 		return false, err
 	}
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return false, err
+	}
+
 	var exists bool
-	err = pool.QueryRow(ctx, "SELECT EXISTS(SELECT 1 FROM passports WHERE id = $1)", id).Scan(&exists)
+	err = pool.QueryRow(ctx, "SELECT EXISTS(SELECT 1 FROM passports WHERE id = $1 AND tenant_id = $2)",
+		id, tenant.ID.String()).Scan(&exists)
 	if err != nil {
 		return false, err
 	}
@@ -198,11 +207,18 @@ func (r *PassportRepository) Create(ctx context.Context, data passport.Passport)
 		return nil, err
 	}
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	dbRow, err := ToDBPassport(data)
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert passport to db model: %w", err)
 	}
 
+	dbRow.TenantID = tenant.ID.String()
+
 	var id string
 	err = pool.QueryRow(
 		ctx,
@@ -226,6 +242,7 @@ func (r *PassportRepository) Create(ctx context.Context, data passport.Passport)
 		dbRow.BiometricData,
 		dbRow.SignatureImage,
 		dbRow.Remarks,
+		dbRow.TenantID,
 	).Scan(&id)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create passport: %w", err)
@@ -235,7 +252,13 @@ func (r *PassportRepository) Create(ctx context.Context, data passport.Passport)
 }
 
 func (r *PassportRepository) GetByID(ctx context.Context, id uuid.UUID) (passport.Passport, error) {
-	passports, err := r.queryPassports(ctx, selectPassportQuery+" WHERE id = $1", id.String())
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	passports, err := r.queryPassports(ctx, selectPassportQuery+" WHERE id = $1 AND tenant_id = $2",
+		id.String(), tenant.ID.String())
 	if err != nil {
 		return nil, err
 	}
@@ -246,7 +269,13 @@ func (r *PassportRepository) GetByID(ctx context.Context, id uuid.UUID) (passpor
 }
 
 func (r *PassportRepository) GetByPassportNumber(ctx context.Context, series, number string) (passport.Passport, error) {
-	passports, err := r.queryPassports(ctx, selectPassportQuery+" WHERE series = $1 AND passport_number = $2", series, number)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	passports, err := r.queryPassports(ctx, selectPassportQuery+" WHERE series = $1 AND passport_number = $2 AND tenant_id = $3",
+		series, number, tenant.ID.String())
 	if err != nil {
 		return nil, err
 	}
@@ -262,6 +291,11 @@ func (r *PassportRepository) Update(ctx context.Context, id uuid.UUID, data pass
 		return nil, err
 	}
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	dbRow, err := ToDBPassport(data)
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert passport to db model: %w", err)
@@ -269,7 +303,7 @@ func (r *PassportRepository) Update(ctx context.Context, id uuid.UUID, data pass
 
 	_, err = pool.Exec(
 		ctx,
-		updatePassportQuery,
+		updatePassportQuery+" AND tenant_id = $21",
 		dbRow.FirstName,
 		dbRow.LastName,
 		dbRow.MiddleName,
@@ -290,6 +324,7 @@ func (r *PassportRepository) Update(ctx context.Context, id uuid.UUID, data pass
 		dbRow.Remarks,
 		time.Now(),
 		id.String(),
+		tenant.ID.String(),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to update passport: %w", err)
@@ -304,7 +339,12 @@ func (r *PassportRepository) Delete(ctx context.Context, id uuid.UUID) error {
 		return err
 	}
 
-	_, err = pool.Exec(ctx, deletePassportQuery, id.String())
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return err
+	}
+
+	_, err = pool.Exec(ctx, deletePassportQuery+" AND tenant_id = $2", id.String(), tenant.ID.String())
 	if err != nil {
 		return fmt.Errorf("failed to delete passport: %w", err)
 	}
diff --git a/modules/core/infrastructure/persistence/permission_repository.go b/modules/core/infrastructure/persistence/permission_repository.go
index 62afff3e5..7274a092d 100644
--- a/modules/core/infrastructure/persistence/permission_repository.go
+++ b/modules/core/infrastructure/persistence/permission_repository.go
@@ -18,12 +18,12 @@ var (
 )
 
 const (
-	permissionsSelectQuery = `SELECT id, name, resource, action, modifier, description FROM permissions`
+	permissionsSelectQuery = `SELECT id, name, resource, action, modifier, description, tenant_id FROM permissions`
 	permissionsCountQuery  = `SELECT COUNT(*) FROM permissions`
 	permissionsInsertQuery = `
-		INSERT INTO permissions (id, name, resource, action, modifier, description)
-		VALUES ($1, $2, $3, $4, $5, $6)
-		ON CONFLICT (name) DO UPDATE SET resource = permissions.resource
+		INSERT INTO permissions (id, name, resource, action, modifier, description, tenant_id)
+		VALUES ($1, $2, $3, $4, $5, $6, $7)
+		ON CONFLICT (tenant_id, name) DO UPDATE SET resource = permissions.resource
 		RETURNING id`
 	permissionsUpdateQuery = `
 		UPDATE permissions
@@ -50,17 +50,26 @@ func NewPermissionRepository() permission.Repository {
 func (g *PgPermissionRepository) GetPaginated(
 	ctx context.Context, params *permission.FindParams,
 ) ([]*permission.Permission, error) {
-	joins, args := []string{}, []interface{}{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where := []string{"permissions.tenant_id = $1"}
+	joins, args := []string{}, []interface{}{tenant.ID}
+
 	if params.RoleID != 0 {
 		joins = append(joins, fmt.Sprintf("INNER JOIN role_permissions rp ON rp.permission_id = permissions.id and rp.role_id = $%d", len(args)+1))
 		args = append(args, params.RoleID)
 	}
+
 	return g.queryPermissions(
 		ctx,
 		repo.Join(
 			permissionsSelectQuery,
 			repo.Join(joins...),
 			params.SortBy.ToSQL(g.fieldMap),
+			repo.JoinWhere(where...),
 			repo.FormatLimitOffset(params.Limit, params.Offset),
 		),
 		args...,
@@ -72,10 +81,17 @@ func (g *PgPermissionRepository) Count(ctx context.Context) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	var count int64
 	if err := pool.QueryRow(
 		ctx,
-		permissionsCountQuery,
+		permissionsCountQuery+" WHERE tenant_id = $1",
+		tenant.ID,
 	).Scan(&count); err != nil {
 		return 0, err
 	}
@@ -83,11 +99,21 @@ func (g *PgPermissionRepository) Count(ctx context.Context) (int64, error) {
 }
 
 func (g *PgPermissionRepository) GetAll(ctx context.Context) ([]*permission.Permission, error) {
-	return g.queryPermissions(ctx, permissionsSelectQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	return g.queryPermissions(ctx, permissionsSelectQuery+" WHERE tenant_id = $1", tenant.ID)
 }
 
 func (g *PgPermissionRepository) GetByID(ctx context.Context, id string) (*permission.Permission, error) {
-	permissions, err := g.queryPermissions(ctx, permissionsSelectQuery+" WHERE id = $1", id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	permissions, err := g.queryPermissions(ctx, permissionsSelectQuery+" WHERE id = $1 AND tenant_id = $2", id, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -102,7 +128,15 @@ func (g *PgPermissionRepository) Save(ctx context.Context, data *permission.Perm
 	if err != nil {
 		return err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	dbPerm := toDBPermission(data)
+	dbPerm.TenantID = tenant.ID.String()
+
 	if err := tx.QueryRow(
 		ctx,
 		permissionsInsertQuery,
@@ -112,6 +146,7 @@ func (g *PgPermissionRepository) Save(ctx context.Context, data *permission.Perm
 		dbPerm.Action,
 		dbPerm.Modifier,
 		dbPerm.Description,
+		dbPerm.TenantID,
 	).Scan(&data.ID); err != nil {
 		return err
 	}
@@ -122,7 +157,13 @@ func (g *PgPermissionRepository) Delete(ctx context.Context, id string) error {
 	if err := uuid.Validate(id); err != nil {
 		return err
 	}
-	return g.execQuery(ctx, permissionsDeleteQuery, id)
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	return g.execQuery(ctx, permissionsDeleteQuery+" AND tenant_id = $2", id, tenant.ID)
 }
 
 func (g *PgPermissionRepository) queryPermissions(
@@ -153,6 +194,7 @@ func (g *PgPermissionRepository) queryPermissions(
 			&p.Action,
 			&p.Modifier,
 			&p.Description,
+			&p.TenantID,
 		); err != nil {
 			return nil, err
 		}
diff --git a/modules/core/infrastructure/persistence/role_repository.go b/modules/core/infrastructure/persistence/role_repository.go
index ba03bbbe4..aa3faf6a2 100644
--- a/modules/core/infrastructure/persistence/role_repository.go
+++ b/modules/core/infrastructure/persistence/role_repository.go
@@ -23,27 +23,29 @@ const (
 			r.name,
 			r.description,
 			r.created_at,
-			r.updated_at
+			r.updated_at,
+			r.tenant_id
 		FROM roles r`
 	rolePermissionsQuery = `
 		SELECT
 			p.id,
+			p.tenant_id,
 			p.name,
 			p.resource,
 			p.action,
 			p.modifier,
 			p.description,
 			rp.role_id
-		FROM permissions p LEFT JOIN role_permissions rp ON rp.permission_id = p.id WHERE rp.role_id = ANY($1)`
-	roleCountQuery             = `SELECT COUNT(DISTINCT roles.id) FROM roles`
-	roleInsertQuery            = `INSERT INTO roles (type, name, description) VALUES ($1, $2, $3) RETURNING id`
-	roleUpdateQuery            = `UPDATE roles SET name = $1, description = $2, updated_at = $3	WHERE id = $4`
+		FROM permissions p LEFT JOIN role_permissions rp ON rp.permission_id = p.id WHERE rp.role_id = ANY($1) AND p.tenant_id = $2`
+	roleCountQuery             = `SELECT COUNT(DISTINCT roles.id) FROM roles WHERE tenant_id = $1`
+	roleInsertQuery            = `INSERT INTO roles (type, name, description, tenant_id) VALUES ($1, $2, $3, $4) RETURNING id`
+	roleUpdateQuery            = `UPDATE roles SET name = $1, description = $2, updated_at = $3	WHERE id = $4 AND tenant_id = $5`
 	roleDeletePermissionsQuery = `DELETE FROM role_permissions WHERE role_id = $1`
 	roleInsertPermissionQuery  = `
 		INSERT INTO role_permissions (role_id, permission_id)
 		VALUES ($1, $2)
 		ON CONFLICT (role_id, permission_id) DO NOTHING`
-	roleDeleteQuery = `DELETE FROM roles WHERE id = $1`
+	roleDeleteQuery = `DELETE FROM roles WHERE id = $1 AND tenant_id = $2`
 )
 
 type GormRoleRepository struct {
@@ -57,6 +59,7 @@ func NewRoleRepository() role.Repository {
 			role.DescriptionField:  "r.description",
 			role.CreatedAtField:    "r.created_at",
 			role.PermissionIDField: "rp.permission_id",
+			role.TenantIDField:     "r.tenant_id",
 		},
 	}
 }
@@ -158,14 +161,25 @@ func (g *GormRoleRepository) Count(ctx context.Context, params *role.FindParams)
 }
 
 func (g *GormRoleRepository) GetAll(ctx context.Context) ([]role.Role, error) {
-	return g.queryRoles(ctx, roleFindQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	query := roleFindQuery + " WHERE r.tenant_id = $1"
+	return g.queryRoles(ctx, query, tenant.ID)
 }
 
 func (g *GormRoleRepository) GetByID(ctx context.Context, id uint) (role.Role, error) {
-	query := roleFindQuery + " WHERE r.id = $1"
-	roles, err := g.queryRoles(ctx, query, id)
+	tenant, err := composables.UseTenant(ctx)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	query := roleFindQuery + " WHERE r.id = $1 AND r.tenant_id = $2"
+	roles, err := g.queryRoles(ctx, query, id, tenant.ID.String())
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to query roles")
 	}
 	if len(roles) == 0 {
 		return nil, ErrRoleNotFound
@@ -176,10 +190,17 @@ func (g *GormRoleRepository) GetByID(ctx context.Context, id uint) (role.Role, e
 func (g *GormRoleRepository) Create(ctx context.Context, data role.Role) (role.Role, error) {
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "failed to get tx from ctx")
+	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
 	}
 
 	entity, permissions := toDBRole(data)
+	entity.TenantID = tenant.ID.String()
+
 	var id uint
 	if err := tx.QueryRow(
 		ctx,
@@ -187,8 +208,9 @@ func (g *GormRoleRepository) Create(ctx context.Context, data role.Role) (role.R
 		entity.Type,
 		entity.Name,
 		entity.Description,
+		entity.TenantID,
 	).Scan(&id); err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "failed to insert role")
 	}
 
 	for _, permission := range permissions {
@@ -205,6 +227,13 @@ func (g *GormRoleRepository) Create(ctx context.Context, data role.Role) (role.R
 func (g *GormRoleRepository) Update(ctx context.Context, data role.Role) (role.Role, error) {
 	dbRole, dbPermissions := toDBRole(data)
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	dbRole.TenantID = tenant.ID.String()
+
 	if err := g.execQuery(
 		ctx,
 		roleUpdateQuery,
@@ -212,6 +241,7 @@ func (g *GormRoleRepository) Update(ctx context.Context, data role.Role) (role.R
 		dbRole.Description,
 		dbRole.UpdatedAt,
 		dbRole.ID,
+		dbRole.TenantID,
 	); err != nil {
 		return nil, err
 	}
@@ -232,10 +262,15 @@ func (g *GormRoleRepository) Update(ctx context.Context, data role.Role) (role.R
 }
 
 func (g *GormRoleRepository) Delete(ctx context.Context, id uint) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	if err := g.execQuery(ctx, roleDeletePermissionsQuery, id); err != nil {
 		return err
 	}
-	return g.execQuery(ctx, roleDeleteQuery, id)
+	return g.execQuery(ctx, roleDeleteQuery, id, tenant.ID)
 }
 
 func (g *GormRoleRepository) queryPermissions(ctx context.Context, roleIDs []uint) (map[uint][]*models.Permission, error) {
@@ -244,7 +279,12 @@ func (g *GormRoleRepository) queryPermissions(ctx context.Context, roleIDs []uin
 		return nil, err
 	}
 
-	rows, err := tx.Query(ctx, rolePermissionsQuery, roleIDs)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	rows, err := tx.Query(ctx, rolePermissionsQuery, roleIDs, tenant.ID.String())
 	if err != nil {
 		return nil, err
 	}
@@ -256,6 +296,7 @@ func (g *GormRoleRepository) queryPermissions(ctx context.Context, roleIDs []uin
 		var p models.Permission
 		if err := rows.Scan(
 			&p.ID,
+			&p.TenantID,
 			&p.Name,
 			&p.Resource,
 			&p.Action,
@@ -297,6 +338,7 @@ func (g *GormRoleRepository) queryRoles(ctx context.Context, query string, args
 			&r.Description,
 			&r.CreatedAt,
 			&r.UpdatedAt,
+			&r.TenantID,
 		); err != nil {
 			return nil, err
 		}
@@ -319,7 +361,7 @@ func (g *GormRoleRepository) queryRoles(ctx context.Context, query string, args
 	for _, dbRole := range dbRoles {
 		entity, err := toDomainRole(dbRole, permissionsMap[dbRole.ID])
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "failed to cast to domain role")
 		}
 		roles = append(roles, entity)
 	}
diff --git a/modules/core/infrastructure/persistence/schema/core-schema.sql b/modules/core/infrastructure/persistence/schema/core-schema.sql
index 8bf3c449b..c3063c927 100644
--- a/modules/core/infrastructure/persistence/schema/core-schema.sql
+++ b/modules/core/infrastructure/persistence/schema/core-schema.sql
@@ -1,17 +1,29 @@
+CREATE TABLE tenants (
+    id uuid PRIMARY KEY DEFAULT gen_random_uuid (),
+    name varchar(255) NOT NULL UNIQUE,
+    domain varchar(255),
+    is_active boolean NOT NULL DEFAULT TRUE,
+    created_at timestamp with time zone DEFAULT now(),
+    updated_at timestamp with time zone DEFAULT now()
+);
+
 CREATE TABLE uploads (
     id serial PRIMARY KEY,
+    tenant_id uuid REFERENCES tenants (id) ON DELETE CASCADE,
     name varchar(255) NOT NULL, -- original file name
-    hash VARCHAR(255) NOT NULL UNIQUE, -- md5 hash of the file
+    hash VARCHAR(255) NOT NULL, -- md5 hash of the file
     path varchar(1024) NOT NULL DEFAULT '', -- relative path to the file
     size int NOT NULL DEFAULT 0, -- in bytes
     mimetype varchar(255) NOT NULL, -- image/jpeg, application/pdf, etc.
     type VARCHAR(255) NOT NULL, -- image, document, etc.
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, hash)
 );
 
 CREATE TABLE passports (
     id uuid PRIMARY KEY DEFAULT gen_random_uuid (),
+    tenant_id uuid REFERENCES tenants (id) ON DELETE CASCADE,
     first_name varchar(255),
     last_name varchar(255),
     middle_name varchar(255),
@@ -32,18 +44,20 @@ CREATE TABLE passports (
     remarks text, -- Additional notes (e.g., travel restrictions, visa endorsements).
     created_at timestamp with time zone DEFAULT now(),
     updated_at timestamp with time zone DEFAULT now(),
-    CONSTRAINT passports_passport_number_series_key UNIQUE (passport_number, series)
+    CONSTRAINT passports_tenant_passport_number_series_key UNIQUE (tenant_id, passport_number, series)
 );
 
 CREATE TABLE companies (
     id serial PRIMARY KEY,
+    tenant_id uuid REFERENCES tenants (id) ON DELETE CASCADE,
     name varchar(255) NOT NULL,
     about text,
     address varchar(255),
     phone varchar(255),
     logo_id int REFERENCES uploads (id) ON DELETE SET NULL,
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, name)
 );
 
 CREATE TABLE currencies (
@@ -58,27 +72,32 @@ CREATE TABLE roles (
     id serial PRIMARY KEY,
     type varchar(50) NOT NULL CHECK (type IN ('system', 'user')),
     name varchar(255) NOT NULL UNIQUE,
+    tenant_id uuid REFERENCES tenants (id) ON DELETE CASCADE,
     description text,
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, name)
 );
 
 CREATE TABLE users (
     id serial PRIMARY KEY,
+    tenant_id uuid REFERENCES tenants (id) ON DELETE CASCADE,
     type varchar(50) NOT NULL CHECK (type IN ('system', 'user')),
     first_name varchar(255) NOT NULL,
     last_name varchar(255) NOT NULL,
     middle_name varchar(255),
-    email varchar(255) NOT NULL UNIQUE,
+    email varchar(255) NOT NULL,
     password VARCHAR(255),
     ui_language varchar(3) NOT NULL,
-    phone varchar(255) UNIQUE,
+    phone varchar(255),
     avatar_id int REFERENCES uploads (id) ON DELETE SET NULL,
     last_login timestamp NULL,
     last_ip varchar(255) NULL,
     last_action timestamp with time zone NULL,
     created_at timestamp with time zone NOT NULL DEFAULT now(),
-    updated_at timestamp with time zone NOT NULL DEFAULT now()
+    updated_at timestamp with time zone NOT NULL DEFAULT now(),
+    UNIQUE (tenant_id, email),
+    UNIQUE (tenant_id, phone)
 );
 
 CREATE TABLE user_roles (
@@ -92,9 +111,11 @@ CREATE TABLE user_groups (
     id uuid PRIMARY KEY DEFAULT gen_random_uuid (),
     type varchar(50) NOT NULL CHECK (type IN ('system', 'user')),
     name varchar(255) UNIQUE NOT NULL,
+    tenant_id uuid REFERENCES tenants (id) ON DELETE CASCADE,
     description text,
     created_at timestamp DEFAULT now(),
-    updated_at timestamp DEFAULT now()
+    updated_at timestamp DEFAULT now(),
+    UNIQUE (tenant_id, name)
 );
 
 CREATE TABLE group_users (
@@ -124,11 +145,13 @@ CREATE TABLE uploaded_images (
 
 CREATE TABLE permissions (
     id uuid PRIMARY KEY DEFAULT gen_random_uuid () NOT NULL,
-    name varchar(255) NOT NULL UNIQUE,
+    tenant_id uuid REFERENCES tenants (id) ON DELETE CASCADE,
+    name varchar(255) NOT NULL,
     resource varchar(255) NOT NULL, -- roles, users, etc.
     action varchar(255) NOT NULL, -- create, read, update, delete
     modifier varchar(255) NOT NULL, -- all / own
-    description text
+    description text,
+    UNIQUE (tenant_id, name)
 );
 
 CREATE TABLE role_permissions (
@@ -145,6 +168,7 @@ CREATE TABLE user_permissions (
 
 CREATE TABLE sessions (
     token varchar(255) NOT NULL PRIMARY KEY,
+    tenant_id uuid REFERENCES tenants (id) ON DELETE CASCADE,
     user_id integer NOT NULL REFERENCES users (id) ON DELETE CASCADE,
     expires_at timestamp with time zone NOT NULL,
     ip varchar(255) NOT NULL,
@@ -154,16 +178,21 @@ CREATE TABLE sessions (
 
 CREATE TABLE tabs (
     id serial PRIMARY KEY,
+    tenant_id uuid REFERENCES tenants (id) ON DELETE CASCADE,
     href varchar(255) NOT NULL,
     user_id int NOT NULL REFERENCES users (id) ON DELETE CASCADE,
     position int NOT NULL DEFAULT 0,
-    UNIQUE (href, user_id)
+    UNIQUE (tenant_id, href, user_id)
 );
 
+CREATE INDEX users_tenant_id_idx ON users (tenant_id);
+
 CREATE INDEX users_first_name_idx ON users (first_name);
 
 CREATE INDEX users_last_name_idx ON users (last_name);
 
+CREATE INDEX sessions_tenant_id_idx ON sessions (tenant_id);
+
 CREATE INDEX sessions_user_id_idx ON sessions (user_id);
 
 CREATE INDEX sessions_expires_at_idx ON sessions (expires_at);
@@ -174,3 +203,13 @@ CREATE INDEX role_permissions_permission_id_idx ON role_permissions (permission_
 
 CREATE INDEX uploaded_images_upload_id_idx ON uploaded_images (upload_id);
 
+CREATE INDEX uploads_tenant_id_idx ON uploads (tenant_id);
+
+CREATE INDEX roles_tenant_id_idx ON roles (tenant_id);
+
+CREATE INDEX user_groups_tenant_id_idx ON user_groups (tenant_id);
+
+CREATE INDEX permissions_tenant_id_idx ON permissions (tenant_id);
+
+CREATE INDEX tabs_tenant_id_idx ON tabs (tenant_id);
+
diff --git a/modules/core/infrastructure/persistence/session_repository.go b/modules/core/infrastructure/persistence/session_repository.go
index 6d750d557..c2ca3a7bb 100644
--- a/modules/core/infrastructure/persistence/session_repository.go
+++ b/modules/core/infrastructure/persistence/session_repository.go
@@ -4,11 +4,13 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/go-faster/errors"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/session"
 	"github.com/iota-uz/iota-sdk/modules/core/infrastructure/persistence/models"
 	"github.com/iota-uz/iota-sdk/pkg/composables"
 	"github.com/iota-uz/iota-sdk/pkg/repo"
+	"github.com/iota-uz/psql-parser/util/uuid"
+
+	"github.com/go-faster/errors"
 )
 
 var (
@@ -16,7 +18,7 @@ var (
 )
 
 const (
-	selectSessionQuery = `SELECT token, user_id, expires_at, ip, user_agent, created_at FROM sessions`
+	selectSessionQuery = `SELECT token, user_id, expires_at, ip, user_agent, created_at, tenant_id FROM sessions`
 	countSessionQuery  = `SELECT COUNT(*) as count FROM sessions`
 	insertSessionQuery = `
         INSERT INTO sessions (
@@ -25,17 +27,18 @@ const (
             expires_at,
             ip,
             user_agent,
-            created_at
+            created_at,
+            tenant_id
         )
-        VALUES ($1, $2, $3, $4, $5, $6)`
+        VALUES ($1, $2, $3, $4, $5, $6, $7)`
 	updateSessionQuery = `
         UPDATE sessions
         SET expires_at = $1,
             ip = $2,
             user_agent = $3
-        WHERE token = $4`
+        WHERE token = $4 AND tenant_id = $5`
 	deleteUserSessionQuery = `DELETE FROM sessions WHERE user_id = $1`
-	deleteSessionQuery     = `DELETE FROM sessions WHERE token = $1`
+	deleteSessionQuery     = `DELETE FROM sessions WHERE token = $1 AND tenant_id = $2`
 )
 
 type SessionRepository struct {
@@ -52,13 +55,19 @@ func NewSessionRepository() session.Repository {
 }
 
 func (g *SessionRepository) GetPaginated(ctx context.Context, params *session.FindParams) ([]*session.Session, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	var args []interface{}
-	where := []string{"1 = 1"}
+	where, args := []string{"tenant_id = $%d"}, []interface{}{tenant.ID}
 
 	if params.Token != "" {
 		where = append(where, fmt.Sprintf("token = $%d", len(args)+1))
 		args = append(args, params.Token)
 	}
+
 	query := repo.Join(
 		selectSessionQuery,
 		repo.JoinWhere(where...),
@@ -74,19 +83,53 @@ func (g *SessionRepository) Count(ctx context.Context) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, err
+	}
+
 	var count int64
-	if err := tx.QueryRow(ctx, countSessionQuery).Scan(&count); err != nil {
+	if err := tx.QueryRow(ctx, countSessionQuery+" WHERE tenant_id = $1", tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *SessionRepository) GetAll(ctx context.Context) ([]*session.Session, error) {
-	return g.querySessions(ctx, selectSessionQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return g.querySessions(ctx, selectSessionQuery+" WHERE tenant_id = $1", tenant.ID)
 }
 
 func (g *SessionRepository) GetByToken(ctx context.Context, token string) (*session.Session, error) {
-	sessions, err := g.querySessions(ctx, repo.Join(selectSessionQuery, "WHERE token = $1"), token)
+	// First try with tenant from context
+	tenant, err := composables.UseTenant(ctx)
+
+	// If tenant is not in context (like during login), get the session regardless of tenant
+	if err != nil {
+		// Ensure we have a transaction context
+		_, err := composables.UseTx(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		// Query without tenant filter during login
+		sessions, err := g.querySessions(ctx, repo.Join(selectSessionQuery, "WHERE token = $1"), token)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to get session by token")
+		}
+		if len(sessions) == 0 {
+			return nil, ErrSessionNotFound
+		}
+		return sessions[0], nil
+	}
+
+	// Normal flow with tenant from context
+	sessions, err := g.querySessions(ctx, repo.Join(selectSessionQuery, "WHERE token = $1 AND tenant_id = $2"), token, tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get session by token")
 	}
@@ -97,7 +140,14 @@ func (g *SessionRepository) GetByToken(ctx context.Context, token string) (*sess
 }
 
 func (g *SessionRepository) Create(ctx context.Context, data *session.Session) error {
-	dbSession := toDBSession(data)
+	dbSession := ToDBSession(data)
+
+	// First try to get tenant from context
+	tenant, err := composables.UseTenant(ctx)
+	if err == nil {
+		dbSession.TenantID = tenant.ID.String()
+	}
+	// If tenant is not in context but session has TenantID set (from session.CreateDTO), use that
 	return g.execQuery(
 		ctx,
 		insertSessionQuery,
@@ -107,11 +157,25 @@ func (g *SessionRepository) Create(ctx context.Context, data *session.Session) e
 		dbSession.IP,
 		dbSession.UserAgent,
 		dbSession.CreatedAt,
+		dbSession.TenantID,
 	)
 }
 
 func (g *SessionRepository) Update(ctx context.Context, data *session.Session) error {
-	dbSession := toDBSession(data)
+	dbSession := ToDBSession(data)
+
+	// First try to get tenant from context
+	tenant, err := composables.UseTenant(ctx)
+	if err == nil {
+		dbSession.TenantID = tenant.ID.String()
+	} else if dbSession.TenantID == uuid.Nil.String() {
+		// If tenant is not in context and session has no TenantID, get the current session's tenant ID
+		existingSession, err := g.GetByToken(ctx, dbSession.Token)
+		if err != nil {
+			return err
+		}
+		dbSession.TenantID = existingSession.TenantID.String()
+	}
 	return g.execQuery(
 		ctx,
 		updateSessionQuery,
@@ -119,11 +183,16 @@ func (g *SessionRepository) Update(ctx context.Context, data *session.Session) e
 		dbSession.IP,
 		dbSession.UserAgent,
 		dbSession.Token,
+		dbSession.TenantID,
 	)
 }
 
 func (g *SessionRepository) Delete(ctx context.Context, token string) error {
-	return g.execQuery(ctx, deleteSessionQuery, token)
+	session, err := g.GetByToken(ctx, token)
+	if err != nil {
+		return err
+	}
+	return g.execQuery(ctx, deleteSessionQuery, token, session.TenantID)
 }
 
 func (g *SessionRepository) DeleteByUserId(ctx context.Context, userId uint) ([]*session.Session, error) {
@@ -171,10 +240,11 @@ func (g *SessionRepository) querySessions(ctx context.Context, query string, arg
 			&sessionRow.IP,
 			&sessionRow.UserAgent,
 			&sessionRow.CreatedAt,
+			&sessionRow.TenantID,
 		); err != nil {
 			return nil, err
 		}
-		sessions = append(sessions, toDomainSession(&sessionRow))
+		sessions = append(sessions, ToDomainSession(&sessionRow))
 	}
 
 	if err := rows.Err(); err != nil {
diff --git a/modules/core/infrastructure/persistence/setup_test.go b/modules/core/infrastructure/persistence/setup_test.go
index 2dd6e44e6..7f0e620e1 100644
--- a/modules/core/infrastructure/persistence/setup_test.go
+++ b/modules/core/infrastructure/persistence/setup_test.go
@@ -34,23 +34,45 @@ func setupTest(t *testing.T) *testFixtures {
 	pool := testutils.NewPool(testutils.DbOpts(t.Name()))
 
 	ctx := context.Background()
+
+	// Setup application and run migrations first (outside the transaction)
+	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Run migrations first to create all tables including tenants
+	if err := app.Migrations().Run(); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a test tenant outside transaction
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Now start the transaction
 	tx, err := pool.Begin(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	t.Cleanup(func() {
-		if err := tx.Commit(ctx); err != nil {
-			t.Fatal(err)
+		// Rollback instead of commit to ensure clean state
+		// This is safer as it ensures tests don't affect each other
+		if err := tx.Rollback(ctx); err != nil {
+			// Only fatal if it's not already committed
+			if err.Error() != "sql: transaction has already been committed or rolled back" {
+				t.Fatal(err)
+			}
 		}
 		pool.Close()
 	})
 
+	// Add transaction and tenant to context
 	ctx = composables.WithTx(ctx, tx)
-	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
-	if err != nil {
-		t.Fatal(err)
-	}
+	ctx = composables.WithTenant(ctx, tenant)
 
 	return &testFixtures{
 		ctx:  ctx,
diff --git a/modules/core/infrastructure/persistence/tab_repository.go b/modules/core/infrastructure/persistence/tab_repository.go
index 29b8723c0..e49c3e978 100644
--- a/modules/core/infrastructure/persistence/tab_repository.go
+++ b/modules/core/infrastructure/persistence/tab_repository.go
@@ -16,9 +16,9 @@ var (
 )
 
 const (
-	selectTabsQuery     = `SELECT id, href, user_id, position FROM tabs`
+	selectTabsQuery     = `SELECT id, href, user_id, position, tenant_id FROM tabs`
 	countTabsQuery      = `SELECT COUNT(*) as count FROM tabs`
-	insertTabsQuery     = `INSERT INTO tabs (href, user_id, position) VALUES ($1, $2, $3) RETURNING id`
+	insertTabsQuery     = `INSERT INTO tabs (href, user_id, position, tenant_id) VALUES ($1, $2, $3, $4) RETURNING id`
 	updateTabsQuery     = `UPDATE tabs SET href = $1, position = $2 WHERE id = $3`
 	deleteTabsQuery     = `DELETE FROM tabs WHERE id = $1`
 	deleteUserTabsQuery = `DELETE FROM tabs WHERE user_id = $1`
@@ -50,6 +50,7 @@ func (g *tabRepository) queryTabs(ctx context.Context, query string, args ...int
 			&tab.Href,
 			&tab.UserID,
 			&tab.Position,
+			&tab.TenantID,
 		); err != nil {
 			return nil, err
 		}
@@ -73,15 +74,26 @@ func (g *tabRepository) Count(ctx context.Context) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	var count int64
-	if err := pool.QueryRow(ctx, countTabsQuery).Scan(&count); err != nil {
+	if err := pool.QueryRow(ctx, countTabsQuery+" WHERE tenant_id = $1", tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *tabRepository) GetAll(ctx context.Context, params *tab.FindParams) ([]*tab.Tab, error) {
-	where, args := []string{"1 = 1"}, []interface{}{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where, args := []string{"tenant_id = $1"}, []interface{}{tenant.ID}
 	if params.UserID != 0 {
 		where, args = append(where, fmt.Sprintf("user_id = $%d", len(args)+1)), append(args, params.UserID)
 	}
@@ -100,7 +112,12 @@ func (g *tabRepository) GetUserTabs(ctx context.Context, userID uint) ([]*tab.Ta
 }
 
 func (g *tabRepository) GetByID(ctx context.Context, id uint) (*tab.Tab, error) {
-	tabs, err := g.queryTabs(ctx, repo.Join(selectTabsQuery, "WHERE id = $1"), id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	tabs, err := g.queryTabs(ctx, repo.Join(selectTabsQuery, "WHERE id = $1 AND tenant_id = $2"), id, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -115,13 +132,16 @@ func (g *tabRepository) Create(ctx context.Context, data *tab.Tab) error {
 	if err != nil {
 		return err
 	}
+
 	tab := ToDBTab(data)
+
 	if err := tx.QueryRow(
 		ctx,
 		insertTabsQuery,
 		tab.Href,
 		tab.UserID,
 		tab.Position,
+		tab.TenantID,
 	).Scan(&data.ID); err != nil {
 		return err
 	}
@@ -133,14 +153,17 @@ func (g *tabRepository) CreateMany(ctx context.Context, tabs []*tab.Tab) error {
 	if err != nil {
 		return err
 	}
+
 	for _, data := range tabs {
 		tab := ToDBTab(data)
+
 		if err := tx.QueryRow(
 			ctx,
 			insertTabsQuery,
 			tab.Href,
 			tab.UserID,
 			tab.Position,
+			tab.TenantID,
 		).Scan(&data.ID); err != nil {
 			return err
 		}
@@ -173,6 +196,7 @@ func (g *tabRepository) Update(ctx context.Context, data *tab.Tab) error {
 	if err != nil {
 		return err
 	}
+
 	tab := ToDBTab(data)
 	if _, err := tx.Exec(
 		ctx,
@@ -191,6 +215,7 @@ func (g *tabRepository) Delete(ctx context.Context, id uint) error {
 	if err != nil {
 		return err
 	}
+
 	if _, err := tx.Exec(ctx, deleteTabsQuery, id); err != nil {
 		return err
 	}
@@ -202,6 +227,7 @@ func (g *tabRepository) DeleteUserTabs(ctx context.Context, userID uint) error {
 	if err != nil {
 		return err
 	}
+
 	if _, err := tx.Exec(ctx, deleteUserTabsQuery, userID); err != nil {
 		return err
 	}
diff --git a/modules/core/infrastructure/persistence/tenant_repository.go b/modules/core/infrastructure/persistence/tenant_repository.go
new file mode 100644
index 000000000..4fdd85e92
--- /dev/null
+++ b/modules/core/infrastructure/persistence/tenant_repository.go
@@ -0,0 +1,187 @@
+package persistence
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/go-faster/errors"
+	"github.com/google/uuid"
+	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/tenant"
+	"github.com/iota-uz/iota-sdk/modules/core/infrastructure/persistence/models"
+	"github.com/iota-uz/iota-sdk/pkg/composables"
+)
+
+var (
+	ErrTenantNotFound = fmt.Errorf("tenant not found")
+)
+
+const (
+	tenantFindQuery = `SELECT id, name, domain, is_active, created_at, updated_at FROM tenants`
+)
+
+type TenantRepository struct{}
+
+func NewTenantRepository() tenant.Repository {
+	return &TenantRepository{}
+}
+
+func (r *TenantRepository) GetByID(ctx context.Context, id uuid.UUID) (*tenant.Tenant, error) {
+	query := tenantFindQuery + " WHERE id = $1"
+	tenants, err := r.queryTenants(ctx, query, id.String())
+	if err != nil {
+		return nil, err
+	}
+
+	if len(tenants) == 0 {
+		return nil, ErrTenantNotFound
+	}
+
+	return tenants[0], nil
+}
+
+func (r *TenantRepository) GetByDomain(ctx context.Context, domain string) (*tenant.Tenant, error) {
+	query := tenantFindQuery + " WHERE domain = $1"
+	tenants, err := r.queryTenants(ctx, query, domain)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(tenants) == 0 {
+		return nil, ErrTenantNotFound
+	}
+
+	return tenants[0], nil
+}
+
+func (r *TenantRepository) Create(ctx context.Context, t *tenant.Tenant) (*tenant.Tenant, error) {
+	query := `
+		INSERT INTO tenants (id, name, domain, is_active, created_at, updated_at)
+		VALUES ($1, $2, $3, $4, $5, $6)
+		RETURNING id
+	`
+	tx, err := composables.UseTx(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	var idStr string
+	if err := tx.QueryRow(
+		ctx,
+		query,
+		t.ID().String(),
+		t.Name(),
+		t.Domain(),
+		t.IsActive(),
+		t.CreatedAt(),
+		t.UpdatedAt(),
+	).Scan(&idStr); err != nil {
+		return nil, err
+	}
+
+	id, err := uuid.Parse(idStr)
+	if err != nil {
+		return nil, err
+	}
+
+	return r.GetByID(ctx, id)
+}
+
+func (r *TenantRepository) Update(ctx context.Context, t *tenant.Tenant) (*tenant.Tenant, error) {
+	query := `
+		UPDATE tenants
+		SET name = $1, domain = $2, is_active = $3, updated_at = $4
+		WHERE id = $5
+		RETURNING id
+	`
+	tx, err := composables.UseTx(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	var idStr string
+	if err := tx.QueryRow(
+		ctx,
+		query,
+		t.Name(),
+		t.Domain(),
+		t.IsActive(),
+		t.UpdatedAt(),
+		t.ID().String(),
+	).Scan(&idStr); err != nil {
+		return nil, err
+	}
+
+	id, err := uuid.Parse(idStr)
+	if err != nil {
+		return nil, err
+	}
+
+	return r.GetByID(ctx, id)
+}
+
+func (r *TenantRepository) Delete(ctx context.Context, id uuid.UUID) error {
+	query := `DELETE FROM tenants WHERE id = $1`
+	tx, err := composables.UseTx(ctx)
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec(ctx, query, id.String())
+	return err
+}
+
+func (r *TenantRepository) List(ctx context.Context) ([]*tenant.Tenant, error) {
+	return r.queryTenants(ctx, tenantFindQuery)
+}
+
+func (r *TenantRepository) queryTenants(ctx context.Context, query string, args ...interface{}) ([]*tenant.Tenant, error) {
+	tx, err := composables.UseTx(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get transaction")
+	}
+
+	rows, err := tx.Query(ctx, query, args...)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to execute query")
+	}
+	defer rows.Close()
+
+	var tenants []*tenant.Tenant
+	for rows.Next() {
+		var t models.Tenant
+		if err := rows.Scan(
+			&t.ID,
+			&t.Name,
+			&t.Domain,
+			&t.IsActive,
+			&t.CreatedAt,
+			&t.UpdatedAt,
+		); err != nil {
+			return nil, errors.Wrap(err, "failed to scan tenant row")
+		}
+		tenants = append(tenants, toDomainTenant(&t))
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, errors.Wrap(err, "row iteration error")
+	}
+
+	return tenants, nil
+}
+
+func toDomainTenant(t *models.Tenant) *tenant.Tenant {
+	id, err := uuid.Parse(t.ID)
+	if err != nil {
+		// Log error or handle it appropriately
+		id = uuid.Nil
+	}
+
+	return tenant.New(
+		t.Name,
+		tenant.WithID(id),
+		tenant.WithDomain(t.Domain.String),
+		tenant.WithIsActive(t.IsActive),
+		tenant.WithCreatedAt(t.CreatedAt),
+		tenant.WithUpdatedAt(t.UpdatedAt),
+	)
+}
diff --git a/modules/core/infrastructure/persistence/upload_repository.go b/modules/core/infrastructure/persistence/upload_repository.go
index 59281ee96..5699b9ad0 100644
--- a/modules/core/infrastructure/persistence/upload_repository.go
+++ b/modules/core/infrastructure/persistence/upload_repository.go
@@ -16,12 +16,12 @@ var (
 )
 
 const (
-	selectUploadQuery = `SELECT id, hash, path, name, size, type, mimetype, created_at, updated_at FROM uploads`
+	selectUploadQuery = `SELECT id, hash, path, name, size, type, mimetype, created_at, updated_at, tenant_id FROM uploads`
 
 	countUploadsQuery = `SELECT COUNT(*) FROM uploads`
 
-	insertUploadQuery = `INSERT INTO uploads (hash, path, name, size, type, mimetype, created_at, updated_at)
-                         VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+	insertUploadQuery = `INSERT INTO uploads (hash, path, name, size, type, mimetype, created_at, updated_at, tenant_id)
+                         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
                          RETURNING id`
 
 	updatedUploadQuery = `UPDATE uploads
@@ -32,9 +32,9 @@ const (
                               type = $5,
                               mimetype = $6,
                               updated_at = $7
-                          WHERE id = $8`
+                          WHERE id = $8 AND tenant_id = $9`
 
-	deleteUploadQuery = `DELETE FROM uploads WHERE id = $1`
+	deleteUploadQuery = `DELETE FROM uploads WHERE id = $1 AND tenant_id = $2`
 )
 
 type GormUploadRepository struct {
@@ -79,10 +79,15 @@ func (g *GormUploadRepository) queryUploads(
 			&dbUpload.Mimetype,
 			&dbUpload.CreatedAt,
 			&dbUpload.UpdatedAt,
+			&dbUpload.TenantID,
 		); err != nil {
 			return nil, err
 		}
-		uploads = append(uploads, ToDomainUpload(&dbUpload))
+		domainUpload, err := ToDomainUpload(&dbUpload)
+		if err != nil {
+			return nil, err
+		}
+		uploads = append(uploads, domainUpload)
 	}
 	if err := rows.Err(); err != nil {
 		return nil, err
@@ -94,7 +99,12 @@ func (g *GormUploadRepository) queryUploads(
 func (g *GormUploadRepository) GetPaginated(
 	ctx context.Context, params *upload.FindParams,
 ) ([]upload.Upload, error) {
-	where, args := []string{"1 = 1"}, []interface{}{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	where, args := []string{"tenant_id = $1"}, []interface{}{tenant.ID.String()}
 	if params.ID != 0 {
 		where, args = append(where, fmt.Sprintf("id = $%d", len(args)+1)), append(args, params.ID)
 	}
@@ -122,8 +132,14 @@ func (g *GormUploadRepository) Count(ctx context.Context) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, err
+	}
+
 	var count int64
-	if err := pool.QueryRow(ctx, countUploadsQuery).Scan(&count); err != nil {
+	if err := pool.QueryRow(ctx, countUploadsQuery+" WHERE tenant_id = $1", tenant.ID.String()).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
@@ -164,7 +180,15 @@ func (g *GormUploadRepository) Create(ctx context.Context, data upload.Upload) (
 	if err != nil {
 		return nil, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	dbUpload := ToDBUpload(data)
+	dbUpload.TenantID = tenant.ID.String()
+
 	if err := tx.QueryRow(
 		ctx,
 		insertUploadQuery,
@@ -176,6 +200,7 @@ func (g *GormUploadRepository) Create(ctx context.Context, data upload.Upload) (
 		dbUpload.Mimetype,
 		dbUpload.CreatedAt,
 		dbUpload.UpdatedAt,
+		dbUpload.TenantID,
 	).Scan(&dbUpload.ID); err != nil {
 		return nil, err
 	}
@@ -187,7 +212,15 @@ func (g *GormUploadRepository) Update(ctx context.Context, data upload.Upload) e
 	if err != nil {
 		return err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return err
+	}
+
 	dbUpload := ToDBUpload(data)
+	dbUpload.TenantID = tenant.ID.String()
+
 	if _, err := tx.Exec(
 		ctx,
 		updatedUploadQuery,
@@ -199,6 +232,7 @@ func (g *GormUploadRepository) Update(ctx context.Context, data upload.Upload) e
 		dbUpload.Mimetype,
 		dbUpload.UpdatedAt,
 		dbUpload.ID,
+		dbUpload.TenantID,
 	); err != nil {
 		return err
 	}
@@ -210,7 +244,13 @@ func (g *GormUploadRepository) Delete(ctx context.Context, id uint) error {
 	if err != nil {
 		return err
 	}
-	if _, err := tx.Exec(ctx, deleteUploadQuery, id); err != nil {
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return err
+	}
+
+	if _, err := tx.Exec(ctx, deleteUploadQuery, id, tenant.ID.String()); err != nil {
 		return err
 	}
 	return nil
diff --git a/modules/core/infrastructure/persistence/upload_repository_test.go b/modules/core/infrastructure/persistence/upload_repository_test.go
index fd8082f72..40a9d652d 100644
--- a/modules/core/infrastructure/persistence/upload_repository_test.go
+++ b/modules/core/infrastructure/persistence/upload_repository_test.go
@@ -131,6 +131,7 @@ func TestGormUploadRepository_CRUD(t *testing.T) {
 		updatedMime := mimetype.Lookup("image/png")
 		updatedUpload := upload.NewWithID(
 			createdUpload.ID(),
+			createdUpload.TenantID(),
 			"updated-hash",
 			"uploads/updated.png",
 			"updated.png",
diff --git a/modules/core/infrastructure/persistence/user_repository.go b/modules/core/infrastructure/persistence/user_repository.go
index 7034f9663..6534edf5d 100644
--- a/modules/core/infrastructure/persistence/user_repository.go
+++ b/modules/core/infrastructure/persistence/user_repository.go
@@ -24,6 +24,7 @@ const (
         SELECT
             u.id,
             u.type,
+            u.tenant_id,
             u.first_name,
             u.last_name,
             u.middle_name,
@@ -43,11 +44,11 @@ const (
 
 	userExistsQuery = `SELECT 1 FROM users u`
 
-	userUpdateLastLoginQuery = `UPDATE users SET last_login = NOW() WHERE id = $1`
+	userUpdateLastLoginQuery = `UPDATE users SET last_login = NOW() WHERE id = $1 AND tenant_id = $2`
 
-	userUpdateLastActionQuery = `UPDATE users SET last_action = NOW() WHERE id = $1`
+	userUpdateLastActionQuery = `UPDATE users SET last_action = NOW() WHERE id = $1 AND tenant_id = $2`
 
-	userDeleteQuery     = `DELETE FROM users WHERE id = $1`
+	userDeleteQuery     = `DELETE FROM users WHERE id = $1 AND tenant_id = $2`
 	userRoleDeleteQuery = `DELETE FROM user_roles WHERE user_id = $1`
 	userRoleInsertQuery = `INSERT INTO user_roles (user_id, role_id) VALUES`
 
@@ -58,16 +59,17 @@ const (
 	userPermissionInsertQuery = `INSERT INTO user_permissions (user_id, permission_id) VALUES`
 
 	userRolePermissionsQuery = `
-				SELECT p.id, p.name, p.resource, p.action, p.modifier, p.description
+				SELECT p.id, p.tenant_id, p.name, p.resource, p.action, p.modifier, p.description
 				FROM role_permissions rp LEFT JOIN permissions p ON rp.permission_id = p.id WHERE role_id = $1`
 
 	userPermissionsQuery = `
-				SELECT p.id, p.name, p.resource, p.action, p.modifier, p.description
+				SELECT p.id, p.tenant_id, p.name, p.resource, p.action, p.modifier, p.description
 				FROM user_permissions up LEFT JOIN permissions p ON up.permission_id = p.id WHERE up.user_id = $1`
 
 	userRolesQuery = `
 				SELECT
 					r.id,
+					r.tenant_id,
 					r.name,
 					r.description,
 					r.created_at,
@@ -103,6 +105,7 @@ func NewUserRepository(uploadRepo upload.Repository) user.Repository {
 			user.LastLoginField:    "u.last_login",
 			user.CreatedAtField:    "u.created_at",
 			user.UpdatedAtField:    "u.updated_at",
+			user.TenantIDField:     "u.tenant_id",
 		},
 	}
 }
@@ -175,6 +178,11 @@ func (g *PgUserRepository) GetPaginated(ctx context.Context, params *user.FindPa
 }
 
 func (g *PgUserRepository) Count(ctx context.Context, params *user.FindParams) (int64, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return 0, errors.Wrap(err, "failed to get transaction")
@@ -185,6 +193,9 @@ func (g *PgUserRepository) Count(ctx context.Context, params *user.FindParams) (
 		return 0, err
 	}
 
+	where = append(where, fmt.Sprintf("u.tenant_id = $%d", len(args)+1))
+	args = append(args, tenant.ID)
+
 	baseQuery := userCountQuery
 
 	for _, f := range params.Filters {
@@ -215,7 +226,12 @@ func (g *PgUserRepository) Count(ctx context.Context, params *user.FindParams) (
 }
 
 func (g *PgUserRepository) GetAll(ctx context.Context) ([]user.User, error) {
-	users, err := g.queryUsers(ctx, userFindQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	users, err := g.queryUsers(ctx, userFindQuery+" WHERE u.tenant_id = $1", tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get all users")
 	}
@@ -223,29 +239,59 @@ func (g *PgUserRepository) GetAll(ctx context.Context) ([]user.User, error) {
 }
 
 func (g *PgUserRepository) GetByID(ctx context.Context, id uint) (user.User, error) {
-	users, err := g.queryUsers(ctx, userFindQuery+" WHERE u.id = $1", id)
-	if err != nil {
-		return nil, errors.Wrap(err, fmt.Sprintf("failed to query user with id: %d", id))
+	tenant, err := composables.UseTenant(ctx)
+
+	var users []user.User
+	if err == nil {
+		users, err = g.queryUsers(ctx, userFindQuery+" WHERE u.id = $1 AND u.tenant_id = $2", id, tenant.ID)
+		if err != nil {
+			return nil, errors.Wrap(err, fmt.Sprintf("failed to query user with id: %d", id))
+		}
+	} else {
+		users, err = g.queryUsers(ctx, userFindQuery+" WHERE u.id = $1", id)
+		if err != nil {
+			return nil, errors.Wrap(err, fmt.Sprintf("failed to query user with id: %d", id))
+		}
 	}
+
 	if len(users) == 0 {
 		return nil, fmt.Errorf("id: %d: %w", id, ErrUserNotFound)
 	}
+
 	return users[0], nil
 }
 
 func (g *PgUserRepository) GetByEmail(ctx context.Context, email string) (user.User, error) {
-	users, err := g.queryUsers(ctx, userFindQuery+" WHERE u.email = $1", email)
-	if err != nil {
-		return nil, errors.Wrap(err, fmt.Sprintf("failed to query user with email: %s", email))
+	tenant, err := composables.UseTenant(ctx)
+	var users []user.User
+	if err == nil {
+		// If we have a tenant, use it to filter
+		users, err = g.queryUsers(ctx, userFindQuery+" WHERE u.email = $1 AND u.tenant_id = $2", email, tenant.ID)
+		if err != nil {
+			return nil, errors.Wrap(err, fmt.Sprintf("failed to query user with email: %s", email))
+		}
+	} else {
+		// If no tenant in context (like during login), get user by email across all tenants
+		users, err = g.queryUsers(ctx, userFindQuery+" WHERE u.email = $1", email)
+		if err != nil {
+			return nil, errors.Wrap(err, fmt.Sprintf("failed to query user with email: %s", email))
+		}
 	}
+
 	if len(users) == 0 {
 		return nil, fmt.Errorf("email: %s: %w", email, ErrUserNotFound)
 	}
+
 	return users[0], nil
 }
 
 func (g *PgUserRepository) GetByPhone(ctx context.Context, phone string) (user.User, error) {
-	users, err := g.queryUsers(ctx, userFindQuery+" WHERE u.phone = $1", phone)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	users, err := g.queryUsers(ctx, userFindQuery+" WHERE u.phone = $1 AND u.tenant_id = $2", phone, tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, fmt.Sprintf("failed to query user with phone: %s", phone))
 	}
@@ -297,6 +343,7 @@ func (g *PgUserRepository) Create(ctx context.Context, data user.User) (user.Use
 
 	fields := []string{
 		"type",
+		"tenant_id",
 		"first_name",
 		"last_name",
 		"middle_name",
@@ -311,6 +358,7 @@ func (g *PgUserRepository) Create(ctx context.Context, data user.User) (user.Use
 
 	values := []interface{}{
 		dbUser.Type,
+		dbUser.TenantID,
 		dbUser.FirstName,
 		dbUser.LastName,
 		dbUser.MiddleName,
@@ -329,8 +377,8 @@ func (g *PgUserRepository) Create(ctx context.Context, data user.User) (user.Use
 			values = append(values, efs.Value(f))
 		}
 	}
-
-	err = tx.QueryRow(ctx, repo.Insert("users", fields, "id"), values...).Scan(&dbUser.ID)
+	q := repo.Insert("users", fields, "id")
+	err = tx.QueryRow(ctx, q, values...).Scan(&dbUser.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to insert user")
 	}
@@ -351,14 +399,22 @@ func (g *PgUserRepository) Create(ctx context.Context, data user.User) (user.Use
 }
 
 func (g *PgUserRepository) Update(ctx context.Context, data user.User) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return errors.Wrap(err, "failed to get transaction")
 	}
-
 	dbUser, _ := toDBUser(data)
+	if dbUser.TenantID == uuid.Nil.String() {
+		dbUser.TenantID = tenant.ID.String()
+	}
 
 	fields := []string{
+		"tenant_id",
 		"first_name",
 		"last_name",
 		"middle_name",
@@ -370,6 +426,7 @@ func (g *PgUserRepository) Update(ctx context.Context, data user.User) error {
 	}
 
 	values := []interface{}{
+		dbUser.TenantID,
 		dbUser.FirstName,
 		dbUser.LastName,
 		dbUser.MiddleName,
@@ -416,20 +473,71 @@ func (g *PgUserRepository) Update(ctx context.Context, data user.User) error {
 }
 
 func (g *PgUserRepository) UpdateLastLogin(ctx context.Context, id uint) error {
-	if err := g.execQuery(ctx, userUpdateLastLoginQuery, id); err != nil {
+	// First check if we have a tenant in context
+	tenant, err := composables.UseTenant(ctx)
+
+	// If tenant exists in context, use it
+	if err == nil {
+		if err := g.execQuery(ctx, userUpdateLastLoginQuery, id, tenant.ID); err != nil {
+			return errors.Wrap(err, fmt.Sprintf("failed to update last login for user ID: %d", id))
+		}
+		return nil
+	}
+
+	// If no tenant in context, get the user's tenant from DB and use that
+	tx, txErr := composables.UseTx(ctx)
+	if txErr != nil {
+		return errors.Wrap(txErr, "failed to get transaction")
+	}
+
+	var tenantID string
+	err = tx.QueryRow(ctx, "SELECT tenant_id FROM users WHERE id = $1", id).Scan(&tenantID)
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("failed to get tenant ID for user ID: %d", id))
+	}
+
+	if err := g.execQuery(ctx, userUpdateLastLoginQuery, id, tenantID); err != nil {
 		return errors.Wrap(err, fmt.Sprintf("failed to update last login for user ID: %d", id))
 	}
 	return nil
 }
 
 func (g *PgUserRepository) UpdateLastAction(ctx context.Context, id uint) error {
-	if err := g.execQuery(ctx, userUpdateLastActionQuery, id); err != nil {
+	// First check if we have a tenant in context
+	tenant, err := composables.UseTenant(ctx)
+
+	// If tenant exists in context, use it
+	if err == nil {
+		if err := g.execQuery(ctx, userUpdateLastActionQuery, id, tenant.ID); err != nil {
+			return errors.Wrap(err, fmt.Sprintf("failed to update last action for user ID: %d", id))
+		}
+		return nil
+	}
+
+	// If no tenant in context, get the user's tenant from DB and use that
+	tx, txErr := composables.UseTx(ctx)
+	if txErr != nil {
+		return errors.Wrap(txErr, "failed to get transaction")
+	}
+
+	var tenantID string
+	err = tx.QueryRow(ctx, "SELECT tenant_id FROM users WHERE id = $1", id).Scan(&tenantID)
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("failed to get tenant ID for user ID: %d", id))
+	}
+
+	if err := g.execQuery(ctx, userUpdateLastActionQuery, id, tenantID); err != nil {
 		return errors.Wrap(err, fmt.Sprintf("failed to update last action for user ID: %d", id))
 	}
 	return nil
 }
 
 func (g *PgUserRepository) Delete(ctx context.Context, id uint) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	if err := g.execQuery(ctx, userRoleDeleteQuery, id); err != nil {
 		return errors.Wrap(err, fmt.Sprintf("failed to delete roles for user ID: %d", id))
 	}
@@ -439,7 +547,7 @@ func (g *PgUserRepository) Delete(ctx context.Context, id uint) error {
 	if err := g.execQuery(ctx, userPermissionDeleteQuery, id); err != nil {
 		return errors.Wrap(err, fmt.Sprintf("failed to delete permissions for user ID: %d", id))
 	}
-	if err := g.execQuery(ctx, userDeleteQuery, id); err != nil {
+	if err := g.execQuery(ctx, userDeleteQuery, id, tenant.ID); err != nil {
 		return errors.Wrap(err, fmt.Sprintf("failed to delete user with ID: %d", id))
 	}
 	return nil
@@ -464,6 +572,7 @@ func (g *PgUserRepository) queryUsers(ctx context.Context, query string, args ..
 		if err := rows.Scan(
 			&u.ID,
 			&u.Type,
+			&u.TenantID,
 			&u.FirstName,
 			&u.LastName,
 			&u.MiddleName,
@@ -544,6 +653,7 @@ func (g *PgUserRepository) rolePermissions(ctx context.Context, roleID uint) ([]
 		var p models.Permission
 		if err := rows.Scan(
 			&p.ID,
+			&p.TenantID,
 			&p.Name,
 			&p.Resource,
 			&p.Action,
@@ -579,6 +689,7 @@ func (g *PgUserRepository) userRoles(ctx context.Context, userID uint) ([]role.R
 		var r models.Role
 		if err := rows.Scan(
 			&r.ID,
+			&r.TenantID,
 			&r.Name,
 			&r.Description,
 			&r.CreatedAt,
@@ -660,6 +771,7 @@ func (g *PgUserRepository) userPermissions(ctx context.Context, userID uint) ([]
 		var p models.Permission
 		if err := rows.Scan(
 			&p.ID,
+			&p.TenantID,
 			&p.Name,
 			&p.Resource,
 			&p.Action,
diff --git a/modules/core/infrastructure/persistence/user_repository_test.go b/modules/core/infrastructure/persistence/user_repository_test.go
index 8dd688dd2..7a05eb33a 100644
--- a/modules/core/infrastructure/persistence/user_repository_test.go
+++ b/modules/core/infrastructure/persistence/user_repository_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
 	"github.com/iota-uz/iota-sdk/modules/core/infrastructure/persistence"
 	permissions "github.com/iota-uz/iota-sdk/modules/core/permissions"
+	"github.com/iota-uz/iota-sdk/pkg/composables"
 	"github.com/iota-uz/iota-sdk/pkg/repo"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -31,6 +32,9 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 	err := permissionRepository.Save(f.ctx, permissions.UserRead)
 	require.NoError(t, err)
 
+	tenant, err := composables.UseTenant(f.ctx)
+	require.NoError(t, err)
+
 	// First role
 	roleData := role.New(
 		"test-role",
@@ -38,6 +42,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 		role.WithPermissions([]*permission.Permission{
 			permissions.UserRead,
 		}),
+		role.WithTenantID(tenant.ID),
 	)
 	require.NoError(t, err)
 
@@ -51,6 +56,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 		role.WithPermissions([]*permission.Permission{
 			permissions.UserRead,
 		}),
+		role.WithTenantID(tenant.ID),
 	)
 
 	secondRoleEntity, err := roleRepository.Create(f.ctx, secondRoleData)
@@ -62,6 +68,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 		"Test Group",
 		group.WithID(groupID),
 		group.WithDescription("Test group description"),
+		group.WithTenantID(tenant.ID),
 	)
 	_, err = groupRepository.Save(f.ctx, groupEntity)
 	require.NoError(t, err)
@@ -72,6 +79,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 		"Second Group",
 		group.WithID(secondGroupID),
 		group.WithDescription("Second group description"),
+		group.WithTenantID(tenant.ID),
 	)
 	_, err = groupRepository.Save(f.ctx, secondGroupEntity)
 	require.NoError(t, err)
@@ -87,6 +95,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 			email,
 			user.UILanguageEN,
 			user.WithMiddleName("Middle"),
+			user.WithTenantID(tenant.ID),
 		)
 
 		createdUser, err := userRepository.Create(f.ctx, userEntity)
@@ -117,6 +126,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 			secondEmail,
 			user.UILanguageEN,
 			user.WithRoles([]role.Role{roleEntity}),
+			user.WithTenantID(tenant.ID),
 		)
 
 		createdUserWithRoles, err := userRepository.Create(f.ctx, userWithRoles)
@@ -134,6 +144,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 			thirdEmail,
 			user.UILanguageEN,
 			user.WithGroupIDs([]uuid.UUID{groupID}),
+			user.WithTenantID(tenant.ID),
 		)
 
 		createdUserWithGroup, err := userRepository.Create(f.ctx, userWithGroup)
@@ -151,6 +162,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 			"ByID",
 			email,
 			user.UILanguageEN,
+			user.WithTenantID(tenant.ID),
 		)
 
 		createdUser, err := userRepository.Create(f.ctx, userEntity)
@@ -174,6 +186,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 			"ByEmail",
 			email,
 			user.UILanguageEN,
+			user.WithTenantID(tenant.ID),
 		)
 
 		_, err = userRepository.Create(f.ctx, userEntity)
@@ -195,6 +208,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 			"Update",
 			email,
 			user.UILanguageEN,
+			user.WithTenantID(tenant.ID),
 		)
 
 		createdUser, err := userRepository.Create(f.ctx, userEntity)
@@ -219,6 +233,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 			"Roles",
 			email,
 			user.UILanguageEN,
+			user.WithTenantID(tenant.ID),
 		)
 
 		createdUser, err := userRepository.Create(f.ctx, userEntity)
@@ -264,6 +279,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 			"Groups",
 			email,
 			user.UILanguageEN,
+			user.WithTenantID(tenant.ID),
 		)
 
 		createdUser, err := userRepository.Create(f.ctx, userEntity)
@@ -424,6 +440,7 @@ func TestPgUserRepository_CRUD(t *testing.T) {
 			"User",
 			email,
 			user.UILanguageEN,
+			user.WithTenantID(tenant.ID),
 		)
 
 		createdUser, err := userRepository.Create(f.ctx, userEntity)
diff --git a/modules/core/module.go b/modules/core/module.go
index 29ed8746f..e8a5119b2 100644
--- a/modules/core/module.go
+++ b/modules/core/module.go
@@ -49,11 +49,16 @@ func (m *Module) Register(app application.Application) error {
 	// Create repositories
 	userRepo := persistence.NewUserRepository(uploadRepo)
 	roleRepo := persistence.NewRoleRepository()
+	tenantRepo := persistence.NewTenantRepository()
 	permRepo := persistence.NewPermissionRepository()
 
 	// custom validations
 	userValidator := validators.NewUserValidator(userRepo)
 
+	// Create services
+	tabService := services.NewTabService(persistence.NewTabRepository())
+	tenantService := services.NewTenantService(tenantRepo)
+
 	app.RegisterServices(
 		services.NewUploadService(uploadRepo, fsStorage, app.EventPublisher()),
 		services.NewUserService(userRepo, userValidator, app.EventPublisher()),
@@ -63,6 +68,8 @@ func (m *Module) Register(app application.Application) error {
 		services.NewAuthService(app),
 		services.NewCurrencyService(persistence.NewCurrencyRepository(), app.EventPublisher()),
 		services.NewRoleService(roleRepo, app.EventPublisher()),
+		tabService,
+		tenantService,
 		services.NewPermissionService(permRepo, app.EventPublisher()),
 		services.NewTabService(persistence.NewTabRepository()),
 		services.NewGroupService(persistence.NewGroupRepository(userRepo, roleRepo), app.EventPublisher()),
diff --git a/modules/core/presentation/controllers/account_controller.go b/modules/core/presentation/controllers/account_controller.go
index ab0f375e8..594ed6ae7 100644
--- a/modules/core/presentation/controllers/account_controller.go
+++ b/modules/core/presentation/controllers/account_controller.go
@@ -165,15 +165,16 @@ func (c *AccountController) PostSettings(w http.ResponseWriter, r *http.Request)
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	dtos := make([]*tab.CreateDTO, 0, len(hDto.Hrefs))
+	dtos := make([]*tab.Tab, 0, len(hDto.Hrefs))
 	for i, href := range hDto.Hrefs {
-		dtos = append(dtos, &tab.CreateDTO{
+		dtos = append(dtos, &tab.Tab{
 			Href:     href,
 			Position: uint(i),
 			UserID:   u.ID(),
+			TenantID: u.TenantID(),
 		})
 	}
-	if _, err := c.tabService.CreateManyUserTabs(r.Context(), u.ID(), dtos); err != nil {
+	if err := c.tabService.CreateManyUserTabs(r.Context(), u.ID(), dtos); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
diff --git a/modules/core/presentation/controllers/dtos/user_dto.go b/modules/core/presentation/controllers/dtos/user_dto.go
index e7125d760..464745319 100644
--- a/modules/core/presentation/controllers/dtos/user_dto.go
+++ b/modules/core/presentation/controllers/dtos/user_dto.go
@@ -95,7 +95,7 @@ func (dto *UpdateUserDTO) Ok(ctx context.Context) (map[string]string, bool) {
 	return errorMessages, len(errorMessages) == 0
 }
 
-func (dto *CreateUserDTO) ToEntity() (user.User, error) {
+func (dto *CreateUserDTO) ToEntity(tenantID uuid.UUID) (user.User, error) {
 	roles := make([]role.Role, len(dto.RoleIDs))
 	for i, rID := range dto.RoleIDs {
 		r := role.New("", role.WithID(rID))
@@ -117,6 +117,7 @@ func (dto *CreateUserDTO) ToEntity() (user.User, error) {
 	}
 
 	options := []user.Option{
+		user.WithTenantID(tenantID),
 		user.WithMiddleName(dto.MiddleName),
 		user.WithPassword(dto.Password),
 		user.WithRoles(roles),
diff --git a/modules/core/presentation/controllers/group_controller.go b/modules/core/presentation/controllers/group_controller.go
index 55fd14211..a2c766141 100644
--- a/modules/core/presentation/controllers/group_controller.go
+++ b/modules/core/presentation/controllers/group_controller.go
@@ -196,18 +196,32 @@ func (c *GroupsController) Groups(
 	params := composables.UsePaginated(r)
 	search := r.URL.Query().Get("name")
 
+	tenant, err := composables.UseTenant(r.Context())
+	if err != nil {
+		logger.Errorf("Error retrieving tenant from request context: %v", err)
+		http.Error(w, "Error retrieving tenant", http.StatusBadRequest)
+		return
+	}
+
 	findParams := &group.FindParams{
 		Limit:  params.Limit,
 		Offset: params.Offset,
 		SortBy: group.SortBy{Fields: []repo.SortByField[group.Field]{}},
 		Search: search,
+		Filters: []group.Filter{
+			{
+				Column: group.TenantIDField,
+				Filter: repo.Eq(tenant.ID.String()),
+			},
+		},
 	}
 
 	if v := r.URL.Query().Get("CreatedAt.To"); v != "" {
-		findParams.Filters = append(findParams.Filters, group.Filter{
-			Column: group.CreatedAtField,
-			Filter: repo.Lt(v),
-		})
+		findParams = findParams.FilterBy(group.CreatedAtField, repo.Lt(v))
+	}
+
+	if v := r.URL.Query().Get("CreatedAt.From"); v != "" {
+		findParams = findParams.FilterBy(group.CreatedAtField, repo.Gt(v))
 	}
 
 	groupEntities, total, err := groupService.GetPaginatedWithTotal(r.Context(), findParams)
diff --git a/modules/core/presentation/controllers/roles_controller.go b/modules/core/presentation/controllers/roles_controller.go
index c4baa6ba6..2997d1210 100644
--- a/modules/core/presentation/controllers/roles_controller.go
+++ b/modules/core/presentation/controllers/roles_controller.go
@@ -18,6 +18,7 @@ import (
 	"github.com/iota-uz/iota-sdk/pkg/mapping"
 	"github.com/iota-uz/iota-sdk/pkg/middleware"
 	"github.com/iota-uz/iota-sdk/pkg/rbac"
+	"github.com/iota-uz/iota-sdk/pkg/repo"
 	"github.com/iota-uz/iota-sdk/pkg/shared"
 	"github.com/sirupsen/logrus"
 
@@ -108,11 +109,23 @@ func (c *RolesController) List(
 	params := composables.UsePaginated(r)
 	search := r.URL.Query().Get("name")
 
+	tenant, err := composables.UseTenant(r.Context())
+	if err != nil {
+		logger.Errorf("Error retrieving tenant from request context: %v", err)
+		http.Error(w, "Error retrieving tenant", http.StatusBadRequest)
+		return
+	}
+
 	// Create find params with search
 	findParams := &role.FindParams{
-		Limit:   params.Limit,
-		Offset:  params.Offset,
-		Filters: []role.Filter{},
+		Limit:  params.Limit,
+		Offset: params.Offset,
+		Filters: []role.Filter{
+			{
+				Column: role.TenantIDField,
+				Filter: repo.Eq(tenant.ID.String()),
+			},
+		},
 	}
 
 	// Apply search filter if provided
diff --git a/modules/core/presentation/controllers/user_controller.go b/modules/core/presentation/controllers/user_controller.go
index cbc8b59c0..8155e856f 100644
--- a/modules/core/presentation/controllers/user_controller.go
+++ b/modules/core/presentation/controllers/user_controller.go
@@ -253,6 +253,13 @@ func (c *UsersController) Users(
 	params := composables.UsePaginated(r)
 	groupIDs := r.URL.Query()["groupID"]
 
+	tenant, err := composables.UseTenant(r.Context())
+	if err != nil {
+		logger.Errorf("Error retrieving tenant from request: %v", err)
+		http.Error(w, "Error retrieving tenant", http.StatusBadRequest)
+		return
+	}
+
 	// Create find params
 	findParams := &user.FindParams{
 		Limit:  params.Limit,
@@ -266,6 +273,12 @@ func (c *UsersController) Users(
 			},
 		},
 		Search: r.URL.Query().Get("Search"),
+		Filters: []user.Filter{
+			{
+				Column: user.TenantIDField,
+				Filter: repo.Eq(tenant.ID.String()),
+			},
+		},
 	}
 
 	if len(groupIDs) > 0 {
@@ -482,7 +495,7 @@ func (c *UsersController) Create(
 		return
 	}
 
-	userEntity, err := dto.ToEntity()
+	userEntity, err := dto.ToEntity(composables.MustUseUser(r.Context()).TenantID())
 	if err != nil {
 		logger.Errorf("Error converting DTO to entity: %v", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
diff --git a/modules/core/seed/seed_tenant.go b/modules/core/seed/seed_tenant.go
new file mode 100644
index 000000000..e06f2fe23
--- /dev/null
+++ b/modules/core/seed/seed_tenant.go
@@ -0,0 +1,41 @@
+package seed
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/tenant"
+	"github.com/iota-uz/iota-sdk/modules/core/infrastructure/persistence"
+	"github.com/iota-uz/iota-sdk/pkg/application"
+	"github.com/iota-uz/iota-sdk/pkg/configuration"
+)
+
+func CreateDefaultTenant(ctx context.Context, app application.Application) error {
+	conf := configuration.Use()
+	logger := conf.Logger()
+	tenantRepository := persistence.NewTenantRepository()
+	// Create a new tenant with a fixed UUID for the default tenant
+	defaultTenant := tenant.New(
+		"Default",
+		tenant.WithID(uuid.MustParse("00000000-0000-0000-0000-000000000001")),
+		tenant.WithDomain("default.localhost"),
+	)
+	existingTenants, err := tenantRepository.List(ctx)
+	if err != nil {
+		logger.Errorf("Failed to list tenants: %v", err)
+		return err
+	}
+
+	if len(existingTenants) > 0 {
+		logger.Infof("Default tenant already exists")
+		return nil
+	}
+
+	logger.Infof("Creating default tenant")
+	_, err = tenantRepository.Create(ctx, defaultTenant)
+	if err != nil {
+		logger.Errorf("Failed to create default tenant: %v", err)
+		return err
+	}
+	return nil
+}
diff --git a/modules/core/seed/seed_user.go b/modules/core/seed/seed_user.go
index c85806e92..9de62bddf 100644
--- a/modules/core/seed/seed_user.go
+++ b/modules/core/seed/seed_user.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/go-faster/errors"
+	"github.com/google/uuid"
 
 	"github.com/iota-uz/go-i18n/v2/i18n"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/role"
@@ -11,6 +12,7 @@ import (
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/tab"
 	"github.com/iota-uz/iota-sdk/modules/core/infrastructure/persistence"
 	"github.com/iota-uz/iota-sdk/pkg/application"
+	"github.com/iota-uz/iota-sdk/pkg/composables"
 	"github.com/iota-uz/iota-sdk/pkg/configuration"
 	"github.com/iota-uz/iota-sdk/pkg/repo"
 	"github.com/iota-uz/iota-sdk/pkg/types"
@@ -33,12 +35,17 @@ func UserSeedFunc(usr user.User) application.SeedFunc {
 }
 
 func (s *userSeeder) CreateUser(ctx context.Context, app application.Application) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrapf(err, "failed to get tenant from context")
+	}
+
 	r, err := s.getOrCreateRole(ctx, app)
 	if err != nil {
 		return err
 	}
 
-	usr, err := s.getOrCreateUser(ctx, r)
+	usr, err := s.getOrCreateUser(ctx, r, tenant.ID)
 	if err != nil {
 		return err
 	}
@@ -65,16 +72,23 @@ func (s *userSeeder) getOrCreateRole(ctx context.Context, app application.Applic
 		return matches[0], nil
 	}
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to get tenant from context")
+	}
+
 	newRole := role.New(
 		adminRoleName,
 		role.WithDescription(adminRoleDesc),
 		role.WithPermissions(app.RBAC().Permissions()),
-		role.WithType(role.TypeSystem))
+		role.WithType(role.TypeSystem),
+		role.WithTenantID(tenant.ID),
+	)
 	logger.Infof("Creating role %s", adminRoleName)
 	return roleRepository.Create(ctx, newRole)
 }
 
-func (s *userSeeder) getOrCreateUser(ctx context.Context, r role.Role) (user.User, error) {
+func (s *userSeeder) getOrCreateUser(ctx context.Context, r role.Role, tenantID uuid.UUID) (user.User, error) {
 	uploadRepository := persistence.NewUploadRepository()
 	userRepository := persistence.NewUserRepository(uploadRepository)
 	foundUser, err := userRepository.GetByEmail(ctx, s.user.Email().Value())
@@ -88,8 +102,19 @@ func (s *userSeeder) getOrCreateUser(ctx context.Context, r role.Role) (user.Use
 		return foundUser, nil
 	}
 
+	newUser := user.New(
+		s.user.FirstName(),
+		s.user.LastName(),
+		s.user.Email(),
+		s.user.UILanguage(),
+		user.WithTenantID(tenantID),
+		user.WithPassword(s.user.Password()),
+		user.WithMiddleName(s.user.MiddleName()),
+		user.WithPhone(s.user.Phone()),
+	)
+
 	logger.Infof("Creating user %s", s.user.Email().Value())
-	return userRepository.Create(ctx, s.user.AddRole(r))
+	return userRepository.Create(ctx, newUser.AddRole(r))
 }
 
 func (s *userSeeder) createUserTabs(
@@ -99,7 +124,13 @@ func (s *userSeeder) createUserTabs(
 ) error {
 	tabsRepository := persistence.NewTabRepository()
 	localizer := i18n.NewLocalizer(app.Bundle(), string(s.user.UILanguage()))
-	tabs := buildTabsFromNavItems(app.NavItems(localizer), usr.ID())
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrapf(err, "failed to get tenant from context")
+	}
+
+	tabs := buildTabsFromNavItems(app.NavItems(localizer), usr.ID(), tenant.ID)
 
 	for _, t := range tabs {
 		if err := tabsRepository.CreateOrUpdate(ctx, t); err != nil {
@@ -109,7 +140,7 @@ func (s *userSeeder) createUserTabs(
 	return nil
 }
 
-func buildTabsFromNavItems(navItems []types.NavigationItem, userID uint) []*tab.Tab {
+func buildTabsFromNavItems(navItems []types.NavigationItem, userID uint, tenantID uuid.UUID) []*tab.Tab {
 	tabs := make([]*tab.Tab, 0, len(navItems)*4)
 	var position uint = 1
 
@@ -119,6 +150,7 @@ func buildTabsFromNavItems(navItems []types.NavigationItem, userID uint) []*tab.
 			tabs = append(tabs, &tab.Tab{
 				ID:       position,
 				UserID:   userID,
+				TenantID: tenantID,
 				Position: position,
 				Href:     item.Href,
 			})
diff --git a/modules/core/services/auth_service.go b/modules/core/services/auth_service.go
index 6eaf5de03..c90851fdf 100644
--- a/modules/core/services/auth_service.go
+++ b/modules/core/services/auth_service.go
@@ -120,27 +120,58 @@ func (s *AuthService) newSessionToken() (string, error) {
 }
 
 func (s *AuthService) authenticate(ctx context.Context, u user.User) (*session.Session, error) {
-	ip, _ := composables.UseIP(ctx)
-	userAgent, _ := composables.UseUserAgent(ctx)
+	logger := configuration.Use().Logger()
+	logger.Infof("Creating session for user ID: %d, tenant ID: %d", u.ID(), u.TenantID())
+
+	// Get IP and user agent
+	ip, ok := composables.UseIP(ctx)
+	if !ok {
+		logger.Warnf("Could not get IP, using default")
+		ip = "0.0.0.0"
+	}
+
+	userAgent, ok := composables.UseUserAgent(ctx)
+	if !ok {
+		logger.Warnf("Could not get User-Agent, using default")
+		userAgent = "Unknown"
+	}
+
+	// Generate session token
 	token, err := s.newSessionToken()
 	if err != nil {
+		logger.Errorf("Failed to generate session token: %v", err)
 		return nil, err
 	}
+
+	// Create session DTO
 	sess := &session.CreateDTO{
 		Token:     token,
 		UserID:    u.ID(),
 		IP:        ip,
 		UserAgent: userAgent,
+		TenantID:  u.TenantID(), // Ensure tenant ID is set in the session
 	}
+
+	// Update user last login
 	if err := s.usersService.UpdateLastLogin(ctx, u.ID()); err != nil {
+		logger.Errorf("Failed to update last login: %v", err)
 		return nil, err
 	}
+
+	// Update user last action
 	if err := s.usersService.UpdateLastAction(ctx, u.ID()); err != nil {
+		logger.Errorf("Failed to update last action: %v", err)
 		return nil, err
 	}
+
+	// Create the session
+	logger.Infof("Creating session in DB for user ID: %d, token: %s (partial)", u.ID(), token[:5])
 	if err := s.sessionService.Create(ctx, sess); err != nil {
+		logger.Errorf("Failed to create session in DB: %v", err)
 		return nil, err
 	}
+
+	logger.Infof("Session created successfully")
 	return sess.ToEntity(), nil
 }
 
@@ -178,17 +209,28 @@ func (s *AuthService) CookieAuthenticateWithUserID(ctx context.Context, id uint,
 }
 
 func (s *AuthService) Authenticate(ctx context.Context, email, password string) (user.User, *session.Session, error) {
+	logger := configuration.Use().Logger()
+	logger.Infof("Authentication attempt for email: %s", email)
+
 	u, err := s.usersService.GetByEmail(ctx, email)
 	if err != nil {
+		logger.Errorf("Failed to get user by email: %v", err)
 		return nil, nil, err
 	}
+
 	if !u.CheckPassword(password) {
+		logger.Errorf("Invalid password for user: %s", email)
 		return nil, nil, composables.ErrInvalidPassword
 	}
+
+	logger.Infof("User authenticated, creating session for user ID: %d", u.ID())
 	sess, err := s.authenticate(ctx, u)
 	if err != nil {
+		logger.Errorf("Failed to create session: %v", err)
 		return nil, nil, err
 	}
+
+	logger.Infof("Session created successfully with token: %s (partial)", sess.Token[:5])
 	return u, sess, nil
 }
 
diff --git a/modules/core/services/setup_test.go b/modules/core/services/setup_test.go
index fc9a4a260..3496bfd35 100644
--- a/modules/core/services/setup_test.go
+++ b/modules/core/services/setup_test.go
@@ -55,6 +55,18 @@ func setupTest(t *testing.T) *testFixtures {
 		t.Fatal(err)
 	}
 
+	// Run migrations first to create all tables including tenants
+	if err := app.Migrations().Run(); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a test tenant and add it to the context
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx = composables.WithTenant(ctx, tenant)
+
 	return &testFixtures{
 		ctx:  ctx,
 		pool: pool,
diff --git a/modules/core/services/tab_service.go b/modules/core/services/tab_service.go
index 5e59f53a2..0a4f460e3 100644
--- a/modules/core/services/tab_service.go
+++ b/modules/core/services/tab_service.go
@@ -38,28 +38,17 @@ func (s *TabService) Create(ctx context.Context, data *tab.CreateDTO) (*tab.Tab,
 	return entity, nil
 }
 
-func (s *TabService) CreateManyUserTabs(ctx context.Context, userID uint, data []*tab.CreateDTO) ([]*tab.Tab, error) {
-	entities := make([]*tab.Tab, 0, len(data))
-	for _, d := range data {
-		entity, err := d.ToEntity()
-		if err != nil {
-			return nil, err
-		}
-		entities = append(entities, entity)
-	}
+func (s *TabService) CreateManyUserTabs(ctx context.Context, userID uint, data []*tab.Tab) error {
 	err := composables.InTx(ctx, func(txCtx context.Context) error {
 		if err := s.repo.DeleteUserTabs(txCtx, userID); err != nil {
 			return err
 		}
-		if err := s.repo.CreateMany(txCtx, entities); err != nil {
+		if err := s.repo.CreateMany(txCtx, data); err != nil {
 			return err
 		}
 		return nil
 	})
-	if err != nil {
-		return nil, err
-	}
-	return entities, nil
+	return err
 }
 
 func (s *TabService) Update(ctx context.Context, id uint, data *tab.UpdateDTO) error {
diff --git a/modules/core/services/tenant_service.go b/modules/core/services/tenant_service.go
new file mode 100644
index 000000000..bc6acdfc6
--- /dev/null
+++ b/modules/core/services/tenant_service.go
@@ -0,0 +1,43 @@
+package services
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/tenant"
+)
+
+type TenantService struct {
+	repo tenant.Repository
+}
+
+func NewTenantService(repo tenant.Repository) *TenantService {
+	return &TenantService{
+		repo: repo,
+	}
+}
+
+func (s *TenantService) GetByID(ctx context.Context, id uuid.UUID) (*tenant.Tenant, error) {
+	return s.repo.GetByID(ctx, id)
+}
+
+func (s *TenantService) GetByDomain(ctx context.Context, domain string) (*tenant.Tenant, error) {
+	return s.repo.GetByDomain(ctx, domain)
+}
+
+func (s *TenantService) Create(ctx context.Context, name, domain string) (*tenant.Tenant, error) {
+	t := tenant.New(name, tenant.WithDomain(domain))
+	return s.repo.Create(ctx, t)
+}
+
+func (s *TenantService) Update(ctx context.Context, t *tenant.Tenant) (*tenant.Tenant, error) {
+	return s.repo.Update(ctx, t)
+}
+
+func (s *TenantService) Delete(ctx context.Context, id uuid.UUID) error {
+	return s.repo.Delete(ctx, id)
+}
+
+func (s *TenantService) List(ctx context.Context) ([]*tenant.Tenant, error) {
+	return s.repo.List(ctx)
+}
diff --git a/modules/crm/domain/aggregates/chat/chat.go b/modules/crm/domain/aggregates/chat/chat.go
index 6bb611228..577341ef1 100644
--- a/modules/crm/domain/aggregates/chat/chat.go
+++ b/modules/crm/domain/aggregates/chat/chat.go
@@ -43,6 +43,7 @@ type Chat interface {
 	ID() uint
 	WithID(id uint) Chat
 	ClientID() uint
+	TenantID() uuid.UUID
 	Messages() []Message
 	AddMessage(msg Message) Chat
 	UnreadMessages() int
@@ -70,6 +71,7 @@ type Message interface {
 
 type Member interface {
 	ID() uuid.UUID
+	TenantID() uuid.UUID
 	Transport() Transport
 	Sender() Sender
 	CreatedAt() time.Time
diff --git a/modules/crm/domain/aggregates/chat/chat_implementation.go b/modules/crm/domain/aggregates/chat/chat_implementation.go
index e0d84662c..21c5e85ba 100644
--- a/modules/crm/domain/aggregates/chat/chat_implementation.go
+++ b/modules/crm/domain/aggregates/chat/chat_implementation.go
@@ -20,6 +20,12 @@ var (
 
 type ChatOption func(c *chat)
 
+func WithTenantID(tenantID uuid.UUID) ChatOption {
+	return func(c *chat) {
+		c.tenantID = tenantID
+	}
+}
+
 func WithChatID(id uint) ChatOption {
 	return func(c *chat) {
 		c.id = id
@@ -68,6 +74,7 @@ func New(clientID uint, opts ...ChatOption) Chat {
 
 type chat struct {
 	id        uint
+	tenantID  uuid.UUID
 	clientID  uint
 	messages  []Message
 	members   map[uuid.UUID]Member
@@ -102,6 +109,10 @@ func (c *chat) ClientID() uint {
 	return c.clientID
 }
 
+func (c *chat) TenantID() uuid.UUID {
+	return c.tenantID
+}
+
 func (c *chat) Messages() []Message {
 	msgs := make([]Message, len(c.messages))
 	copy(msgs, c.messages)
@@ -221,6 +232,12 @@ func WithMemberUpdatedAt(updatedAt time.Time) MemberOption {
 	}
 }
 
+func WithMemberTenantID(tenantID uuid.UUID) MemberOption {
+	return func(m *member) {
+		m.tenantID = tenantID
+	}
+}
+
 func NewMember(
 	sender Sender,
 	transport Transport,
@@ -231,6 +248,7 @@ func NewMember(
 	}
 	m := &member{
 		id:        uuid.New(),
+		tenantID:  uuid.Nil, // Will be set by WithMemberTenantID option
 		transport: transport,
 		sender:    sender,
 		createdAt: time.Now(),
@@ -244,6 +262,7 @@ func NewMember(
 
 type member struct {
 	id        uuid.UUID
+	tenantID  uuid.UUID
 	transport Transport
 	sender    Sender
 	createdAt time.Time
@@ -251,6 +270,7 @@ type member struct {
 }
 
 func (m *member) ID() uuid.UUID        { return m.id }
+func (m *member) TenantID() uuid.UUID  { return m.tenantID }
 func (m *member) Transport() Transport { return m.transport }
 func (m *member) Sender() Sender       { return m.sender }
 func (m *member) CreatedAt() time.Time { return m.createdAt }
diff --git a/modules/crm/domain/aggregates/client/client.go b/modules/crm/domain/aggregates/client/client.go
index 03a91ebef..71eb8ec25 100644
--- a/modules/crm/domain/aggregates/client/client.go
+++ b/modules/crm/domain/aggregates/client/client.go
@@ -3,6 +3,7 @@ package client
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/passport"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/general"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
@@ -20,6 +21,12 @@ func WithID(id uint) Option {
 	}
 }
 
+func WithTenantID(tenantID uuid.UUID) Option {
+	return func(c *client) {
+		c.tenantID = tenantID
+	}
+}
+
 func WithLastName(lastName string) Option {
 	return func(c *client) {
 		c.lastName = lastName
@@ -112,6 +119,7 @@ const (
 
 type Client interface {
 	ID() uint
+	TenantID() uuid.UUID
 	FirstName() string
 	LastName() string
 	MiddleName() string
@@ -165,6 +173,7 @@ func New(firstName string, opts ...Option) (Client, error) {
 
 type client struct {
 	id          uint
+	tenantID    uuid.UUID
 	firstName   string
 	lastName    string
 	middleName  string
@@ -185,6 +194,10 @@ func (c *client) ID() uint {
 	return c.id
 }
 
+func (c *client) TenantID() uuid.UUID {
+	return c.tenantID
+}
+
 func (c *client) FirstName() string {
 	return c.firstName
 }
diff --git a/modules/crm/infrastructure/persistence/chat_repository.go b/modules/crm/infrastructure/persistence/chat_repository.go
index f93c0f102..de39fcd26 100644
--- a/modules/crm/infrastructure/persistence/chat_repository.go
+++ b/modules/crm/infrastructure/persistence/chat_repository.go
@@ -3,6 +3,7 @@ package persistence
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 
 	"github.com/go-faster/errors"
 	"github.com/jackc/pgx/v5"
@@ -22,8 +23,9 @@ var (
 
 const (
 	selectChatQuery = `
-		SELECT 
+		SELECT
 			c.id,
+			c.tenant_id,
 			c.created_at,
 			c.last_message_at,
 			c.client_id
@@ -32,14 +34,6 @@ const (
 
 	countChatQuery = `SELECT COUNT(*) as count FROM chats`
 
-	insertChatQuery = `
-		INSERT INTO chats (
-			client_id,
-			last_message_at,
-			created_at
-		) VALUES ($1, $2, $3) RETURNING id
-	`
-
 	updateChatQuery = `UPDATE chats SET
 		client_id = $1,
 		created_at = $2,
@@ -49,7 +43,7 @@ const (
 	deleteChatQuery = `DELETE FROM chats WHERE id = $1`
 
 	selectMessagesQuery = `
-		SELECT 
+		SELECT
 			m.id,
 			m.chat_id,
 			m.message,
@@ -61,7 +55,7 @@ const (
 	`
 
 	selectMessageAttachmentsQuery = `
-		SELECT 
+		SELECT
 			u.id AS upload_id,
 			u.hash,
 			u.path,
@@ -78,6 +72,7 @@ const (
 	selectChatMembersQuery = `
 		SELECT 
 			cm.id,
+			cm.tenant_id,
 			cm.chat_id,
 			cm.user_id,
 			cm.client_id,
@@ -92,6 +87,7 @@ const (
 	insertChatMemberQuery = `
 		INSERT INTO chat_members (
 			id,
+			tenant_id,
 			chat_id,
 			user_id,
 			client_id,
@@ -100,19 +96,20 @@ const (
 			transport_meta,
 			created_at,
 			updated_at
-		) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+		) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
 	`
 
 	updateChatMemberQuery = `
 		UPDATE chat_members SET
-			chat_id = $1,
-			user_id = $2,
-			client_id = $3,
-			client_contact_id = $4,
-			transport = $5,
-			transport_meta = $6,
-			updated_at = $7
-		WHERE id = $8
+			tenant_id = $1,
+			chat_id = $2,
+			user_id = $3,
+			client_id = $4,
+			client_contact_id = $5,
+			transport = $6,
+			transport_meta = $7,
+			updated_at = $8
+		WHERE id = $9
 	`
 
 	deleteChatMembersQuery = `DELETE FROM chat_members WHERE chat_id = $1`
@@ -134,7 +131,7 @@ const (
 			read_at = $3,
 			sender_id = $4,
 			sent_at = $5
-		WHERE id = $6
+			WHERE id = $6
 	`
 
 	deleteMessageQuery = `DELETE FROM messages WHERE chat_id = $1`
@@ -171,6 +168,7 @@ func (g *ChatRepository) queryMembers(ctx context.Context, query string, args ..
 		var transportMetaData []byte
 		if err := rows.Scan(
 			&member.ID,
+			&member.TenantID,
 			&member.ChatID,
 			&member.UserID,
 			&member.ClientID,
@@ -224,6 +222,7 @@ func (g *ChatRepository) queryChats(ctx context.Context, query string, args ...i
 		var c models.Chat
 		if err := rows.Scan(
 			&c.ID,
+			&c.TenantID,
 			&c.CreatedAt,
 			&c.LastMessageAt,
 			&c.ClientID,
@@ -353,15 +352,23 @@ func (g *ChatRepository) queryMessages(ctx context.Context, query string, args .
 func (g *ChatRepository) GetPaginated(
 	ctx context.Context, params *chat.FindParams,
 ) ([]chat.Chat, error) {
-	where, args, joins := []string{"1 = 1"}, []interface{}{}, []string{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+	where, args, joins := []string{"c.tenant_id = $1"}, []interface{}{tenant.ID}, []string{}
 	if params.Search != "" {
 		where = append(
 			where,
-			"cl.first_name ILIKE $1 OR cl.last_name ILIKE $1 OR cl.middle_name ILIKE $1 OR cl.phone_number ILIKE $1",
+			fmt.Sprintf(
+				"cl.first_name ILIKE $%d OR cl.last_name ILIKE $%d OR cl.middle_name ILIKE $%d OR cl.phone_number ILIKE $%d",
+				len(args)+1, len(args)+1, len(args)+1, len(args)+1,
+			),
 		)
 		args = append(args, "%"+params.Search+"%")
 		joins = append(joins, "JOIN clients cl ON c.client_id = cl.id")
 	}
+
 	query := repo.Join(
 		selectChatQuery,
 		repo.Join(joins...),
@@ -377,15 +384,26 @@ func (g *ChatRepository) Count(ctx context.Context) (int64, error) {
 	if err != nil {
 		return 0, errors.Wrap(err, "failed to get transaction")
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	var count int64
-	if err := pool.QueryRow(ctx, countChatQuery).Scan(&count); err != nil {
+	if err := pool.QueryRow(ctx, countChatQuery+" WHERE tenant_id = $1", tenant.ID).Scan(&count); err != nil {
 		return 0, errors.Wrap(err, "failed to count chats")
 	}
 	return count, nil
 }
 
 func (g *ChatRepository) GetAll(ctx context.Context) ([]chat.Chat, error) {
-	chats, err := g.queryChats(ctx, selectChatQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	chats, err := g.queryChats(ctx, selectChatQuery+" WHERE c.tenant_id = $1", tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get all chats")
 	}
@@ -393,8 +411,13 @@ func (g *ChatRepository) GetAll(ctx context.Context) ([]chat.Chat, error) {
 }
 
 func (g *ChatRepository) GetByID(ctx context.Context, id uint) (chat.Chat, error) {
-	q := repo.Join(selectChatQuery, "WHERE c.id = $1")
-	chats, err := g.queryChats(ctx, q, id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	q := repo.Join(selectChatQuery, "WHERE c.id = $1 AND c.tenant_id = $2")
+	chats, err := g.queryChats(ctx, q, id, tenant.ID)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get chat with id %d", id)
 	}
@@ -405,7 +428,12 @@ func (g *ChatRepository) GetByID(ctx context.Context, id uint) (chat.Chat, error
 }
 
 func (g *ChatRepository) GetByClientID(ctx context.Context, clientID uint) (chat.Chat, error) {
-	chats, err := g.queryChats(ctx, selectChatQuery+" WHERE c.client_id = $1", clientID)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	chats, err := g.queryChats(ctx, selectChatQuery+" WHERE c.client_id = $1 AND c.tenant_id = $2", clientID, tenant.ID)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get chat for client %d", clientID)
 	}
@@ -419,6 +447,7 @@ func (g *ChatRepository) GetMemberByContact(ctx context.Context, contactType str
 	query := `
 		SELECT 
 			cm.id,
+			cm.tenant_id,
 			cm.chat_id,
 			cm.user_id,
 			cm.client_id,
@@ -522,6 +551,7 @@ func (g *ChatRepository) insertChatMember(ctx context.Context, member *models.Ch
 		ctx,
 		insertChatMemberQuery,
 		member.ID,
+		member.TenantID,
 		member.ChatID,
 		member.UserID,
 		member.ClientID,
@@ -554,6 +584,7 @@ func (g *ChatRepository) updateChatMember(ctx context.Context, member *models.Ch
 	if _, err := tx.Exec(
 		ctx,
 		updateChatMemberQuery,
+		member.TenantID,
 		member.ChatID,
 		member.UserID,
 		member.ClientID,
@@ -660,12 +691,24 @@ func (g *ChatRepository) create(ctx context.Context, data chat.Chat) (chat.Chat,
 		return nil, errors.Wrap(err, "failed to check for existing chat")
 	}
 
+	q := repo.Insert(
+		"chats",
+		[]string{
+			"client_id",
+			"last_message_at",
+			"tenant_id",
+			"created_at",
+		},
+		"id",
+	)
+
 	if err := tx.QueryRow(
 		ctx,
-		insertChatQuery,
+		q,
 		dbChat.ClientID,
 		dbChat.LastMessageAt,
-		&dbChat.CreatedAt,
+		dbChat.TenantID,
+		dbChat.CreatedAt,
 	).Scan(&dbChat.ID); err != nil {
 		return nil, errors.Wrap(err, "failed to insert chat")
 	}
diff --git a/modules/crm/infrastructure/persistence/chat_repository_test.go b/modules/crm/infrastructure/persistence/chat_repository_test.go
index 75580f7b8..ae73d6e88 100644
--- a/modules/crm/infrastructure/persistence/chat_repository_test.go
+++ b/modules/crm/infrastructure/persistence/chat_repository_test.go
@@ -19,18 +19,13 @@ func createClientForTest(t *testing.T, f *testFixtures) client.Client {
 		corepersistence.NewPassportRepository(),
 	)
 
-	testClient := createTestClient(t, false)
+	testClient := createTestClient(t, f.tenant.ID, false)
 	created, err := repo.Save(f.ctx, testClient)
 	require.NoError(t, err, "Failed to create client for chat test")
 
 	return created
 }
 
-func createTestChat(t *testing.T, clientID uint) chat.Chat {
-	t.Helper()
-	return chat.New(clientID)
-}
-
 func TestChatRepository_Create(t *testing.T) {
 	t.Parallel()
 	f := setupTest(t)
@@ -38,7 +33,7 @@ func TestChatRepository_Create(t *testing.T) {
 
 	t.Run("Create chat without messages", func(t *testing.T) {
 		clientID := createClientForTest(t, f).ID()
-		testChat := createTestChat(t, clientID)
+		testChat := chat.New(clientID, chat.WithTenantID(f.tenant.ID))
 
 		created, err := repo.Save(f.ctx, testChat)
 		require.NoError(t, err, "Failed to create chat")
@@ -52,7 +47,7 @@ func TestChatRepository_Create(t *testing.T) {
 
 	t.Run("Create chat with messages", func(t *testing.T) {
 		client_ := createClientForTest(t, f)
-		testChat := createTestChat(t, client_.ID())
+		testChat := chat.New(client_.ID(), chat.WithTenantID(f.tenant.ID))
 		member := chat.NewMember(
 			chat.NewClientSender(
 				client_.ID(),
@@ -61,6 +56,7 @@ func TestChatRepository_Create(t *testing.T) {
 				"1234567890",
 			),
 			chat.TelegramTransport,
+			chat.WithMemberTenantID(f.tenant.ID),
 		)
 
 		// Add a message to the chat
@@ -84,7 +80,7 @@ func TestChatRepository_GetByID(t *testing.T) {
 	repo := persistence.NewChatRepository()
 
 	clientID := createClientForTest(t, f).ID()
-	testChat := createTestChat(t, clientID)
+	testChat := chat.New(clientID, chat.WithTenantID(f.tenant.ID))
 	created, err := repo.Save(f.ctx, testChat)
 	require.NoError(t, err, "Failed to create test chat")
 
@@ -110,7 +106,7 @@ func TestChatRepository_GetByClientID(t *testing.T) {
 	repo := persistence.NewChatRepository()
 
 	clientID := createClientForTest(t, f).ID()
-	testChat := createTestChat(t, clientID)
+	testChat := chat.New(clientID, chat.WithTenantID(f.tenant.ID))
 	created, err := repo.Save(f.ctx, testChat)
 	require.NoError(t, err, "Failed to create test chat")
 
@@ -139,7 +135,7 @@ func TestChatRepository_AddMessageThroughUpdate(t *testing.T) {
 
 	// Create a chat first
 	client_ := createClientForTest(t, f)
-	testChat := createTestChat(t, client_.ID())
+	testChat := chat.New(client_.ID(), chat.WithTenantID(f.tenant.ID))
 	created, err := repo.Save(f.ctx, testChat)
 	require.NoError(t, err, "Failed to create test chat")
 
@@ -152,6 +148,7 @@ func TestChatRepository_AddMessageThroughUpdate(t *testing.T) {
 			client_.LastName(),
 		),
 		chat.TelegramTransport,
+		chat.WithMemberTenantID(f.tenant.ID),
 	))
 	updatedChat := created.AddMessage(message)
 
@@ -181,7 +178,7 @@ func TestChatRepository_Update(t *testing.T) {
 	_, err := clientRepo.Save(f.ctx, testClient)
 	require.NoError(t, err, "Failed to save test client")
 
-	testChat := createTestChat(t, testClient.ID())
+	testChat := chat.New(testClient.ID(), chat.WithTenantID(f.tenant.ID))
 	created, err := repo.Save(f.ctx, testChat)
 	require.NoError(t, err, "Failed to create test chat")
 
@@ -194,6 +191,7 @@ func TestChatRepository_Update(t *testing.T) {
 			testClient.LastName(),
 		),
 		chat.TelegramTransport,
+		chat.WithMemberTenantID(f.tenant.ID),
 	))
 	updatedChat := created.AddMessage(message)
 
@@ -215,6 +213,7 @@ func TestChatRepository_Update(t *testing.T) {
 			testClient.LastName(),
 		),
 		chat.TelegramTransport,
+		chat.WithMemberTenantID(f.tenant.ID),
 	))
 	chatWithTwoMessages := updated.AddMessage(secondMessage)
 
@@ -233,7 +232,7 @@ func TestChatRepository_GetPaginated(t *testing.T) {
 
 	for i := 0; i < 5; i++ {
 		testClient := createClientForTest(t, f)
-		testChat := createTestChat(t, testClient.ID())
+		testChat := chat.New(testClient.ID(), chat.WithTenantID(f.tenant.ID))
 
 		// Add a message with the client's ID in it
 		message := chat.NewMessage("Message for client "+string('0'+byte(i)), chat.NewMember(
@@ -244,6 +243,7 @@ func TestChatRepository_GetPaginated(t *testing.T) {
 				testClient.LastName(),
 			),
 			chat.TelegramTransport,
+			chat.WithMemberTenantID(f.tenant.ID),
 		))
 		testChat = testChat.AddMessage(message)
 
@@ -313,7 +313,7 @@ func TestChatRepository_Count(t *testing.T) {
 	numChats := 3
 	for i := 0; i < numChats; i++ {
 		clientID := createClientForTest(t, f).ID()
-		testChat := createTestChat(t, clientID)
+		testChat := chat.New(clientID, chat.WithTenantID(f.tenant.ID))
 		_, err := repo.Save(f.ctx, testChat)
 		require.NoError(t, err, "Failed to create test chat %d", i)
 	}
@@ -338,7 +338,7 @@ func TestChatRepository_GetAll(t *testing.T) {
 	numNewChats := 2
 	for i := 0; i < numNewChats; i++ {
 		clientID := createClientForTest(t, f).ID()
-		testChat := createTestChat(t, clientID)
+		testChat := chat.New(clientID, chat.WithTenantID(f.tenant.ID))
 		_, err := repo.Save(f.ctx, testChat)
 		require.NoError(t, err, "Failed to create test chat %d", i)
 	}
@@ -358,7 +358,7 @@ func TestChatRepository_Delete(t *testing.T) {
 
 	// Create a chat
 	testClient := createClientForTest(t, f)
-	testChat := createTestChat(t, testClient.ID())
+	testChat := chat.New(testClient.ID(), chat.WithTenantID(f.tenant.ID))
 
 	// Add a message to test cascade deletion
 	message := chat.NewMessage("Message to be deleted", chat.NewMember(
@@ -369,6 +369,7 @@ func TestChatRepository_Delete(t *testing.T) {
 			testClient.LastName(),
 		),
 		chat.TelegramTransport,
+		chat.WithMemberTenantID(f.tenant.ID),
 	))
 	testChat = testChat.AddMessage(message)
 
@@ -392,7 +393,7 @@ func TestChatRepository_Search(t *testing.T) {
 
 	for i := 0; i < 5; i++ {
 		testClient := createClientForTest(t, f)
-		testChat := createTestChat(t, testClient.ID())
+		testChat := chat.New(testClient.ID(), chat.WithTenantID(f.tenant.ID))
 		_, err := chatRepo.Save(f.ctx, testChat)
 		require.NoError(t, err, "Failed to create test chat for client %d", i)
 	}
diff --git a/modules/crm/infrastructure/persistence/client_repository.go b/modules/crm/infrastructure/persistence/client_repository.go
index 47f892768..4e27dae44 100644
--- a/modules/crm/infrastructure/persistence/client_repository.go
+++ b/modules/crm/infrastructure/persistence/client_repository.go
@@ -21,7 +21,7 @@ var (
 
 const (
 	selectClientQuery = `
-		SELECT 
+		SELECT
 			c.id,
 			c.first_name,
 			c.last_name,
@@ -211,6 +211,7 @@ func (g *ClientRepository) exists(ctx context.Context, id uint) (bool, error) {
 	if err != nil {
 		return false, err
 	}
+
 	var exists bool
 	if err := pool.QueryRow(ctx, clientExistsQuery, id).Scan(&exists); err != nil {
 		return false, err
@@ -221,7 +222,14 @@ func (g *ClientRepository) exists(ctx context.Context, id uint) (bool, error) {
 func (g *ClientRepository) GetPaginated(
 	ctx context.Context, params *client.FindParams,
 ) ([]client.Client, error) {
-	where, args := []string{"1 = 1"}, []interface{}{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	// Start with tenant filter
+	where, args := []string{"c.tenant_id = $1"}, []interface{}{tenant.ID}
+
 	if params.CreatedAt.To != "" && params.CreatedAt.From != "" {
 		where, args = append(where, fmt.Sprintf("c.created_at BETWEEN $%d and $%d", len(args)+1, len(args)+2)), append(args, params.CreatedAt.From, params.CreatedAt.To)
 	}
@@ -252,19 +260,35 @@ func (g *ClientRepository) Count(ctx context.Context) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	var count int64
-	if err := pool.QueryRow(ctx, countClientQuery).Scan(&count); err != nil {
+	if err := pool.QueryRow(ctx, countClientQuery+" WHERE tenant_id = $1", tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *ClientRepository) GetAll(ctx context.Context) ([]client.Client, error) {
-	return g.queryClients(ctx, selectClientQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	return g.queryClients(ctx, selectClientQuery+" WHERE c.tenant_id = $1", tenant.ID)
 }
 
 func (g *ClientRepository) GetByID(ctx context.Context, id uint) (client.Client, error) {
-	clients, err := g.queryClients(ctx, selectClientQuery+" WHERE c.id = $1", id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	clients, err := g.queryClients(ctx, selectClientQuery+" WHERE c.id = $1 AND c.tenant_id = $2", id, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -275,7 +299,12 @@ func (g *ClientRepository) GetByID(ctx context.Context, id uint) (client.Client,
 }
 
 func (g *ClientRepository) GetByPhone(ctx context.Context, phoneNumber string) (client.Client, error) {
-	clients, err := g.queryClients(ctx, selectClientQuery+" WHERE c.phone_number = $1", phoneNumber)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	clients, err := g.queryClients(ctx, selectClientQuery+" WHERE c.phone_number = $1 AND c.tenant_id = $2", phoneNumber, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -291,7 +320,13 @@ func (g *ClientRepository) create(ctx context.Context, data client.Client) (clie
 		return nil, err
 	}
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	dbRow := ToDBClient(data)
+	dbRow.TenantID = tenant.ID.String()
 
 	if data.Passport() != nil {
 		p, err := g.passportRepo.Save(ctx, data.Passport())
@@ -305,6 +340,7 @@ func (g *ClientRepository) create(ctx context.Context, data client.Client) (clie
 	}
 
 	fields := []string{
+		"tenant_id",
 		"first_name",
 		"last_name",
 		"middle_name",
@@ -320,6 +356,7 @@ func (g *ClientRepository) create(ctx context.Context, data client.Client) (clie
 	}
 
 	values := []interface{}{
+		dbRow.TenantID,
 		dbRow.FirstName,
 		dbRow.LastName,
 		dbRow.MiddleName,
@@ -340,8 +377,8 @@ func (g *ClientRepository) create(ctx context.Context, data client.Client) (clie
 			values = append(values, efs.Value(k))
 		}
 	}
-
-	if err := tx.QueryRow(ctx, repo.Insert("clients", fields, "id"), values...).Scan(&dbRow.ID); err != nil {
+	q := repo.Insert("clients", fields, "id")
+	if err := tx.QueryRow(ctx, q, values...).Scan(&dbRow.ID); err != nil {
 		return nil, err
 	}
 
@@ -400,7 +437,14 @@ func (g *ClientRepository) update(ctx context.Context, data client.Client) (clie
 		return nil, err
 	}
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	dbRow := ToDBClient(data)
+	dbRow.TenantID = tenant.ID.String()
+
 	if data.Passport() != nil {
 		p, err := g.passportRepo.Save(ctx, data.Passport())
 		if err != nil {
@@ -449,11 +493,11 @@ func (g *ClientRepository) update(ctx context.Context, data client.Client) (clie
 		}
 	}
 
-	values = append(values, data.ID())
+	values = append(values, data.ID(), tenant.ID)
 
 	if _, err := tx.Exec(
 		ctx,
-		repo.Update("clients", fields, fmt.Sprintf("id = $%d", len(values))),
+		repo.Update("clients", fields, fmt.Sprintf("id = $%d AND tenant_id = $%d", len(values)-1, len(values))),
 		values...,
 	); err != nil {
 		return nil, err
@@ -527,6 +571,11 @@ func (g *ClientRepository) Delete(ctx context.Context, id uint) error {
 		return err
 	}
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	var passportID sql.NullString
 	err = tx.QueryRow(ctx, selectClientPassportQuery, id).Scan(&passportID)
 	if err != nil && err != sql.ErrNoRows {
@@ -545,7 +594,7 @@ func (g *ClientRepository) Delete(ctx context.Context, id uint) error {
 		return err
 	}
 
-	if _, err := tx.Exec(ctx, deleteClientQuery, id); err != nil {
+	if _, err := tx.Exec(ctx, deleteClientQuery+" AND tenant_id = $2", id, tenant.ID); err != nil {
 		return err
 	}
 
diff --git a/modules/crm/infrastructure/persistence/client_repository_test.go b/modules/crm/infrastructure/persistence/client_repository_test.go
index ca2b60ded..32aeca1a0 100644
--- a/modules/crm/infrastructure/persistence/client_repository_test.go
+++ b/modules/crm/infrastructure/persistence/client_repository_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/country"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/general"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
@@ -36,14 +37,13 @@ func createTestPassport() passport.Passport {
 	)
 }
 
-func createTestClient(t *testing.T, withPassport bool) client.Client {
+func createTestClient(t *testing.T, tenantID uuid.UUID, withPassport bool) client.Client {
 	t.Helper()
 	p, err := phone.NewFromE164("12345678901")
 	require.NoError(t, err, "Failed to create phone number")
 
 	birthDate := time.Date(1990, 1, 1, 0, 0, 0, 0, time.UTC)
-	email, err := internet.NewEmail("john.doe@example.com")
-	require.NoError(t, err, "Failed to create email")
+	email := internet.MustParseEmail("john.doe@example.com")
 
 	pin, err := tax.NewPin("12345678901234", country.Uzbekistan)
 	require.NoError(t, err, "Failed to create tax ID")
@@ -81,7 +81,7 @@ func TestClientRepository_Create(t *testing.T) {
 	)
 
 	t.Run("Create client without passport", func(t *testing.T) {
-		testClient := createTestClient(t, false)
+		testClient := createTestClient(t, f.tenant.ID, false)
 
 		created, err := repo.Save(f.ctx, testClient)
 		require.NoError(t, err, "Failed to create client")
@@ -95,7 +95,7 @@ func TestClientRepository_Create(t *testing.T) {
 	})
 
 	t.Run("Create client with passport", func(t *testing.T) {
-		testClient := createTestClient(t, true)
+		testClient := createTestClient(t, f.tenant.ID, true)
 
 		created, err := repo.Save(f.ctx, testClient)
 		require.NoError(t, err, "Failed to create client with passport")
@@ -115,7 +115,7 @@ func TestClientRepository_GetByID(t *testing.T) {
 		corepersistence.NewPassportRepository(),
 	)
 
-	testClient := createTestClient(t, true)
+	testClient := createTestClient(t, f.tenant.ID, true)
 	created, err := repo.Save(f.ctx, testClient)
 	require.NoError(t, err, "Failed to create test client for GetByID")
 
@@ -428,7 +428,7 @@ func TestClientRepository_Delete(t *testing.T) {
 		corepersistence.NewPassportRepository(),
 	)
 
-	testClient := createTestClient(t, true)
+	testClient := createTestClient(t, f.tenant.ID, true)
 	created, err := clientRepo.Save(f.ctx, testClient)
 	require.NoError(t, err, "Failed to create test client for delete test")
 
diff --git a/modules/crm/infrastructure/persistence/crm_mappers.go b/modules/crm/infrastructure/persistence/crm_mappers.go
index 6dab13fe2..9ce1f7751 100644
--- a/modules/crm/infrastructure/persistence/crm_mappers.go
+++ b/modules/crm/infrastructure/persistence/crm_mappers.go
@@ -128,6 +128,7 @@ func ToDBClient(domainEntity client.Client) *models.Client {
 
 	return &models.Client{
 		ID:          domainEntity.ID(),
+		TenantID:    domainEntity.TenantID().String(),
 		FirstName:   domainEntity.FirstName(),
 		LastName:    mapping.ValueToSQLNullString(domainEntity.LastName()),
 		MiddleName:  mapping.ValueToSQLNullString(domainEntity.MiddleName()),
@@ -164,7 +165,11 @@ func ToDomainMessage(
 ) (chat.Message, error) {
 	uploads := make([]upload.Upload, 0, len(dbUploads))
 	for _, u := range dbUploads {
-		uploads = append(uploads, corepersistence.ToDomainUpload(u))
+		domainUpload, err := corepersistence.ToDomainUpload(u)
+		if err != nil {
+			return nil, err
+		}
+		uploads = append(uploads, domainUpload)
 	}
 	return chat.NewMessage(
 		dbRow.Message,
@@ -187,6 +192,7 @@ func ToDBChat(domainEntity chat.Chat) (*models.Chat, []*models.Message) {
 		ID:            domainEntity.ID(),
 		ClientID:      domainEntity.ClientID(),
 		CreatedAt:     domainEntity.CreatedAt(),
+		TenantID:      domainEntity.TenantID().String(),
 		LastMessageAt: mapping.PointerToSQLNullTime(domainEntity.LastMessageAt()),
 	}, dbMessages
 }
@@ -204,6 +210,7 @@ func ToDomainChat(dbRow *models.Chat, messages []chat.Message, members []chat.Me
 func ToDBChatMember(chatID uint, entity chat.Member) *models.ChatMember {
 	dbRow := &models.ChatMember{
 		ID:        entity.ID().String(),
+		TenantID:  entity.TenantID().String(),
 		ChatID:    chatID,
 		Transport: string(entity.Transport()),
 		CreatedAt: entity.CreatedAt(),
@@ -307,10 +314,17 @@ func ToDomainChatMember(dbMember *models.ChatMember) (chat.Member, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to parse member ID")
 	}
+
+	tenantID, err := uuid.Parse(dbMember.TenantID)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to parse tenant ID")
+	}
+
 	return chat.NewMember(
 		sender,
 		transport,
 		chat.WithMemberID(uid),
+		chat.WithMemberTenantID(tenantID),
 		chat.WithMemberCreatedAt(dbMember.CreatedAt),
 		chat.WithMemberUpdatedAt(dbMember.UpdatedAt),
 	), nil
diff --git a/modules/crm/infrastructure/persistence/crm_mappers_test.go b/modules/crm/infrastructure/persistence/crm_mappers_test.go
index d76e57f72..49661d59a 100644
--- a/modules/crm/infrastructure/persistence/crm_mappers_test.go
+++ b/modules/crm/infrastructure/persistence/crm_mappers_test.go
@@ -157,7 +157,7 @@ func TestToDBClient(t *testing.T) {
 	}{
 		{
 			name:   "complete client with all fields",
-			client: createTestClient(t, true),
+			client: createTestClient(t, uuid.Nil, true),
 			validateFn: func(t *testing.T, dbClient *models.Client) {
 				t.Helper()
 
@@ -177,7 +177,7 @@ func TestToDBClient(t *testing.T) {
 		},
 		{
 			name:   "client without passport",
-			client: createTestClient(t, false),
+			client: createTestClient(t, uuid.Nil, false),
 			validateFn: func(t *testing.T, dbClient *models.Client) {
 				t.Helper()
 				assert.Equal(t, "John", dbClient.FirstName, "FirstName should match")
@@ -288,6 +288,7 @@ func TestToDomainMessage(t *testing.T) {
 				{
 					ID:        1,
 					Path:      "test/file.jpg",
+					TenantID:  uuid.New().String(),
 					CreatedAt: now,
 				},
 			},
diff --git a/modules/crm/infrastructure/persistence/models/models.go b/modules/crm/infrastructure/persistence/models/models.go
index 207dc9cea..f97e25b6f 100644
--- a/modules/crm/infrastructure/persistence/models/models.go
+++ b/modules/crm/infrastructure/persistence/models/models.go
@@ -10,6 +10,7 @@ import (
 
 type Client struct {
 	ID          uint
+	TenantID    string
 	FirstName   string
 	LastName    sql.NullString
 	MiddleName  sql.NullString
@@ -36,6 +37,7 @@ type ClientContact struct {
 
 type Chat struct {
 	ID            uint
+	TenantID      string
 	ClientID      uint
 	LastMessageAt sql.NullTime
 	CreatedAt     time.Time
@@ -43,6 +45,7 @@ type Chat struct {
 
 type ChatMember struct {
 	ID              string
+	TenantID        string
 	ChatID          uint
 	UserID          sql.NullInt32
 	ClientID        sql.NullInt32
@@ -134,6 +137,7 @@ type WebsiteMeta struct {
 
 type MessageTemplate struct {
 	ID        uint
+	TenantID  string
 	Template  string
 	CreatedAt time.Time
 }
diff --git a/modules/crm/infrastructure/persistence/schema/crm-schema.sql b/modules/crm/infrastructure/persistence/schema/crm-schema.sql
index 705880ae1..a25b2b68b 100644
--- a/modules/crm/infrastructure/persistence/schema/crm-schema.sql
+++ b/modules/crm/infrastructure/persistence/schema/crm-schema.sql
@@ -1,5 +1,6 @@
 CREATE TABLE clients (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     first_name varchar(255) NOT NULL,
     last_name varchar(255),
     middle_name varchar(255),
@@ -26,6 +27,7 @@ CREATE TABLE client_contacts (
 
 CREATE TABLE chats (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     client_id int NOT NULL UNIQUE REFERENCES clients (id) ON DELETE RESTRICT ON UPDATE CASCADE,
     last_message_at timestamp(3) DEFAULT now(),
     created_at timestamp(3) DEFAULT now() NOT NULL
@@ -33,6 +35,7 @@ CREATE TABLE chats (
 
 CREATE TABLE chat_members (
     id uuid PRIMARY KEY DEFAULT gen_random_uuid (),
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     chat_id int NOT NULL REFERENCES chats (id) ON DELETE CASCADE,
     -- Whether user_id is not client_id, both can not be set
     user_id int REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE,
@@ -62,6 +65,7 @@ CREATE TABLE message_media (
 
 CREATE TABLE message_templates (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     template TEXT NOT NULL,
     created_at timestamp with time zone DEFAULT now()
 );
@@ -82,5 +86,11 @@ CREATE INDEX idx_clients_phone_number ON clients (phone_number);
 
 CREATE INDEX idx_clients_email ON clients (email);
 
+CREATE INDEX idx_clients_tenant_id ON clients (tenant_id);
+
 CREATE INDEX idx_client_contacts_client_id ON client_contacts (client_id);
 
+CREATE INDEX idx_chats_tenant_id ON chats (tenant_id);
+
+CREATE INDEX idx_message_templates_tenant_id ON message_templates (tenant_id);
+
diff --git a/modules/crm/infrastructure/persistence/setup_test.go b/modules/crm/infrastructure/persistence/setup_test.go
index 2dd6e44e6..6ab682572 100644
--- a/modules/crm/infrastructure/persistence/setup_test.go
+++ b/modules/crm/infrastructure/persistence/setup_test.go
@@ -21,9 +21,10 @@ func TestMain(m *testing.M) {
 
 // testFixtures contains common test dependencies
 type testFixtures struct {
-	ctx  context.Context
-	pool *pgxpool.Pool
-	app  application.Application
+	ctx    context.Context
+	pool   *pgxpool.Pool
+	tenant *composables.Tenant
+	app    application.Application
 }
 
 // setupTest creates all necessary dependencies for tests
@@ -33,7 +34,20 @@ func setupTest(t *testing.T) *testFixtures {
 	testutils.CreateDB(t.Name())
 	pool := testutils.NewPool(testutils.DbOpts(t.Name()))
 
+	// Setup application and run migrations
+	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	ctx := context.Background()
+	// Create a test tenant and add it to the context
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx = composables.WithTenant(ctx, tenant)
+
 	tx, err := pool.Begin(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -47,14 +61,16 @@ func setupTest(t *testing.T) *testFixtures {
 	})
 
 	ctx = composables.WithTx(ctx, tx)
-	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
-	if err != nil {
+
+	// Run migrations first to create all tables including tenants
+	if err := app.Migrations().Run(); err != nil {
 		t.Fatal(err)
 	}
 
 	return &testFixtures{
-		ctx:  ctx,
-		pool: pool,
-		app:  app,
+		ctx:    ctx,
+		pool:   pool,
+		app:    app,
+		tenant: tenant,
 	}
 }
diff --git a/modules/crm/presentation/locales/en.json b/modules/crm/presentation/locales/en.json
index 3cd7a3226..606b16463 100644
--- a/modules/crm/presentation/locales/en.json
+++ b/modules/crm/presentation/locales/en.json
@@ -124,7 +124,11 @@
 				"Title": "Instant messages"
 			},
 			"New": "New instant message",
-			"Content": "Content"
+			"Content": "Content",
+			"NoData": {
+				"Title": "No message templates found",
+				"_Description": "Create a new message template to get started"
+			}
 		},
 		"New": {
 			"Meta": {
diff --git a/modules/crm/presentation/locales/ru.json b/modules/crm/presentation/locales/ru.json
index 6ae528e2d..bbae393fa 100644
--- a/modules/crm/presentation/locales/ru.json
+++ b/modules/crm/presentation/locales/ru.json
@@ -124,7 +124,11 @@
         "Title": "Мгновенные сообщения"
       },
       "New": "Новое мгновенное сообщение",
-      "Content": "Содержание"
+      "Content": "Содержание",
+      "NoData": {
+        "Title": "Шаблоны сообщений не найдены",
+        "_Description": "Создайте новый шаблон сообщения для начала работы"
+      }
     },
     "New": {
       "Meta": {
diff --git a/modules/crm/presentation/locales/uz.json b/modules/crm/presentation/locales/uz.json
index 72e689c70..b09f4c864 100644
--- a/modules/crm/presentation/locales/uz.json
+++ b/modules/crm/presentation/locales/uz.json
@@ -124,7 +124,11 @@
 				"Title": "Tezkor xabarlar"
 			},
 			"New": "Yangi tezkor xabar",
-			"Content": "Mazmuni"
+			"Content": "Mazmuni",
+			"NoData": {
+				"Title": "Xabar shablonlari topilmadi",
+				"_Description": "Ish boshlash uchun yangi xabar shabloni yarating"
+			}
 		},
 		"New": {
 			"Meta": {
diff --git a/modules/crm/presentation/templates/pages/message-templates/message_templates.templ b/modules/crm/presentation/templates/pages/message-templates/message_templates.templ
index d1b97e63b..18ce1af87 100644
--- a/modules/crm/presentation/templates/pages/message-templates/message_templates.templ
+++ b/modules/crm/presentation/templates/pages/message-templates/message_templates.templ
@@ -20,25 +20,32 @@ type IndexPageProps struct {
 templ TemplatesTable(props *IndexPageProps) {
 	{{ pageCtx := composables.UsePageCtx(ctx) }}
 	<div class="flex flex-col gap-4 table-wrapper">
-		@base.Table(base.TableProps{
-			Columns: []*base.TableColumn{
-				{Label: pageCtx.T("MessageTemplates.List.Content"), Key: "content"},
-				{Label: pageCtx.T("Actions"), Class: "w-16"},
-			},
-		}) {
-			for _, template := range props.Templates {
-				@base.TableRow(base.TableRowProps{}) {
-					@base.TableCell(base.TableCellProps{}) {
-						{ template.Template }
-					}
-					@base.TableCell(base.TableCellProps{}) {
-						@button.Secondary(button.Props{
-							Fixed: true,
-							Size:  button.SizeSM,
-							Class: "btn-fixed",
-							Href:  fmt.Sprintf("%s/%s", props.BaseURL, template.ID),
-						}) {
-							@icons.PencilSimple(icons.Props{Size: "20"})
+		if len(props.Templates) == 0 {
+			@base.TableEmptyState(base.TableEmptyStateProps{
+				Title:       pageCtx.T("MessageTemplates.List.NoData.Title"),
+				Description: pageCtx.T("MessageTemplates.List.NoData._Description"),
+			})
+		} else {
+			@base.Table(base.TableProps{
+				Columns: []*base.TableColumn{
+					{Label: pageCtx.T("MessageTemplates.List.Content"), Key: "content"},
+					{Label: pageCtx.T("Actions"), Class: "w-16"},
+				},
+			}) {
+				for _, template := range props.Templates {
+					@base.TableRow(base.TableRowProps{}) {
+						@base.TableCell(base.TableCellProps{}) {
+							{ template.Template }
+						}
+						@base.TableCell(base.TableCellProps{}) {
+							@button.Secondary(button.Props{
+								Fixed: true,
+								Size:  button.SizeSM,
+								Class: "btn-fixed",
+								Href:  fmt.Sprintf("%s/%s", props.BaseURL, template.ID),
+							}) {
+								@icons.PencilSimple(icons.Props{Size: "20"})
+							}
 						}
 					}
 				}
diff --git a/modules/crm/presentation/templates/pages/message-templates/message_templates_templ.go b/modules/crm/presentation/templates/pages/message-templates/message_templates_templ.go
index 8f7d43624..14540f0f1 100644
--- a/modules/crm/presentation/templates/pages/message-templates/message_templates_templ.go
+++ b/modules/crm/presentation/templates/pages/message-templates/message_templates_templ.go
@@ -51,32 +51,29 @@ func TemplatesTable(props *IndexPageProps) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-			templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-			if !templ_7745c5c3_IsBuffer {
-				defer func() {
-					templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-					if templ_7745c5c3_Err == nil {
-						templ_7745c5c3_Err = templ_7745c5c3_BufErr
-					}
-				}()
+		if len(props.Templates) == 0 {
+			templ_7745c5c3_Err = base.TableEmptyState(base.TableEmptyStateProps{
+				Title:       pageCtx.T("MessageTemplates.List.NoData.Title"),
+				Description: pageCtx.T("MessageTemplates.List.NoData._Description"),
+			}).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
 			}
-			ctx = templ.InitializeContext(ctx)
-			for _, template := range props.Templates {
-				templ_7745c5c3_Var3 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-					templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-					templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-					if !templ_7745c5c3_IsBuffer {
-						defer func() {
-							templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-							if templ_7745c5c3_Err == nil {
-								templ_7745c5c3_Err = templ_7745c5c3_BufErr
-							}
-						}()
-					}
-					ctx = templ.InitializeContext(ctx)
-					templ_7745c5c3_Var4 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		} else {
+			templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+				templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+				templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+				if !templ_7745c5c3_IsBuffer {
+					defer func() {
+						templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+						if templ_7745c5c3_Err == nil {
+							templ_7745c5c3_Err = templ_7745c5c3_BufErr
+						}
+					}()
+				}
+				ctx = templ.InitializeContext(ctx)
+				for _, template := range props.Templates {
+					templ_7745c5c3_Var3 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 						templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 						templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
 						if !templ_7745c5c3_IsBuffer {
@@ -88,38 +85,38 @@ func TemplatesTable(props *IndexPageProps) templ.Component {
 							}()
 						}
 						ctx = templ.InitializeContext(ctx)
-						var templ_7745c5c3_Var5 string
-						templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(template.Template)
+						templ_7745c5c3_Var4 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+							templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+							templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+							if !templ_7745c5c3_IsBuffer {
+								defer func() {
+									templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+									if templ_7745c5c3_Err == nil {
+										templ_7745c5c3_Err = templ_7745c5c3_BufErr
+									}
+								}()
+							}
+							ctx = templ.InitializeContext(ctx)
+							var templ_7745c5c3_Var5 string
+							templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(template.Template)
+							if templ_7745c5c3_Err != nil {
+								return templ.Error{Err: templ_7745c5c3_Err, FileName: `modules/crm/presentation/templates/pages/message-templates/message_templates.templ`, Line: 38, Col: 26}
+							}
+							_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+							if templ_7745c5c3_Err != nil {
+								return templ_7745c5c3_Err
+							}
+							return nil
+						})
+						templ_7745c5c3_Err = base.TableCell(base.TableCellProps{}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer)
 						if templ_7745c5c3_Err != nil {
-							return templ.Error{Err: templ_7745c5c3_Err, FileName: `modules/crm/presentation/templates/pages/message-templates/message_templates.templ`, Line: 32, Col: 25}
+							return templ_7745c5c3_Err
 						}
-						_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+						templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, " ")
 						if templ_7745c5c3_Err != nil {
 							return templ_7745c5c3_Err
 						}
-						return nil
-					})
-					templ_7745c5c3_Err = base.TableCell(base.TableCellProps{}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer)
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, " ")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					templ_7745c5c3_Var6 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-						templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-						templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-						if !templ_7745c5c3_IsBuffer {
-							defer func() {
-								templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-								if templ_7745c5c3_Err == nil {
-									templ_7745c5c3_Err = templ_7745c5c3_BufErr
-								}
-							}()
-						}
-						ctx = templ.InitializeContext(ctx)
-						templ_7745c5c3_Var7 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+						templ_7745c5c3_Var6 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 							templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 							templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
 							if !templ_7745c5c3_IsBuffer {
@@ -131,44 +128,57 @@ func TemplatesTable(props *IndexPageProps) templ.Component {
 								}()
 							}
 							ctx = templ.InitializeContext(ctx)
-							templ_7745c5c3_Err = icons.PencilSimple(icons.Props{Size: "20"}).Render(ctx, templ_7745c5c3_Buffer)
+							templ_7745c5c3_Var7 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+								templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+								templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+								if !templ_7745c5c3_IsBuffer {
+									defer func() {
+										templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+										if templ_7745c5c3_Err == nil {
+											templ_7745c5c3_Err = templ_7745c5c3_BufErr
+										}
+									}()
+								}
+								ctx = templ.InitializeContext(ctx)
+								templ_7745c5c3_Err = icons.PencilSimple(icons.Props{Size: "20"}).Render(ctx, templ_7745c5c3_Buffer)
+								if templ_7745c5c3_Err != nil {
+									return templ_7745c5c3_Err
+								}
+								return nil
+							})
+							templ_7745c5c3_Err = button.Secondary(button.Props{
+								Fixed: true,
+								Size:  button.SizeSM,
+								Class: "btn-fixed",
+								Href:  fmt.Sprintf("%s/%s", props.BaseURL, template.ID),
+							}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var7), templ_7745c5c3_Buffer)
 							if templ_7745c5c3_Err != nil {
 								return templ_7745c5c3_Err
 							}
 							return nil
 						})
-						templ_7745c5c3_Err = button.Secondary(button.Props{
-							Fixed: true,
-							Size:  button.SizeSM,
-							Class: "btn-fixed",
-							Href:  fmt.Sprintf("%s/%s", props.BaseURL, template.ID),
-						}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var7), templ_7745c5c3_Buffer)
+						templ_7745c5c3_Err = base.TableCell(base.TableCellProps{}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer)
 						if templ_7745c5c3_Err != nil {
 							return templ_7745c5c3_Err
 						}
 						return nil
 					})
-					templ_7745c5c3_Err = base.TableCell(base.TableCellProps{}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer)
+					templ_7745c5c3_Err = base.TableRow(base.TableRowProps{}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer)
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					return nil
-				})
-				templ_7745c5c3_Err = base.TableRow(base.TableRowProps{}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
 				}
+				return nil
+			})
+			templ_7745c5c3_Err = base.Table(base.TableProps{
+				Columns: []*base.TableColumn{
+					{Label: pageCtx.T("MessageTemplates.List.Content"), Key: "content"},
+					{Label: pageCtx.T("Actions"), Class: "w-16"},
+				},
+			}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
 			}
-			return nil
-		})
-		templ_7745c5c3_Err = base.Table(base.TableProps{
-			Columns: []*base.TableColumn{
-				{Label: pageCtx.T("MessageTemplates.List.Content"), Key: "content"},
-				{Label: pageCtx.T("Actions"), Class: "w-16"},
-			},
-		}).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
 		}
 		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</div>")
 		if templ_7745c5c3_Err != nil {
@@ -207,7 +217,7 @@ func TemplatesContent(props *IndexPageProps) templ.Component {
 		var templ_7745c5c3_Var9 string
 		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(pageCtx.T("MessageTemplates.List.Meta.Title"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `modules/crm/presentation/templates/pages/message-templates/message_templates.templ`, Line: 54, Col: 50}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `modules/crm/presentation/templates/pages/message-templates/message_templates.templ`, Line: 61, Col: 50}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 		if templ_7745c5c3_Err != nil {
@@ -220,7 +230,7 @@ func TemplatesContent(props *IndexPageProps) templ.Component {
 		var templ_7745c5c3_Var10 string
 		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(props.BaseURL)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `modules/crm/presentation/templates/pages/message-templates/message_templates.templ`, Line: 59, Col: 26}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `modules/crm/presentation/templates/pages/message-templates/message_templates.templ`, Line: 66, Col: 26}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 		if templ_7745c5c3_Err != nil {
@@ -254,7 +264,7 @@ func TemplatesContent(props *IndexPageProps) templ.Component {
 			var templ_7745c5c3_Var12 string
 			templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(pageCtx.T("MessageTemplates.List.New"))
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `modules/crm/presentation/templates/pages/message-templates/message_templates.templ`, Line: 75, Col: 45}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `modules/crm/presentation/templates/pages/message-templates/message_templates.templ`, Line: 82, Col: 45}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 			if templ_7745c5c3_Err != nil {
diff --git a/modules/crm/services/chat_service.go b/modules/crm/services/chat_service.go
index 020ca898d..5c5f65cc4 100644
--- a/modules/crm/services/chat_service.go
+++ b/modules/crm/services/chat_service.go
@@ -76,9 +76,7 @@ func (s *ChatService) GetByClientID(ctx context.Context, clientID uint) (chat.Ch
 	return s.repo.GetByClientID(ctx, clientID)
 }
 
-// GetByClientIDOrCreate retrieves a chat by client ID or creates a new one if it doesn't exist
 func (s *ChatService) GetByClientIDOrCreate(ctx context.Context, clientID uint) (chat.Chat, error) {
-	// First try to get without transaction
 	chatEntity, err := s.repo.GetByClientID(ctx, clientID)
 	if err == nil {
 		return chatEntity, nil
@@ -88,7 +86,6 @@ func (s *ChatService) GetByClientIDOrCreate(ctx context.Context, clientID uint)
 	}
 
 	var createdEntity chat.Chat
-	// Need to create chat, start a transaction
 	err = composables.InTx(ctx, func(txCtx context.Context) error {
 		client, err := s.clientRepo.GetByID(txCtx, clientID)
 		if err != nil {
diff --git a/modules/finance/domain/aggregates/expense_category/expense_category.go b/modules/finance/domain/aggregates/expense_category/expense_category.go
index b9ed3f703..4aea1a1c5 100644
--- a/modules/finance/domain/aggregates/expense_category/expense_category.go
+++ b/modules/finance/domain/aggregates/expense_category/expense_category.go
@@ -3,6 +3,7 @@ package category
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/currency"
 )
 
@@ -51,9 +52,16 @@ func WithUpdatedAt(updatedAt time.Time) Option {
 	}
 }
 
+func WithTenantID(tenantID uuid.UUID) Option {
+	return func(e *expenseCategory) {
+		e.tenantID = tenantID
+	}
+}
+
 // Interface
 type ExpenseCategory interface {
 	ID() uint
+	TenantID() uuid.UUID
 	Name() string
 	Description() string
 	Amount() float64
@@ -73,6 +81,7 @@ func New(
 ) ExpenseCategory {
 	e := &expenseCategory{
 		id:          0,
+		tenantID:    uuid.Nil,
 		name:        name,
 		description: "", // description is optional
 		amount:      amount,
@@ -88,6 +97,7 @@ func New(
 
 type expenseCategory struct {
 	id          uint
+	tenantID    uuid.UUID
 	name        string
 	description string
 	amount      float64
@@ -100,6 +110,10 @@ func (e *expenseCategory) ID() uint {
 	return e.id
 }
 
+func (e *expenseCategory) TenantID() uuid.UUID {
+	return e.tenantID
+}
+
 func (e *expenseCategory) Name() string {
 	return e.name
 }
@@ -118,6 +132,7 @@ func (e *expenseCategory) UpdateAmount(a float64) ExpenseCategory {
 		a,
 		e.currency,
 		WithID(e.id),
+		WithTenantID(e.tenantID),
 		WithDescription(e.description),
 		WithCreatedAt(e.createdAt),
 		WithUpdatedAt(time.Now()),
diff --git a/modules/finance/domain/aggregates/money_account/account.go b/modules/finance/domain/aggregates/money_account/account.go
index 8e0f2287e..b5dc86969 100644
--- a/modules/finance/domain/aggregates/money_account/account.go
+++ b/modules/finance/domain/aggregates/money_account/account.go
@@ -3,6 +3,7 @@ package moneyaccount
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/currency"
 	"github.com/iota-uz/iota-sdk/modules/finance/domain/entities/transaction"
 
@@ -13,6 +14,7 @@ import (
 
 type Account struct {
 	ID            uint
+	TenantID      uuid.UUID
 	Name          string
 	AccountNumber string
 	Description   string
@@ -64,6 +66,7 @@ func (p *UpdateDTO) ToEntity(id uint) (*Account, error) {
 	}
 	return &Account{
 		ID:            id,
+		TenantID:      uuid.Nil,
 		Name:          p.Name,
 		AccountNumber: p.AccountNumber,
 		Balance:       p.Balance,
diff --git a/modules/finance/domain/aggregates/money_account/account_dto.go b/modules/finance/domain/aggregates/money_account/account_dto.go
index a8a591079..a674742b8 100644
--- a/modules/finance/domain/aggregates/money_account/account_dto.go
+++ b/modules/finance/domain/aggregates/money_account/account_dto.go
@@ -5,6 +5,7 @@ import (
 
 	ut "github.com/go-playground/universal-translator"
 	"github.com/go-playground/validator/v10"
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/currency"
 	"github.com/iota-uz/iota-sdk/pkg/constants"
 )
@@ -44,6 +45,7 @@ func (p *CreateDTO) ToEntity() (*Account, error) {
 	}
 	return &Account{
 		ID:            0,
+		TenantID:      uuid.Nil,
 		Name:          p.Name,
 		AccountNumber: p.AccountNumber,
 		Balance:       p.Balance,
diff --git a/modules/finance/domain/aggregates/payment/payment.go b/modules/finance/domain/aggregates/payment/payment.go
index 5e3ad4ba7..60731de1b 100644
--- a/modules/finance/domain/aggregates/payment/payment.go
+++ b/modules/finance/domain/aggregates/payment/payment.go
@@ -3,6 +3,7 @@ package payment
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/user"
 	moneyaccount "github.com/iota-uz/iota-sdk/modules/finance/domain/aggregates/money_account"
 )
@@ -11,6 +12,9 @@ type Payment interface {
 	ID() uint
 	SetID(id uint)
 
+	TenantID() uuid.UUID
+	SetTenantID(id uuid.UUID)
+
 	Amount() float64
 	SetAmount(amount float64)
 
diff --git a/modules/finance/domain/aggregates/payment/payment_dto.go b/modules/finance/domain/aggregates/payment/payment_dto.go
index 2d7865851..29e504030 100644
--- a/modules/finance/domain/aggregates/payment/payment_dto.go
+++ b/modules/finance/domain/aggregates/payment/payment_dto.go
@@ -5,6 +5,7 @@ import (
 
 	ut "github.com/go-playground/universal-translator"
 	"github.com/go-playground/validator/v10"
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/user"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
 	moneyaccount "github.com/iota-uz/iota-sdk/modules/finance/domain/aggregates/money_account"
@@ -91,6 +92,7 @@ func (p *UpdateDTO) ToEntity(id uint) Payment {
 
 	return NewWithID(
 		id,
+		uuid.Nil, // TenantID will be set in repository
 		p.Amount,
 		0,
 		p.CounterpartyID,
diff --git a/modules/finance/domain/aggregates/payment/payment_impl.go b/modules/finance/domain/aggregates/payment/payment_impl.go
index 57be8b805..9dbe4ad82 100644
--- a/modules/finance/domain/aggregates/payment/payment_impl.go
+++ b/modules/finance/domain/aggregates/payment/payment_impl.go
@@ -3,12 +3,14 @@ package payment
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/user"
 	moneyaccount "github.com/iota-uz/iota-sdk/modules/finance/domain/aggregates/money_account"
 )
 
 func NewWithID(
 	id uint,
+	tenantID uuid.UUID,
 	amount float64,
 	transactionID, counterpartyID uint,
 	comment string,
@@ -18,6 +20,7 @@ func NewWithID(
 ) Payment {
 	return &payment{
 		id:               id,
+		tenantID:         tenantID,
 		amount:           amount,
 		account:          account,
 		transactionID:    transactionID,
@@ -41,6 +44,7 @@ func New(
 ) Payment {
 	return NewWithID(
 		0,
+		uuid.Nil,
 		amount,
 		transactionID,
 		counterpartyID,
@@ -56,6 +60,7 @@ func New(
 
 type payment struct {
 	id               uint
+	tenantID         uuid.UUID
 	amount           float64
 	transactionID    uint
 	counterpartyID   uint
@@ -140,3 +145,11 @@ func (p *payment) CreatedAt() time.Time {
 func (p *payment) UpdatedAt() time.Time {
 	return p.updatedAt
 }
+
+func (p *payment) TenantID() uuid.UUID {
+	return p.tenantID
+}
+
+func (p *payment) SetTenantID(id uuid.UUID) {
+	p.tenantID = id
+}
diff --git a/modules/finance/domain/entities/transaction/transaction.go b/modules/finance/domain/entities/transaction/transaction.go
index bfe436895..4fb58c55c 100644
--- a/modules/finance/domain/entities/transaction/transaction.go
+++ b/modules/finance/domain/entities/transaction/transaction.go
@@ -2,10 +2,13 @@ package transaction
 
 import (
 	"time"
+
+	"github.com/google/uuid"
 )
 
 type Transaction struct {
 	ID                   uint
+	TenantID             uuid.UUID
 	Amount               float64
 	OriginAccountID      *uint
 	DestinationAccountID *uint
@@ -34,6 +37,7 @@ func NewDeposit(
 	}
 	return &Transaction{
 		ID:                   0,
+		TenantID:             uuid.Nil,
 		Amount:               amount,
 		OriginAccountID:      origAccID,
 		DestinationAccountID: destAccID,
@@ -63,6 +67,7 @@ func NewWithdrawal(
 	}
 	return &Transaction{
 		ID:                   0,
+		TenantID:             uuid.Nil,
 		Amount:               amount,
 		OriginAccountID:      origAccID,
 		DestinationAccountID: destAccID,
diff --git a/modules/finance/infrastructure/persistence/counterparty_repository.go b/modules/finance/infrastructure/persistence/counterparty_repository.go
index 4b883a622..e3c964855 100644
--- a/modules/finance/infrastructure/persistence/counterparty_repository.go
+++ b/modules/finance/infrastructure/persistence/counterparty_repository.go
@@ -36,9 +36,10 @@ const (
 			legal_type,
 			legal_address,
 			created_at,
-			updated_at
+			updated_at,
+			tenant_id
 		)
-		VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING id`
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING id`
 	updateCounterpartyQuery = `
 		UPDATE counterparty
 		SET name = $1, tin = $2, type = $3, legal_type = $4, legal_address = $5, updated_at = $6
@@ -107,6 +108,12 @@ func (g *GormCounterpartyRepository) Create(ctx context.Context, data counterpar
 	if err != nil {
 		return nil, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	args := []interface{}{
 		entity.Name,
 		entity.Tin,
@@ -115,6 +122,7 @@ func (g *GormCounterpartyRepository) Create(ctx context.Context, data counterpar
 		entity.LegalAddress,
 		entity.CreatedAt,
 		entity.UpdatedAt,
+		tenant.ID,
 	}
 	row := tx.QueryRow(ctx, insertCounterpartyQuery, args...)
 	var id uint
diff --git a/modules/finance/infrastructure/persistence/expense_category_repository.go b/modules/finance/infrastructure/persistence/expense_category_repository.go
index 1b08c6068..078936532 100644
--- a/modules/finance/infrastructure/persistence/expense_category_repository.go
+++ b/modules/finance/infrastructure/persistence/expense_category_repository.go
@@ -18,8 +18,9 @@ var (
 
 const (
 	selectExpenseCategoryQuery = `
-		SELECT 
+		SELECT
 			ec.id,
+			ec.tenant_id,
 			ec.name,
 			ec.description,
 			ec.amount_currency_id,
@@ -36,14 +37,15 @@ const (
 	countExpenseCategoryQuery  = `SELECT COUNT(*) as count FROM expense_categories ec`
 	insertExpenseCategoryQuery = `
 	INSERT INTO expense_categories (
-		name, 
-		description, 
-		amount, 
+		tenant_id,
+		name,
+		description,
+		amount,
 		amount_currency_id
 	)
-	VALUES ($1, $2, $3, $4) RETURNING id`
-	updateExpenseCategoryQuery = `UPDATE expense_categories SET name = $1, description = $2, amount = $3, amount_currency_id = $4 WHERE id = $5`
-	deleteExpenseCategoryQuery = `DELETE FROM expense_categories WHERE id = $1`
+	VALUES ($1, $2, $3, $4, $5) RETURNING id`
+	updateExpenseCategoryQuery = `UPDATE expense_categories SET name = $1, description = $2, amount = $3, amount_currency_id = $4 WHERE id = $5 AND tenant_id = $6`
+	deleteExpenseCategoryQuery = `DELETE FROM expense_categories WHERE id = $1 AND tenant_id = $2`
 )
 
 type GormExpenseCategoryRepository struct {
@@ -64,9 +66,14 @@ func NewExpenseCategoryRepository() category.Repository {
 	}
 }
 
-func (g *GormExpenseCategoryRepository) buildCategoryFilters(params *category.FindParams) ([]string, []interface{}, error) {
-	where := []string{"1 = 1"}
-	args := []interface{}{}
+func (g *GormExpenseCategoryRepository) buildCategoryFilters(ctx context.Context, params *category.FindParams) ([]string, []interface{}, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where := []string{"ec.tenant_id = $1"}
+	args := []interface{}{tenant.ID.String()}
 
 	for _, filter := range params.Filters {
 		column, ok := g.fieldMap[filter.Column]
@@ -111,6 +118,7 @@ func (g *GormExpenseCategoryRepository) queryCategories(ctx context.Context, que
 		var c coremodels.Currency
 		if err := rows.Scan(
 			&ec.ID,
+			&ec.TenantID,
 			&ec.Name,
 			&ec.Description,
 			&ec.AmountCurrencyID,
@@ -141,7 +149,7 @@ func (g *GormExpenseCategoryRepository) queryCategories(ctx context.Context, que
 func (g *GormExpenseCategoryRepository) GetPaginated(
 	ctx context.Context, params *category.FindParams,
 ) ([]category.ExpenseCategory, error) {
-	where, args, err := g.buildCategoryFilters(params)
+	where, args, err := g.buildCategoryFilters(ctx, params)
 	if err != nil {
 		return nil, fmt.Errorf("failed to build filters: %w", err)
 	}
@@ -162,7 +170,7 @@ func (g *GormExpenseCategoryRepository) Count(ctx context.Context, params *categ
 		return 0, fmt.Errorf("failed to get transaction: %w", err)
 	}
 
-	where, args, err := g.buildCategoryFilters(params)
+	where, args, err := g.buildCategoryFilters(ctx, params)
 	if err != nil {
 		return 0, fmt.Errorf("failed to build filters: %w", err)
 	}
@@ -181,17 +189,31 @@ func (g *GormExpenseCategoryRepository) Count(ctx context.Context, params *categ
 }
 
 func (g *GormExpenseCategoryRepository) GetAll(ctx context.Context) ([]category.ExpenseCategory, error) {
-	query := selectExpenseCategoryQuery
-	return g.queryCategories(ctx, query)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	query := repo.Join(
+		selectExpenseCategoryQuery,
+		repo.JoinWhere("ec.tenant_id = $1"),
+	)
+
+	return g.queryCategories(ctx, query, tenant.ID.String())
 }
 
 func (g *GormExpenseCategoryRepository) GetByID(ctx context.Context, id uint) (category.ExpenseCategory, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	query := repo.Join(
 		selectExpenseCategoryQuery,
-		repo.JoinWhere("ec.id = $1"),
+		repo.JoinWhere("ec.id = $1 AND ec.tenant_id = $2"),
 	)
 
-	categories, err := g.queryCategories(ctx, query, id)
+	categories, err := g.queryCategories(ctx, query, id, tenant.ID.String())
 	if err != nil {
 		return nil, fmt.Errorf("failed to get expense category with ID: %d: %w", id, err)
 	}
@@ -206,11 +228,20 @@ func (g *GormExpenseCategoryRepository) Create(ctx context.Context, data categor
 	if err != nil {
 		return nil, fmt.Errorf("failed to get transaction: %w", err)
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	dbRow := toDBExpenseCategory(data)
+	dbRow.TenantID = tenant.ID.String()
+
 	var id uint
 	if err := tx.QueryRow(
 		ctx,
 		insertExpenseCategoryQuery,
+		dbRow.TenantID,
 		dbRow.Name,
 		dbRow.Description,
 		dbRow.Amount,
@@ -226,7 +257,15 @@ func (g *GormExpenseCategoryRepository) Update(ctx context.Context, data categor
 	if err != nil {
 		return nil, fmt.Errorf("failed to get transaction: %w", err)
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	dbRow := toDBExpenseCategory(data)
+	dbRow.TenantID = tenant.ID.String()
+
 	if _, err := tx.Exec(
 		ctx,
 		updateExpenseCategoryQuery,
@@ -235,6 +274,7 @@ func (g *GormExpenseCategoryRepository) Update(ctx context.Context, data categor
 		dbRow.Amount,
 		dbRow.AmountCurrencyID,
 		data.ID(),
+		dbRow.TenantID,
 	); err != nil {
 		return nil, fmt.Errorf("failed to update expense category with ID: %d: %w", data.ID(), err)
 	}
@@ -246,7 +286,13 @@ func (g *GormExpenseCategoryRepository) Delete(ctx context.Context, id uint) err
 	if err != nil {
 		return fmt.Errorf("failed to get transaction: %w", err)
 	}
-	if _, err := tx.Exec(ctx, deleteExpenseCategoryQuery, id); err != nil {
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	if _, err := tx.Exec(ctx, deleteExpenseCategoryQuery, id, tenant.ID.String()); err != nil {
 		return fmt.Errorf("failed to delete expense category with ID: %d: %w", id, err)
 	}
 	return nil
diff --git a/modules/finance/infrastructure/persistence/finance_mappers.go b/modules/finance/infrastructure/persistence/finance_mappers.go
index 85eaf69cc..a1bbacdb4 100644
--- a/modules/finance/infrastructure/persistence/finance_mappers.go
+++ b/modules/finance/infrastructure/persistence/finance_mappers.go
@@ -1,6 +1,7 @@
 package persistence
 
 import (
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/user"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/country"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
@@ -20,6 +21,7 @@ import (
 func toDBTransaction(entity *transaction.Transaction) *models.Transaction {
 	return &models.Transaction{
 		ID:                   entity.ID,
+		TenantID:             entity.TenantID.String(),
 		Amount:               entity.Amount,
 		Comment:              entity.Comment,
 		AccountingPeriod:     entity.AccountingPeriod,
@@ -36,9 +38,14 @@ func toDomainTransaction(dbTransaction *models.Transaction) (*transaction.Transa
 	if err != nil {
 		return nil, err
 	}
+	tenantID, err := uuid.Parse(dbTransaction.TenantID)
+	if err != nil {
+		return nil, err
+	}
 
 	return &transaction.Transaction{
 		ID:                   dbTransaction.ID,
+		TenantID:             tenantID,
 		Amount:               dbTransaction.Amount,
 		TransactionType:      _type,
 		Comment:              dbTransaction.Comment,
@@ -53,6 +60,7 @@ func toDomainTransaction(dbTransaction *models.Transaction) (*transaction.Transa
 func toDBPayment(entity payment.Payment) (*models.Payment, *models.Transaction) {
 	dbTransaction := &models.Transaction{
 		ID:                   entity.TransactionID(),
+		TenantID:             entity.TenantID().String(),
 		Amount:               entity.Amount(),
 		Comment:              entity.Comment(),
 		AccountingPeriod:     entity.AccountingPeriod(),
@@ -82,9 +90,14 @@ func toDomainPayment(dbPayment *models.Payment, dbTransaction *models.Transactio
 	if err != nil {
 		return nil, err
 	}
+	tenantID, err := uuid.Parse(dbTransaction.TenantID)
+	if err != nil {
+		return nil, err
+	}
 
 	return payment.NewWithID(
 		dbPayment.ID,
+		tenantID,
 		t.Amount,
 		t.ID,
 		dbPayment.CounterpartyID,
@@ -106,6 +119,7 @@ func toDomainPayment(dbPayment *models.Payment, dbTransaction *models.Transactio
 func toDBExpenseCategory(entity category.ExpenseCategory) *models.ExpenseCategory {
 	return &models.ExpenseCategory{
 		ID:               entity.ID(),
+		TenantID:         entity.TenantID().String(),
 		Name:             entity.Name(),
 		Description:      mapping.ValueToSQLNullString(entity.Description()),
 		Amount:           entity.Amount(),
@@ -120,8 +134,15 @@ func toDomainExpenseCategory(dbCategory *models.ExpenseCategory, dbCurrency *cor
 	if err != nil {
 		return nil, err
 	}
+
+	tenantID, err := uuid.Parse(dbCategory.TenantID)
+	if err != nil {
+		return nil, err
+	}
+
 	opts := []category.Option{
 		category.WithID(dbCategory.ID),
+		category.WithTenantID(tenantID),
 		category.WithCreatedAt(dbCategory.CreatedAt),
 		category.WithUpdatedAt(dbCategory.UpdatedAt),
 	}
@@ -143,8 +164,14 @@ func toDomainMoneyAccount(dbAccount *models.MoneyAccount) (*moneyaccount.Account
 	if err != nil {
 		return nil, err
 	}
+	tenantID, err := uuid.Parse(dbAccount.TenantID)
+	if err != nil {
+		return nil, err
+	}
+
 	return &moneyaccount.Account{
 		ID:            dbAccount.ID,
+		TenantID:      tenantID,
 		Name:          dbAccount.Name,
 		AccountNumber: dbAccount.AccountNumber,
 		Balance:       dbAccount.Balance,
@@ -158,6 +185,7 @@ func toDomainMoneyAccount(dbAccount *models.MoneyAccount) (*moneyaccount.Account
 func toDBMoneyAccount(entity *moneyaccount.Account) *models.MoneyAccount {
 	return &models.MoneyAccount{
 		ID:                entity.ID,
+		TenantID:          entity.TenantID.String(),
 		Name:              entity.Name,
 		AccountNumber:     entity.AccountNumber,
 		Balance:           entity.Balance,
@@ -170,12 +198,18 @@ func toDBMoneyAccount(entity *moneyaccount.Account) *models.MoneyAccount {
 }
 
 func toDomainExpense(dbExpense *models.Expense, dbTransaction *models.Transaction) (expense.Expense, error) {
+	tenantID, err := uuid.Parse(dbTransaction.TenantID)
+	if err != nil {
+		return nil, err
+	}
+
 	account := moneyaccount.Account{ID: *dbTransaction.OriginAccountID} //nolint:exhaustruct
 	expenseCategory := category.New(
 		"",  // name - will be populated when actual category is fetched
 		0.0, // amount - will be populated when actual category is fetched
 		nil, // currency - will be populated when actual category is fetched
 		category.WithID(dbExpense.CategoryID),
+		category.WithTenantID(tenantID),
 		category.WithCreatedAt(dbExpense.CreatedAt),
 		category.WithUpdatedAt(dbExpense.UpdatedAt),
 	)
diff --git a/modules/finance/infrastructure/persistence/models/models.go b/modules/finance/infrastructure/persistence/models/models.go
index d2b265ab9..09882e6bf 100644
--- a/modules/finance/infrastructure/persistence/models/models.go
+++ b/modules/finance/infrastructure/persistence/models/models.go
@@ -9,6 +9,7 @@ import (
 
 type ExpenseCategory struct {
 	ID               uint
+	TenantID         string
 	Name             string
 	Description      sql.NullString
 	Amount           float64
@@ -19,6 +20,7 @@ type ExpenseCategory struct {
 
 type MoneyAccount struct {
 	ID                uint
+	TenantID          string
 	Name              string
 	AccountNumber     string
 	Description       string
@@ -31,6 +33,7 @@ type MoneyAccount struct {
 
 type Transaction struct {
 	ID                   uint
+	TenantID             string
 	Amount               float64
 	OriginAccountID      *uint
 	DestinationAccountID *uint
@@ -59,6 +62,7 @@ type Payment struct {
 
 type Counterparty struct {
 	ID           uint
+	TenantID     uint
 	Tin          string
 	Name         string
 	Type         string
diff --git a/modules/finance/infrastructure/persistence/money_account_repository.go b/modules/finance/infrastructure/persistence/money_account_repository.go
index bd70f47f5..bd4ab96c1 100644
--- a/modules/finance/infrastructure/persistence/money_account_repository.go
+++ b/modules/finance/infrastructure/persistence/money_account_repository.go
@@ -21,6 +21,7 @@ var (
 const (
 	findQuery = `
 		SELECT ma.id,
+			ma.tenant_id,
 			ma.name,
 			ma.account_number,
 			ma.description,
@@ -34,13 +35,14 @@ const (
 			c.created_at,
 			c.updated_at
 		FROM money_accounts ma LEFT JOIN currencies c ON c.code = ma.balance_currency_id`
-	countQuery              = `SELECT COUNT(*) as count FROM money_accounts`
+	countQuery              = `SELECT COUNT(*) as count FROM money_accounts WHERE tenant_id = $1`
 	recalculateBalanceQuery = `
 		UPDATE money_accounts
 		SET balance = (SELECT sum(t.amount) FROM transactions t WHERE origin_account_id = $1 OR destination_account_id = $2)
-		WHERE id = $3`
+		WHERE id = $3 AND tenant_id = $4`
 	insertQuery = `
 		INSERT INTO money_accounts (
+			tenant_id,
 			name,
 			account_number,
 			description,
@@ -49,13 +51,13 @@ const (
 			created_at,
 			updated_at
 		)
-		VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING id`
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING id`
 	updateQuery = `
 		UPDATE money_accounts
 		SET name = $1, account_number = $2, description = $3, balance = $4, balance_currency_id = $5, updated_at = $6
-		WHERE id = $7`
-	deleteRelatedQuery = `DELETE FROM transactions WHERE origin_account_id = $1 OR destination_account_id = $1;`
-	deleteQuery        = `DELETE FROM money_accounts WHERE id = $1;`
+		WHERE id = $7 AND tenant_id = $8`
+	deleteRelatedQuery = `DELETE FROM transactions WHERE origin_account_id = $1 OR destination_account_id = $1 AND tenant_id = $2;`
+	deleteQuery        = `DELETE FROM money_accounts WHERE id = $1 AND tenant_id = $2;`
 )
 
 type GormMoneyAccountRepository struct{}
@@ -65,14 +67,20 @@ func NewMoneyAccountRepository() moneyaccount.Repository {
 }
 
 func (g *GormMoneyAccountRepository) GetPaginated(ctx context.Context, params *moneyaccount.FindParams) ([]*moneyaccount.Account, error) {
-	var args []interface{}
-	where := []string{"1 = 1"}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where := []string{"ma.tenant_id = $1"}
+	args := []interface{}{tenant.ID}
+
 	if params.CreatedAt.To != "" && params.CreatedAt.From != "" {
-		where = append(where, fmt.Sprintf("wo.created_at BETWEEN $%d and $%d", len(where), len(where)+1))
+		where = append(where, fmt.Sprintf("ma.created_at BETWEEN $%d and $%d", len(args)+1, len(args)+2))
 		args = append(args, params.CreatedAt.From, params.CreatedAt.To)
 	}
 	if params.Query != "" && params.Field != "" {
-		where = append(where, fmt.Sprintf("wo.%s::VARCHAR ILIKE $%d", params.Field, len(where)))
+		where = append(where, fmt.Sprintf("ma.%s::VARCHAR ILIKE $%d", params.Field, len(args)+1))
 		args = append(args, "%"+params.Query+"%")
 	}
 	q := repo.Join(
@@ -84,23 +92,39 @@ func (g *GormMoneyAccountRepository) GetPaginated(ctx context.Context, params *m
 }
 
 func (g *GormMoneyAccountRepository) Count(ctx context.Context) (int64, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return 0, err
 	}
 	var count int64
-	if err := tx.QueryRow(ctx, countQuery).Scan(&count); err != nil {
+	if err := tx.QueryRow(ctx, countQuery, tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *GormMoneyAccountRepository) GetAll(ctx context.Context) ([]*moneyaccount.Account, error) {
-	return g.queryAccounts(ctx, findQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	query := repo.Join(findQuery, "WHERE ma.tenant_id = $1")
+	return g.queryAccounts(ctx, query, tenant.ID)
 }
 
 func (g *GormMoneyAccountRepository) GetByID(ctx context.Context, id uint) (*moneyaccount.Account, error) {
-	accounts, err := g.queryAccounts(ctx, repo.Join(findQuery, "WHERE id = $1"), id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	accounts, err := g.queryAccounts(ctx, repo.Join(findQuery, "WHERE ma.id = $1 AND ma.tenant_id = $2"), id, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -111,7 +135,12 @@ func (g *GormMoneyAccountRepository) GetByID(ctx context.Context, id uint) (*mon
 }
 
 func (g *GormMoneyAccountRepository) RecalculateBalance(ctx context.Context, id uint) error {
-	err := g.execQuery(ctx, recalculateBalanceQuery, id, id, id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	err = g.execQuery(ctx, recalculateBalanceQuery, id, id, id, tenant.ID)
 	if err != nil {
 		return errors.Wrap(err, "failed to recalculate balance")
 	}
@@ -119,12 +148,19 @@ func (g *GormMoneyAccountRepository) RecalculateBalance(ctx context.Context, id
 }
 
 func (g *GormMoneyAccountRepository) Create(ctx context.Context, data *moneyaccount.Account) (*moneyaccount.Account, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	data.TenantID = tenant.ID
 	entity := toDBMoneyAccount(data)
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return nil, err
 	}
 	args := []interface{}{
+		entity.TenantID,
 		entity.Name,
 		entity.AccountNumber,
 		entity.Description,
@@ -142,6 +178,12 @@ func (g *GormMoneyAccountRepository) Create(ctx context.Context, data *moneyacco
 }
 
 func (g *GormMoneyAccountRepository) Update(ctx context.Context, data *moneyaccount.Account) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	data.TenantID = tenant.ID
 	dbAccount := toDBMoneyAccount(data)
 	args := []interface{}{
 		dbAccount.Name,
@@ -151,15 +193,21 @@ func (g *GormMoneyAccountRepository) Update(ctx context.Context, data *moneyacco
 		dbAccount.BalanceCurrencyID,
 		dbAccount.UpdatedAt,
 		dbAccount.ID,
+		dbAccount.TenantID,
 	}
 	return g.execQuery(ctx, updateQuery, args...)
 }
 
 func (g *GormMoneyAccountRepository) Delete(ctx context.Context, id uint) error {
-	if err := g.execQuery(ctx, deleteRelatedQuery, id); err != nil {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	if err := g.execQuery(ctx, deleteRelatedQuery, id, tenant.ID); err != nil {
 		return err
 	}
-	return g.execQuery(ctx, deleteQuery, id)
+	return g.execQuery(ctx, deleteQuery, id, tenant.ID)
 }
 
 func (g *GormMoneyAccountRepository) queryAccounts(ctx context.Context, query string, args ...interface{}) ([]*moneyaccount.Account, error) {
@@ -179,6 +227,7 @@ func (g *GormMoneyAccountRepository) queryAccounts(ctx context.Context, query st
 		}
 		if err := rows.Scan(
 			&r.ID,
+			&r.TenantID,
 			&r.Name,
 			&r.AccountNumber,
 			&r.Description,
diff --git a/modules/finance/infrastructure/persistence/payment_repository.go b/modules/finance/infrastructure/persistence/payment_repository.go
index 6f4d4859e..dd6a62e06 100644
--- a/modules/finance/infrastructure/persistence/payment_repository.go
+++ b/modules/finance/infrastructure/persistence/payment_repository.go
@@ -23,6 +23,7 @@ const (
 		p.created_at,
 		p.updated_at,
 		t.id,
+		t.tenant_id,
 		t.amount,
 		t.destination_account_id,
 		t.origin_account_id,
@@ -32,7 +33,7 @@ const (
 		t.comment,
 		t.created_at
 		FROM payments p LEFT JOIN transactions t ON t.id = p.transaction_id`
-	paymentCountQuery  = `SELECT COUNT(*) as count FROM payments`
+	paymentCountQuery  = `SELECT COUNT(*) as count FROM payments p LEFT JOIN transactions t ON t.id = p.transaction_id WHERE t.tenant_id = $1`
 	paymentInsertQuery = `
 	INSERT INTO payments (
 		counterparty_id,
@@ -41,8 +42,8 @@ const (
 		updated_at
 	)
 	VALUES ($1, $2, $3, $4) RETURNING id`
-	paymentUpdateQuery        = `UPDATE payments SET counterparty_id = $1, updated_at = $2 WHERE id = $5`
-	paymentDeleteRelatedQuery = `DELETE FROM transactions WHERE id = $1`
+	paymentUpdateQuery        = `UPDATE payments SET counterparty_id = $1, updated_at = $2 WHERE id = $3`
+	paymentDeleteRelatedQuery = `DELETE FROM transactions WHERE id = $1 AND tenant_id = $2`
 	paymentDeleteQuery        = `DELETE FROM payments WHERE id = $1`
 )
 
@@ -53,14 +54,20 @@ func NewPaymentRepository() payment.Repository {
 }
 
 func (g *GormPaymentRepository) GetPaginated(ctx context.Context, params *payment.FindParams) ([]payment.Payment, error) {
-	var args []interface{}
-	where := []string{"1 = 1"}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where := []string{"t.tenant_id = $1"}
+	args := []interface{}{tenant.ID}
+
 	if params.CreatedAt.To != "" && params.CreatedAt.From != "" {
-		where = append(where, fmt.Sprintf("p.created_at BETWEEN $%d and $%d", len(where), len(where)+1))
+		where = append(where, fmt.Sprintf("p.created_at BETWEEN $%d and $%d", len(args)+1, len(args)+2))
 		args = append(args, params.CreatedAt.From, params.CreatedAt.To)
 	}
 	if params.Query != "" && params.Field != "" {
-		where = append(where, fmt.Sprintf("p.%s::VARCHAR ILIKE $%d", params.Field, len(where)))
+		where = append(where, fmt.Sprintf("p.%s::VARCHAR ILIKE $%d", params.Field, len(args)+1))
 		args = append(args, "%"+params.Query+"%")
 	}
 	q := repo.Join(
@@ -72,23 +79,39 @@ func (g *GormPaymentRepository) GetPaginated(ctx context.Context, params *paymen
 }
 
 func (g *GormPaymentRepository) Count(ctx context.Context) (int64, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return 0, err
 	}
 	var count int64
-	if err := tx.QueryRow(ctx, paymentCountQuery).Scan(&count); err != nil {
+	if err := tx.QueryRow(ctx, paymentCountQuery, tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *GormPaymentRepository) GetAll(ctx context.Context) ([]payment.Payment, error) {
-	return g.queryPayments(ctx, paymentFindQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	query := repo.Join(paymentFindQuery, "WHERE t.tenant_id = $1")
+	return g.queryPayments(ctx, query, tenant.ID)
 }
 
 func (g *GormPaymentRepository) GetByID(ctx context.Context, id uint) (payment.Payment, error) {
-	payments, err := g.queryPayments(ctx, repo.Join(paymentFindQuery, "WHERE p.id = $1"), id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	payments, err := g.queryPayments(ctx, repo.Join(paymentFindQuery, "WHERE p.id = $1 AND t.tenant_id = $2"), id, tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get payment by id")
 	}
@@ -99,6 +122,14 @@ func (g *GormPaymentRepository) GetByID(ctx context.Context, id uint) (payment.P
 }
 
 func (g *GormPaymentRepository) Create(ctx context.Context, data payment.Payment) (payment.Payment, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	// Set tenant ID on the domain entity
+	data.SetTenantID(tenant.ID)
+
 	dbPayment, dbTransaction := toDBPayment(data)
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
@@ -107,11 +138,12 @@ func (g *GormPaymentRepository) Create(ctx context.Context, data payment.Payment
 	if err := tx.QueryRow(
 		ctx,
 		transactionInsertQuery,
+		dbTransaction.TenantID,
 		dbTransaction.Amount,
 		dbTransaction.OriginAccountID,
 		dbTransaction.DestinationAccountID,
-		dbTransaction.AccountingPeriod,
 		dbTransaction.TransactionDate,
+		dbTransaction.AccountingPeriod,
 		dbTransaction.TransactionType,
 		dbTransaction.Comment,
 	).Scan(&dbPayment.TransactionID); err != nil {
@@ -133,6 +165,14 @@ func (g *GormPaymentRepository) Create(ctx context.Context, data payment.Payment
 }
 
 func (g *GormPaymentRepository) Update(ctx context.Context, data payment.Payment) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	// Set tenant ID on the domain entity
+	data.SetTenantID(tenant.ID)
+
 	dbPayment, dbTransaction := toDBPayment(data)
 	if err := g.execQuery(
 		ctx,
@@ -154,10 +194,16 @@ func (g *GormPaymentRepository) Update(ctx context.Context, data payment.Payment
 		dbTransaction.TransactionType,
 		dbTransaction.Comment,
 		dbTransaction.ID,
+		dbTransaction.TenantID,
 	)
 }
 
 func (g *GormPaymentRepository) Delete(ctx context.Context, id uint) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	entity, err := g.GetByID(ctx, id)
 	if err != nil {
 		return err
@@ -165,7 +211,7 @@ func (g *GormPaymentRepository) Delete(ctx context.Context, id uint) error {
 	if err := g.execQuery(ctx, paymentDeleteQuery, id); err != nil {
 		return err
 	}
-	return g.execQuery(ctx, paymentDeleteRelatedQuery, entity.TransactionID())
+	return g.execQuery(ctx, paymentDeleteRelatedQuery, entity.TransactionID(), tenant.ID)
 }
 
 func (g *GormPaymentRepository) queryPayments(ctx context.Context, query string, args ...interface{}) ([]payment.Payment, error) {
@@ -188,6 +234,7 @@ func (g *GormPaymentRepository) queryPayments(ctx context.Context, query string,
 			&paymentRow.CreatedAt,
 			&paymentRow.UpdatedAt,
 			&transactionRow.ID,
+			&transactionRow.TenantID,
 			&transactionRow.Amount,
 			&transactionRow.DestinationAccountID,
 			&transactionRow.OriginAccountID,
diff --git a/modules/finance/infrastructure/persistence/schema/finance-schema.sql b/modules/finance/infrastructure/persistence/schema/finance-schema.sql
index a5d76354a..b5d63323d 100644
--- a/modules/finance/infrastructure/persistence/schema/finance-schema.sql
+++ b/modules/finance/infrastructure/persistence/schema/finance-schema.sql
@@ -1,12 +1,14 @@
 CREATE TABLE counterparty (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     tin varchar(20),
     name varchar(255) NOT NULL,
     type VARCHAR(255) NOT NULL, -- customer, supplier, individual
     legal_type varchar(255) NOT NULL, -- LLC, JSC, etc.
     legal_address varchar(255),
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, tin)
 );
 
 CREATE TABLE counterparty_contacts (
@@ -23,38 +25,45 @@ CREATE TABLE counterparty_contacts (
 
 CREATE TABLE inventory (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     name varchar(255) NOT NULL,
     description text,
     currency_id varchar(3) REFERENCES currencies (code) ON DELETE SET NULL,
     price numeric(9, 2) NOT NULL,
     quantity int NOT NULL,
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, name)
 );
 
 CREATE TABLE expense_categories (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     name varchar(255) NOT NULL,
     description text,
     amount numeric(9, 2) NOT NULL,
     amount_currency_id varchar(3) NOT NULL REFERENCES currencies (code) ON DELETE RESTRICT,
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, name)
 );
 
 CREATE TABLE money_accounts (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     name varchar(255) NOT NULL,
     account_number varchar(255) NOT NULL,
     description text,
     balance numeric(9, 2) NOT NULL,
     balance_currency_id varchar(3) NOT NULL REFERENCES currencies (code) ON DELETE CASCADE,
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, account_number)
 );
 
 CREATE TABLE transactions (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     amount numeric(9, 2) NOT NULL,
     origin_account_id int REFERENCES money_accounts (id) ON DELETE RESTRICT,
     destination_account_id int REFERENCES money_accounts (id) ON DELETE RESTRICT,
@@ -89,15 +98,25 @@ CREATE INDEX payments_counterparty_id_idx ON payments (counterparty_id);
 
 CREATE INDEX payments_transaction_id_idx ON payments (transaction_id);
 
+CREATE INDEX transactions_tenant_id_idx ON transactions (tenant_id);
+
 CREATE INDEX transactions_destination_account_id_idx ON transactions (destination_account_id);
 
 CREATE INDEX transactions_origin_account_id_idx ON transactions (origin_account_id);
 
+CREATE INDEX counterparty_tenant_id_idx ON counterparty (tenant_id);
+
 CREATE INDEX counterparty_contacts_counterparty_id_idx ON counterparty_contacts (counterparty_id);
 
 CREATE INDEX counterparty_tin_idx ON counterparty (tin);
 
+CREATE INDEX inventory_tenant_id_idx ON inventory (tenant_id);
+
 CREATE INDEX inventory_currency_id_idx ON inventory (currency_id);
 
+CREATE INDEX expense_categories_tenant_id_idx ON expense_categories (tenant_id);
+
+CREATE INDEX money_accounts_tenant_id_idx ON money_accounts (tenant_id);
+
 CREATE INDEX money_accounts_balance_currency_id_idx ON money_accounts (balance_currency_id);
 
diff --git a/modules/finance/infrastructure/persistence/setup_test.go b/modules/finance/infrastructure/persistence/setup_test.go
index 2dd6e44e6..95f7ab67b 100644
--- a/modules/finance/infrastructure/persistence/setup_test.go
+++ b/modules/finance/infrastructure/persistence/setup_test.go
@@ -47,11 +47,25 @@ func setupTest(t *testing.T) *testFixtures {
 	})
 
 	ctx = composables.WithTx(ctx, tx)
+
+	// Setup application and run migrations
 	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
 	if err != nil {
 		t.Fatal(err)
 	}
 
+	// Run migrations first to create all tables including tenants
+	if err := app.Migrations().Run(); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a test tenant and add it to the context
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx = composables.WithTenant(ctx, tenant)
+
 	return &testFixtures{
 		ctx:  ctx,
 		pool: pool,
diff --git a/modules/finance/infrastructure/persistence/transaction_repository.go b/modules/finance/infrastructure/persistence/transaction_repository.go
index 784f80e9d..b8178e5fb 100644
--- a/modules/finance/infrastructure/persistence/transaction_repository.go
+++ b/modules/finance/infrastructure/persistence/transaction_repository.go
@@ -19,6 +19,7 @@ var (
 const (
 	transactionFindQuery = `
 		SELECT id,
+			tenant_id,
 			amount,
 			origin_account_id,
 			destination_account_id,
@@ -28,9 +29,10 @@ const (
 			comment,
 			created_at
 		FROM transactions`
-	transactionCountQuery  = `SELECT COUNT(*) as count FROM transactions`
+	transactionCountQuery  = `SELECT COUNT(*) as count FROM transactions WHERE tenant_id = $1`
 	transactionInsertQuery = `
 		INSERT INTO transactions (
+			tenant_id,
 			amount,
 			origin_account_id,
 			destination_account_id,
@@ -39,7 +41,7 @@ const (
 			transaction_type,
 			comment
 		)
-		VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING id`
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING id`
 	transactionUpdateQuery = `
 		UPDATE transactions
 		SET amount = $1,
@@ -49,8 +51,8 @@ const (
 			accounting_period = $5,
 			transaction_type = $6,
 			comment = $7
-		WHERE id = $8`
-	transactionDeleteQuery = `DELETE FROM transactions WHERE id = $1`
+		WHERE id = $8 AND tenant_id = $9`
+	transactionDeleteQuery = `DELETE FROM transactions WHERE id = $1 AND tenant_id = $2`
 )
 
 type GormTransactionRepository struct{}
@@ -60,10 +62,16 @@ func NewTransactionRepository() transaction.Repository {
 }
 
 func (g *GormTransactionRepository) GetPaginated(ctx context.Context, params *transaction.FindParams) ([]*transaction.Transaction, error) {
-	where := []string{"1 = 1"}
-	var args []interface{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where := []string{"tenant_id = $1"}
+	args := []interface{}{tenant.ID}
+
 	if params.CreatedAt.To != "" && params.CreatedAt.From != "" {
-		where = append(where, fmt.Sprintf("created_at BETWEEN $%d and $%d", len(where), len(where)+1))
+		where = append(where, fmt.Sprintf("created_at BETWEEN $%d and $%d", len(args)+1, len(args)+2))
 		args = append(args, params.CreatedAt.From, params.CreatedAt.To)
 	}
 	q := repo.Join(
@@ -76,23 +84,39 @@ func (g *GormTransactionRepository) GetPaginated(ctx context.Context, params *tr
 }
 
 func (g *GormTransactionRepository) Count(ctx context.Context) (int64, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return 0, err
 	}
 	var count int64
-	if err := tx.QueryRow(ctx, transactionCountQuery).Scan(&count); err != nil {
+	if err := tx.QueryRow(ctx, transactionCountQuery, tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *GormTransactionRepository) GetAll(ctx context.Context) ([]*transaction.Transaction, error) {
-	return g.queryTransactions(ctx, transactionFindQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	query := repo.Join(transactionFindQuery, "WHERE tenant_id = $1")
+	return g.queryTransactions(ctx, query, tenant.ID)
 }
 
 func (g *GormTransactionRepository) GetByID(ctx context.Context, id uint) (*transaction.Transaction, error) {
-	transactions, err := g.queryTransactions(ctx, repo.Join(transactionFindQuery, "WHERE id = $1"), id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	transactions, err := g.queryTransactions(ctx, repo.Join(transactionFindQuery, "WHERE id = $1 AND tenant_id = $2"), id, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -103,12 +127,19 @@ func (g *GormTransactionRepository) GetByID(ctx context.Context, id uint) (*tran
 }
 
 func (g *GormTransactionRepository) Create(ctx context.Context, data *transaction.Transaction) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	data.TenantID = tenant.ID
 	entity := toDBTransaction(data)
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return err
 	}
 	args := []interface{}{
+		entity.TenantID,
 		entity.Amount,
 		entity.OriginAccountID,
 		entity.DestinationAccountID,
@@ -121,6 +152,12 @@ func (g *GormTransactionRepository) Create(ctx context.Context, data *transactio
 }
 
 func (g *GormTransactionRepository) Update(ctx context.Context, data *transaction.Transaction) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	data.TenantID = tenant.ID
 	dbTransaction := toDBTransaction(data)
 	args := []interface{}{
 		dbTransaction.Amount,
@@ -131,12 +168,18 @@ func (g *GormTransactionRepository) Update(ctx context.Context, data *transactio
 		dbTransaction.TransactionType,
 		dbTransaction.Comment,
 		dbTransaction.ID,
+		dbTransaction.TenantID,
 	}
 	return g.execQuery(ctx, transactionUpdateQuery, args...)
 }
 
 func (g *GormTransactionRepository) Delete(ctx context.Context, id uint) error {
-	return g.execQuery(ctx, transactionDeleteQuery, id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	return g.execQuery(ctx, transactionDeleteQuery, id, tenant.ID)
 }
 
 func (g *GormTransactionRepository) queryTransactions(ctx context.Context, query string, args ...interface{}) ([]*transaction.Transaction, error) {
@@ -155,6 +198,7 @@ func (g *GormTransactionRepository) queryTransactions(ctx context.Context, query
 		r := &models.Transaction{}
 		if err := rows.Scan(
 			&r.ID,
+			&r.TenantID,
 			&r.Amount,
 			&r.OriginAccountID,
 			&r.DestinationAccountID,
diff --git a/modules/finance/services/payment_service_test.go b/modules/finance/services/payment_service_test.go
index eb02af6d8..a3c4860e5 100644
--- a/modules/finance/services/payment_service_test.go
+++ b/modules/finance/services/payment_service_test.go
@@ -66,6 +66,18 @@ func setupTest(t *testing.T, permissions ...*permission.Permission) *testFixture
 	publisher := eventbus.NewEventPublisher(logging.ConsoleLogger(logrus.WarnLevel))
 	app := setupApplication(t, pool, publisher)
 
+	// Run migrations to ensure all tables are created (including tenants table)
+	if err := app.Migrations().Run(); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a test tenant and add it to the context (after migrations have created the table)
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx = composables.WithTenant(ctx, tenant)
+
 	return &testFixtures{
 		ctx:             ctx,
 		pool:            pool,
@@ -116,6 +128,7 @@ func setupTestData(ctx context.Context, t *testing.T, f *testFixtures) {
 		t.Fatal(err)
 	}
 
+	// Create the counterparty - the repository itself will set the tenant ID
 	_, err = counterpartyRepo.Create(ctx, counterparty.New(
 		tin,
 		"Test",
diff --git a/modules/hrm/domain/aggregates/employee/employee.go b/modules/hrm/domain/aggregates/employee/employee.go
index 0f25b06cf..f62d42442 100644
--- a/modules/hrm/domain/aggregates/employee/employee.go
+++ b/modules/hrm/domain/aggregates/employee/employee.go
@@ -3,6 +3,7 @@ package employee
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
 
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/passport"
@@ -17,6 +18,7 @@ type Language interface {
 
 type Employee interface {
 	ID() uint
+	TenantID() uuid.UUID
 	FirstName() string
 	LastName() string
 	MiddleName() string
@@ -46,6 +48,7 @@ type Employee interface {
 
 func NewWithID(
 	id uint,
+	tenantID uuid.UUID,
 	firstName, lastName, middleName, phone string,
 	email internet.Email,
 	salary *money.Money,
@@ -60,6 +63,7 @@ func NewWithID(
 ) Employee {
 	return &employee{
 		id:              id,
+		tenantID:        tenantID,
 		firstName:       firstName,
 		lastName:        lastName,
 		middleName:      middleName,
@@ -92,6 +96,7 @@ func New(
 ) (Employee, error) {
 	return &employee{
 		id:              0,
+		tenantID:        uuid.Nil, // Will be set in repository
 		firstName:       firstName,
 		lastName:        lastName,
 		middleName:      middleName,
@@ -112,6 +117,7 @@ func New(
 
 type employee struct {
 	id              uint
+	tenantID        uuid.UUID
 	firstName       string
 	lastName        string
 	middleName      string
@@ -135,6 +141,10 @@ func (e *employee) ID() uint {
 	return e.id
 }
 
+func (e *employee) TenantID() uuid.UUID {
+	return e.tenantID
+}
+
 func (e *employee) FirstName() string {
 	return e.firstName
 }
diff --git a/modules/hrm/domain/aggregates/employee/employee_update_dto.go b/modules/hrm/domain/aggregates/employee/employee_update_dto.go
index 8e3751e56..b05e69409 100644
--- a/modules/hrm/domain/aggregates/employee/employee_update_dto.go
+++ b/modules/hrm/domain/aggregates/employee/employee_update_dto.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/currency"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
 	"github.com/iota-uz/iota-sdk/pkg/money"
@@ -119,6 +120,7 @@ func (d *UpdateDTO) ToEntity(id uint) (Employee, error) {
 	}
 	return NewWithID(
 		id,
+		uuid.Nil,
 		d.FirstName,
 		d.LastName,
 		d.MiddleName,
diff --git a/modules/hrm/domain/entities/position/position.go b/modules/hrm/domain/entities/position/position.go
index 1eaf8f39b..ffea0ad6e 100644
--- a/modules/hrm/domain/entities/position/position.go
+++ b/modules/hrm/domain/entities/position/position.go
@@ -6,6 +6,7 @@ import (
 
 type Position struct {
 	ID          uint
+	TenantID    string
 	Name        string
 	Description string
 	CreatedAt   time.Time
diff --git a/modules/hrm/infrastructure/persistence/employee_repository.go b/modules/hrm/infrastructure/persistence/employee_repository.go
index 320278369..b9c18387c 100644
--- a/modules/hrm/infrastructure/persistence/employee_repository.go
+++ b/modules/hrm/infrastructure/persistence/employee_repository.go
@@ -19,6 +19,7 @@ var (
 const (
 	employeeFindQuery = `
 		SELECT e.id,
+		       e.tenant_id,
 		       e.first_name,
 		       e.last_name,
 		       e.middle_name,
@@ -40,12 +41,12 @@ const (
 		       em.resignation_date
 		  FROM employees e
 		       LEFT JOIN employee_meta em ON e.id = em.employee_id`
-	employeeCountQuery  = `SELECT COUNT(*) as count FROM employees`
+	employeeCountQuery  = `SELECT COUNT(*) as count FROM employees WHERE tenant_id = $1`
 	employeeInsertQuery = `
 		INSERT INTO employees (
-			first_name, last_name, middle_name, email, phone, salary, salary_currency_id,
+			tenant_id, first_name, last_name, middle_name, email, phone, salary, salary_currency_id,
 			hourly_rate, coefficient, avatar_id, created_at, updated_at
-		) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) RETURNING id`
+		) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13) RETURNING id`
 	employeeMetaInsertQuery = `
 		INSERT INTO employee_meta (
 			employee_id,
@@ -64,7 +65,7 @@ const (
 		   SET first_name = $1, last_name = $2, middle_name = $3, email = $4, phone = $5,
 		       salary = $6, salary_currency_id = $7, hourly_rate = $8, coefficient = $9,
 		       avatar_id = $10, updated_at = $11
-		WHERE id = $12`
+		WHERE id = $12 AND tenant_id = $13`
 
 	employeeUpdateMetaQuery = `
 		UPDATE employee_meta
@@ -72,7 +73,7 @@ const (
 		       birth_date = $5, hire_date = $6, resignation_date = $7
 		WHERE employee_id = $8`
 
-	employeeDeleteQuery     = `DELETE FROM employees WHERE id = $1`
+	employeeDeleteQuery     = `DELETE FROM employees WHERE id = $1 AND tenant_id = $2`
 	employeeMetaDeleteQuery = `DELETE FROM employee_meta WHERE employee_id = $1`
 )
 
@@ -83,11 +84,17 @@ func NewEmployeeRepository() employee.Repository {
 }
 
 func (g *GormEmployeeRepository) GetPaginated(ctx context.Context, params *employee.FindParams) ([]employee.Employee, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	var args []interface{}
-	where := []string{"1 = 1"}
+	where := []string{"e.tenant_id = $1"}
+	args = append(args, tenant.ID)
 
 	if params.Query != "" && params.Field != "" {
-		where = append(where, fmt.Sprintf("e.%s::VARCHAR ILIKE $%d", params.Field, len(where)))
+		where = append(where, fmt.Sprintf("e.%s::VARCHAR ILIKE $%d", params.Field, len(args)+1))
 		args = append(args, "%"+params.Query+"%")
 	}
 
@@ -100,23 +107,36 @@ func (g *GormEmployeeRepository) GetPaginated(ctx context.Context, params *emplo
 }
 
 func (g *GormEmployeeRepository) Count(ctx context.Context) (int64, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return 0, err
 	}
 	var count int64
-	if err := tx.QueryRow(ctx, employeeCountQuery).Scan(&count); err != nil {
+	if err := tx.QueryRow(ctx, employeeCountQuery, tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *GormEmployeeRepository) GetAll(ctx context.Context) ([]employee.Employee, error) {
-	return g.queryEmployees(ctx, employeeFindQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+	return g.queryEmployees(ctx, repo.Join(employeeFindQuery, "WHERE e.tenant_id = $1"), tenant.ID)
 }
 
 func (g *GormEmployeeRepository) GetByID(ctx context.Context, id uint) (employee.Employee, error) {
-	employees, err := g.queryEmployees(ctx, repo.Join(employeeFindQuery, "WHERE e.id = $1"), id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+	employees, err := g.queryEmployees(ctx, repo.Join(employeeFindQuery, "WHERE e.id = $1 AND e.tenant_id = $2"), id, tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get employee by id")
 	}
@@ -127,7 +147,14 @@ func (g *GormEmployeeRepository) GetByID(ctx context.Context, id uint) (employee
 }
 
 func (g *GormEmployeeRepository) Create(ctx context.Context, data employee.Employee) (employee.Employee, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	dbEmployee, dbMeta := toDBEmployee(data)
+	dbEmployee.TenantID = tenant.ID.String() // Set tenant ID from context
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return nil, err
@@ -135,6 +162,7 @@ func (g *GormEmployeeRepository) Create(ctx context.Context, data employee.Emplo
 	row := tx.QueryRow(
 		ctx,
 		employeeInsertQuery,
+		dbEmployee.TenantID,
 		dbEmployee.FirstName,
 		dbEmployee.LastName,
 		dbEmployee.MiddleName,
@@ -169,6 +197,11 @@ func (g *GormEmployeeRepository) Create(ctx context.Context, data employee.Emplo
 }
 
 func (g *GormEmployeeRepository) Update(ctx context.Context, data employee.Employee) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	dbEmployee, dbMeta := toDBEmployee(data)
 	if err := g.execQuery(
 		ctx,
@@ -185,6 +218,7 @@ func (g *GormEmployeeRepository) Update(ctx context.Context, data employee.Emplo
 		dbEmployee.AvatarID,
 		dbEmployee.UpdatedAt,
 		dbEmployee.ID,
+		tenant.ID,
 	); err != nil {
 		return err
 	}
@@ -203,10 +237,15 @@ func (g *GormEmployeeRepository) Update(ctx context.Context, data employee.Emplo
 }
 
 func (g *GormEmployeeRepository) Delete(ctx context.Context, id uint) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	if err := g.execQuery(ctx, employeeMetaDeleteQuery, id); err != nil {
 		return err
 	}
-	return g.execQuery(ctx, employeeDeleteQuery, id)
+	return g.execQuery(ctx, employeeDeleteQuery, id, tenant.ID)
 }
 
 func (g *GormEmployeeRepository) queryEmployees(ctx context.Context, query string, args ...interface{}) ([]employee.Employee, error) {
@@ -225,6 +264,7 @@ func (g *GormEmployeeRepository) queryEmployees(ctx context.Context, query strin
 		var metaRow models.EmployeeMeta
 		if err := rows.Scan(
 			&employeeRow.ID,
+			&employeeRow.TenantID,
 			&employeeRow.FirstName,
 			&employeeRow.LastName,
 			&employeeRow.MiddleName,
diff --git a/modules/hrm/infrastructure/persistence/hrm_mappers.go b/modules/hrm/infrastructure/persistence/hrm_mappers.go
index e598aeca9..2a8f1e0a9 100644
--- a/modules/hrm/infrastructure/persistence/hrm_mappers.go
+++ b/modules/hrm/infrastructure/persistence/hrm_mappers.go
@@ -1,6 +1,7 @@
 package persistence
 
 import (
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/currency"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/country"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/value_objects/internet"
@@ -33,8 +34,13 @@ func toDomainEmployee(dbEmployee *models.Employee, dbMeta *models.EmployeeMeta)
 	if err != nil {
 		return nil, err
 	}
+	tenantID, err := uuid.Parse(dbEmployee.TenantID)
+	if err != nil {
+		return nil, err
+	}
 	return employee.NewWithID(
 		dbEmployee.ID,
+		tenantID,
 		dbEmployee.FirstName,
 		dbEmployee.LastName,
 		dbEmployee.MiddleName.String,
@@ -57,6 +63,7 @@ func toDBEmployee(entity employee.Employee) (*models.Employee, *models.EmployeeM
 	salary := entity.Salary()
 	dbEmployee := &models.Employee{
 		ID:               entity.ID(),
+		TenantID:         entity.TenantID().String(),
 		FirstName:        entity.FirstName(),
 		LastName:         entity.LastName(),
 		MiddleName:       mapping.ValueToSQLNullString(entity.MiddleName()),
@@ -84,6 +91,7 @@ func toDBEmployee(entity employee.Employee) (*models.Employee, *models.EmployeeM
 func toDomainPosition(dbPosition *models.Position) (*position.Position, error) {
 	return &position.Position{
 		ID:          dbPosition.ID,
+		TenantID:    dbPosition.TenantID,
 		Name:        dbPosition.Name,
 		Description: dbPosition.Description.String,
 		CreatedAt:   dbPosition.CreatedAt,
@@ -94,6 +102,7 @@ func toDomainPosition(dbPosition *models.Position) (*position.Position, error) {
 func toDBPosition(position *position.Position) *models.Position {
 	return &models.Position{
 		ID:          position.ID,
+		TenantID:    position.TenantID,
 		Name:        position.Name,
 		Description: mapping.ValueToSQLNullString(position.Description),
 		CreatedAt:   position.CreatedAt,
diff --git a/modules/hrm/infrastructure/persistence/models/models.go b/modules/hrm/infrastructure/persistence/models/models.go
index efeb145a6..14203c710 100644
--- a/modules/hrm/infrastructure/persistence/models/models.go
+++ b/modules/hrm/infrastructure/persistence/models/models.go
@@ -7,6 +7,7 @@ import (
 
 type Position struct {
 	ID          uint
+	TenantID    string
 	Name        string
 	Description sql.NullString
 	CreatedAt   time.Time
@@ -15,6 +16,7 @@ type Position struct {
 
 type Employee struct {
 	ID               uint
+	TenantID         string
 	FirstName        string
 	LastName         string
 	MiddleName       sql.NullString
diff --git a/modules/hrm/infrastructure/persistence/position_repository.go b/modules/hrm/infrastructure/persistence/position_repository.go
index ba232140f..e92b63b8c 100644
--- a/modules/hrm/infrastructure/persistence/position_repository.go
+++ b/modules/hrm/infrastructure/persistence/position_repository.go
@@ -25,17 +25,22 @@ func NewPositionRepository() position.Repository {
 func (g *GormPositionRepository) GetPaginated(
 	ctx context.Context, params *position.FindParams,
 ) ([]*position.Position, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	pool, err := composables.UseTx(ctx)
 	if err != nil {
 		return nil, err
 	}
-	where, args := []string{"1 = 1"}, []interface{}{}
+	where, args := []string{"tenant_id = $1"}, []interface{}{tenant.ID}
 	if params.ID != 0 {
 		where, args = append(where, fmt.Sprintf("id = $%d", len(args)+1)), append(args, params.ID)
 	}
 
 	rows, err := pool.Query(ctx, `
-		SELECT id, name, description, created_at, updated_at FROM positions
+		SELECT id, tenant_id, name, description, created_at, updated_at FROM positions
 		WHERE `+strings.Join(where, " AND ")+`
 		`+repo.FormatLimitOffset(params.Limit, params.Offset)+`
 	`, args...)
@@ -48,6 +53,7 @@ func (g *GormPositionRepository) GetPaginated(
 		var p models.Position
 		if err := rows.Scan(
 			&p.ID,
+			&p.TenantID,
 			&p.Name,
 			&p.Description,
 			&p.CreatedAt,
@@ -70,14 +76,19 @@ func (g *GormPositionRepository) GetPaginated(
 }
 
 func (g *GormPositionRepository) Count(ctx context.Context) (int64, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	pool, err := composables.UseTx(ctx)
 	if err != nil {
 		return 0, err
 	}
 	var count int64
 	if err := pool.QueryRow(ctx, `
-		SELECT COUNT(*) as count FROM positions
-	`).Scan(&count); err != nil {
+		SELECT COUNT(*) as count FROM positions WHERE tenant_id = $1
+	`, tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
@@ -108,10 +119,12 @@ func (g *GormPositionRepository) Create(ctx context.Context, data *position.Posi
 	if err != nil {
 		return err
 	}
+
 	dbRow := toDBPosition(data)
+
 	if err := tx.QueryRow(ctx, `
-		INSERT INTO positions (name, description) VALUES ($1, $2)
-	`, dbRow.Name, dbRow.Description).Scan(&data.ID); err != nil {
+		INSERT INTO positions (tenant_id, name, description) VALUES ($1, $2, $3) RETURNING id
+	`, dbRow.TenantID, dbRow.Name, dbRow.Description).Scan(&data.ID); err != nil {
 		return err
 	}
 	return nil
@@ -123,11 +136,15 @@ func (g *GormPositionRepository) Update(ctx context.Context, data *position.Posi
 		return err
 	}
 	dbRow := toDBPosition(data)
+
 	if _, err := tx.Exec(ctx, `
-		UPDATE positions 
+		UPDATE positions
 		SET name = $1, description = $2
-		WHERE id = $3
-	`, dbRow.Name, dbRow.Description, dbRow.ID); err != nil {
+		WHERE id = $3`,
+		dbRow.Name,
+		dbRow.Description,
+		dbRow.ID,
+	); err != nil {
 		return err
 	}
 	return nil
@@ -138,9 +155,7 @@ func (g *GormPositionRepository) Delete(ctx context.Context, id int64) error {
 	if err != nil {
 		return err
 	}
-	if _, err := tx.Exec(ctx, `
-		DELETE FROM positions WHERE id = $1
-	`, id); err != nil {
+	if _, err := tx.Exec(ctx, `DELETE FROM positions WHERE id = $1`, id); err != nil {
 		return err
 	}
 	return nil
diff --git a/modules/hrm/infrastructure/persistence/schema/hrm-schema.sql b/modules/hrm/infrastructure/persistence/schema/hrm-schema.sql
index cc79b982e..dc4cb6f08 100644
--- a/modules/hrm/infrastructure/persistence/schema/hrm-schema.sql
+++ b/modules/hrm/infrastructure/persistence/schema/hrm-schema.sql
@@ -1,17 +1,20 @@
 CREATE TABLE positions (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     name varchar(255) NOT NULL,
     description text,
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, name)
 );
 
 CREATE TABLE employees (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     first_name varchar(255) NOT NULL,
     last_name varchar(255) NOT NULL,
     middle_name varchar(255),
-    email varchar(255) NOT NULL UNIQUE,
+    email varchar(255) NOT NULL,
     phone varchar(255),
     salary numeric(9, 2) NOT NULL,
     salary_currency_id varchar(3) REFERENCES currencies (code) ON DELETE SET NULL,
@@ -19,7 +22,9 @@ CREATE TABLE employees (
     coefficient float NOT NULL,
     avatar_id int REFERENCES uploads (id) ON DELETE SET NULL,
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, email),
+    UNIQUE (tenant_id, phone)
 );
 
 CREATE TABLE employee_positions (
@@ -49,3 +54,15 @@ CREATE TABLE employee_contacts (
     updated_at timestamp with time zone DEFAULT now()
 );
 
+CREATE INDEX positions_tenant_id_idx ON positions (tenant_id);
+
+CREATE INDEX employees_tenant_id_idx ON employees (tenant_id);
+
+CREATE INDEX employees_first_name_idx ON employees (first_name);
+
+CREATE INDEX employees_last_name_idx ON employees (last_name);
+
+CREATE INDEX employees_email_idx ON employees (email);
+
+CREATE INDEX employees_phone_idx ON employees (phone);
+
diff --git a/modules/logging/infrastructure/persistence/schema/logging-schema.sql b/modules/logging/infrastructure/persistence/schema/logging-schema.sql
index a7e24916c..f58107c87 100644
--- a/modules/logging/infrastructure/persistence/schema/logging-schema.sql
+++ b/modules/logging/infrastructure/persistence/schema/logging-schema.sql
@@ -1,5 +1,6 @@
 CREATE TABLE authentication_logs (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     user_id integer NOT NULL CONSTRAINT fk_user_id REFERENCES users (id) ON DELETE CASCADE,
     ip varchar(255) NOT NULL,
     user_agent varchar(255) NOT NULL,
@@ -8,6 +9,7 @@ CREATE TABLE authentication_logs (
 
 CREATE TABLE action_logs (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     method varchar(255) NOT NULL,
     path varchar(255) NOT NULL,
     user_id int REFERENCES users (id) ON DELETE SET NULL,
@@ -18,8 +20,12 @@ CREATE TABLE action_logs (
     created_at timestamp with time zone DEFAULT now()
 );
 
+CREATE INDEX action_logs_tenant_id_idx ON action_logs (tenant_id);
+
 CREATE INDEX action_log_user_id_idx ON action_logs (user_id);
 
+CREATE INDEX authentication_logs_tenant_id_idx ON authentication_logs (tenant_id);
+
 CREATE INDEX authentication_logs_user_id_idx ON authentication_logs (user_id);
 
 CREATE INDEX authentication_logs_created_at_idx ON authentication_logs (created_at);
diff --git a/modules/warehouse/domain/aggregates/order/order.go b/modules/warehouse/domain/aggregates/order/order.go
index 4245263fd..49ebd3952 100644
--- a/modules/warehouse/domain/aggregates/order/order.go
+++ b/modules/warehouse/domain/aggregates/order/order.go
@@ -3,18 +3,21 @@ package order
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/domain/aggregates/position"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/domain/aggregates/product"
 )
 
 type Order interface {
 	ID() uint
+	TenantID() uuid.UUID
 	Type() Type
 	Status() Status
 	Items() []Item
 	CreatedAt() time.Time
 
 	SetID(id uint)
+	SetTenantID(id uuid.UUID)
 
 	AddItem(position *position.Position, products ...*product.Product) error
 	Complete() error
diff --git a/modules/warehouse/domain/aggregates/order/order_impl.go b/modules/warehouse/domain/aggregates/order/order_impl.go
index 0b67d53f4..032ed3fee 100644
--- a/modules/warehouse/domain/aggregates/order/order_impl.go
+++ b/modules/warehouse/domain/aggregates/order/order_impl.go
@@ -3,6 +3,7 @@ package order
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/domain/aggregates/position"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/domain/aggregates/product"
 )
@@ -11,6 +12,7 @@ func New(orderType Type, status Status) Order {
 	return &orderImpl{
 		_type:     orderType,
 		status:    status,
+		tenantID:  uuid.Nil, // Will be set in repository
 		items:     make([]Item, 0),
 		createdAt: time.Now(),
 	}
@@ -19,6 +21,7 @@ func New(orderType Type, status Status) Order {
 func NewWithID(id uint, orderType Type, status Status, createdAt time.Time) Order {
 	return &orderImpl{
 		id:        id,
+		tenantID:  uuid.Nil, // Will be set in repository
 		_type:     orderType,
 		status:    status,
 		items:     make([]Item, 0),
@@ -28,6 +31,7 @@ func NewWithID(id uint, orderType Type, status Status, createdAt time.Time) Orde
 
 type orderImpl struct {
 	id        uint
+	tenantID  uuid.UUID
 	_type     Type
 	status    Status
 	items     []Item
@@ -38,10 +42,18 @@ func (o *orderImpl) SetID(id uint) {
 	o.id = id
 }
 
+func (o *orderImpl) SetTenantID(id uuid.UUID) {
+	o.tenantID = id
+}
+
 func (o *orderImpl) ID() uint {
 	return o.id
 }
 
+func (o *orderImpl) TenantID() uuid.UUID {
+	return o.tenantID
+}
+
 func (o *orderImpl) Type() Type {
 	return o._type
 }
diff --git a/modules/warehouse/domain/aggregates/position/position.go b/modules/warehouse/domain/aggregates/position/position.go
index 82f603346..d36469789 100644
--- a/modules/warehouse/domain/aggregates/position/position.go
+++ b/modules/warehouse/domain/aggregates/position/position.go
@@ -3,12 +3,14 @@ package position
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/upload"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/domain/entities/unit"
 )
 
 type Position struct {
 	ID        uint
+	TenantID  uuid.UUID
 	Title     string
 	Barcode   string
 	UnitID    uint
diff --git a/modules/warehouse/domain/aggregates/product/product.go b/modules/warehouse/domain/aggregates/product/product.go
index 40cc4a8db..b1526638c 100644
--- a/modules/warehouse/domain/aggregates/product/product.go
+++ b/modules/warehouse/domain/aggregates/product/product.go
@@ -3,6 +3,7 @@ package product
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/domain/aggregates/position"
 )
 
@@ -19,6 +20,7 @@ func New(rfid string, positionID uint, status Status, position *position.Positio
 
 type Product struct {
 	ID         uint
+	TenantID   uuid.UUID
 	PositionID uint
 	Rfid       string
 	Status     Status
diff --git a/modules/warehouse/domain/entities/inventory/inventory.go b/modules/warehouse/domain/entities/inventory/inventory.go
index 844caee9b..a88f8ecaa 100644
--- a/modules/warehouse/domain/entities/inventory/inventory.go
+++ b/modules/warehouse/domain/entities/inventory/inventory.go
@@ -3,6 +3,7 @@ package inventory
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/user"
 
 	"github.com/iota-uz/iota-sdk/modules/warehouse/domain/aggregates/position"
@@ -10,6 +11,7 @@ import (
 
 type Check struct {
 	ID           uint
+	TenantID     uuid.UUID
 	Status       Status
 	Name         string
 	Results      []*CheckResult
@@ -24,6 +26,7 @@ type Check struct {
 func (c *Check) AddResult(positionID uint, expected, actual int) {
 	c.Results = append(c.Results, &CheckResult{
 		PositionID:       positionID,
+		TenantID:         c.TenantID,
 		ExpectedQuantity: expected,
 		ActualQuantity:   actual,
 		Difference:       expected - actual,
@@ -40,6 +43,7 @@ type Position struct {
 
 type CheckResult struct {
 	ID               uint
+	TenantID         uuid.UUID
 	PositionID       uint
 	Position         *position.Position
 	ExpectedQuantity int
diff --git a/modules/warehouse/domain/entities/unit/unit.go b/modules/warehouse/domain/entities/unit/unit.go
index bfd38ee53..c73980dd9 100644
--- a/modules/warehouse/domain/entities/unit/unit.go
+++ b/modules/warehouse/domain/entities/unit/unit.go
@@ -2,10 +2,13 @@ package unit
 
 import (
 	"time"
+
+	"github.com/google/uuid"
 )
 
 type Unit struct {
 	ID         uint
+	TenantID   uuid.UUID
 	Title      string
 	ShortTitle string
 	CreatedAt  time.Time
diff --git a/modules/warehouse/infrastructure/persistence/inventory_repository.go b/modules/warehouse/infrastructure/persistence/inventory_repository.go
index 11e2b5f54..9cdb50ac1 100644
--- a/modules/warehouse/infrastructure/persistence/inventory_repository.go
+++ b/modules/warehouse/infrastructure/persistence/inventory_repository.go
@@ -41,7 +41,13 @@ func (g *GormInventoryRepository) GetPaginated(
 	if err != nil {
 		return nil, err
 	}
-	where, args := []string{"1 = 1"}, []interface{}{}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where, args := []string{"ic.tenant_id = $1"}, []interface{}{tenant.ID}
 	if params.ID != 0 {
 		where, args = append(where, fmt.Sprintf("ic.id = $%d", len(args)+1)), append(args, params.ID)
 	}
@@ -59,7 +65,7 @@ func (g *GormInventoryRepository) GetPaginated(
 	}
 
 	rows, err := pool.Query(ctx, `
-		SELECT ic.id, status, name, ic.created_at, ic.finished_at, ic.created_by_id, ic.finished_by_id
+		SELECT ic.id, ic.tenant_id, status, name, ic.created_at, ic.finished_at, ic.created_by_id, ic.finished_by_id
 		FROM inventory_checks ic
 		WHERE `+strings.Join(where, " AND ")+`
 		ORDER BY id DESC
@@ -77,6 +83,7 @@ func (g *GormInventoryRepository) GetPaginated(
 		var finishedByID sql.NullInt32
 		if err := rows.Scan(
 			&check.ID,
+			&check.TenantID,
 			&check.Status,
 			&check.Name,
 			&check.CreatedAt,
@@ -129,13 +136,21 @@ func (g *GormInventoryRepository) Positions(ctx context.Context) ([]*inventory.P
 	if err != nil {
 		return nil, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	var entities []*models.InventoryPosition
 	sql := `
 	SELECT warehouse_positions.id, warehouse_positions.title, COUNT(warehouse_products.id) quantity, array_agg(warehouse_products.rfid) rfid_tags
-	FROM warehouse_positions JOIN warehouse_products ON warehouse_positions.id = warehouse_products.position_id
+	FROM warehouse_positions
+	JOIN warehouse_products ON warehouse_positions.id = warehouse_products.position_id
+	WHERE warehouse_positions.tenant_id = $1
 	GROUP BY warehouse_positions.id;
 	`
-	rows, err := tx.Query(ctx, sql)
+	rows, err := tx.Query(ctx, sql, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -161,10 +176,16 @@ func (g *GormInventoryRepository) Count(ctx context.Context) (uint, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	var count uint
 	if err := pool.QueryRow(ctx, `
-		SELECT COUNT(*) as count FROM inventory_checks
-	`).Scan(&count); err != nil {
+		SELECT COUNT(*) as count FROM inventory_checks WHERE tenant_id = $1
+	`, tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
@@ -215,22 +236,31 @@ func (g *GormInventoryRepository) Create(ctx context.Context, data *inventory.Ch
 	if err != nil {
 		return err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	// Set tenant ID in domain entity
+	data.TenantID = tenant.ID
+
 	dbRow, err := mappers.ToDBInventoryCheck(data)
 	if err != nil {
 		return err
 	}
 	if err := tx.QueryRow(ctx, `
-		INSERT INTO inventory_checks (status, name, created_by_id) 
-		VALUES ($1, $2, $3) RETURNING id
-	`, dbRow.Status, dbRow.Name, dbRow.CreatedByID).Scan(&data.ID); err != nil {
+		INSERT INTO inventory_checks (tenant_id, status, name, created_by_id)
+		VALUES ($1, $2, $3, $4) RETURNING id
+	`, dbRow.TenantID, dbRow.Status, dbRow.Name, dbRow.CreatedByID).Scan(&data.ID); err != nil {
 		return err
 	}
 
 	if results := dbRow.Results; results != nil {
 		for _, result := range results {
 			if _, err := tx.Exec(ctx, `
-				INSERT INTO inventory_check_results (inventory_check_id, position_id, expected_quantity, actual_quantity, difference) VALUES ($1, $2, $3, $4, $5)
-			`, data.ID, result.PositionID, result.ExpectedQuantity, result.ActualQuantity, result.Difference); err != nil {
+				INSERT INTO inventory_check_results (tenant_id, inventory_check_id, position_id, expected_quantity, actual_quantity, difference) VALUES ($1, $2, $3, $4, $5, $6)
+			`, tenant.ID, data.ID, result.PositionID, result.ExpectedQuantity, result.ActualQuantity, result.Difference); err != nil {
 				return err
 			}
 		}
@@ -243,14 +273,23 @@ func (g *GormInventoryRepository) Update(ctx context.Context, data *inventory.Ch
 	if err != nil {
 		return err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	// Set tenant ID in domain entity
+	data.TenantID = tenant.ID
+
 	dbRow, err := mappers.ToDBInventoryCheck(data)
 	if err != nil {
 		return err
 	}
 	if _, err := tx.Exec(ctx, `
 		UPDATE inventory_checks ic SET name = COALESCE(NULLIF($1, ''), ic.name)
-		WHERE ic.id = $2
-	`, dbRow.Name, dbRow.ID); err != nil {
+		WHERE ic.id = $2 AND ic.tenant_id = $3
+	`, dbRow.Name, dbRow.ID, dbRow.TenantID); err != nil {
 		return err
 	}
 	return nil
@@ -261,7 +300,13 @@ func (g *GormInventoryRepository) Delete(ctx context.Context, id uint) error {
 	if err != nil {
 		return err
 	}
-	if _, err := tx.Exec(ctx, `DELETE FROM inventory_checks WHERE id = $1`, id); err != nil {
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	if _, err := tx.Exec(ctx, `DELETE FROM inventory_checks WHERE id = $1 AND tenant_id = $2`, id, tenant.ID); err != nil {
 		return err
 	}
 	return nil
@@ -281,7 +326,13 @@ func (g *GormInventoryRepository) getCheckResults(
 	if err != nil {
 		return nil, err
 	}
-	where, args := []string{"1 = 1"}, []interface{}{}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where, args := []string{"icr.tenant_id = $1"}, []interface{}{tenant.ID}
 	if params.id != 0 {
 		where, args = append(where, fmt.Sprintf("ic.id = $%d", len(args)+1)), append(args, params.id)
 	}
@@ -295,7 +346,7 @@ func (g *GormInventoryRepository) getCheckResults(
 	}
 
 	rows, err := pool.Query(ctx, `
-		SELECT id, inventory_check_id, position_id, expected_quantity, actual_quantity, difference, created_at
+		SELECT id, tenant_id, inventory_check_id, position_id, expected_quantity, actual_quantity, difference, created_at
 		FROM inventory_check_results icr
 		WHERE `+strings.Join(where, " AND ")+`
 		ORDER BY id DESC`, args...)
@@ -308,6 +359,7 @@ func (g *GormInventoryRepository) getCheckResults(
 		var result models.InventoryCheckResult
 		if err := rows.Scan(
 			&result.ID,
+			&result.TenantID,
 			&result.InventoryCheckID,
 			&result.PositionID,
 			&result.ExpectedQuantity,
diff --git a/modules/warehouse/infrastructure/persistence/mappers/order_mappers.go b/modules/warehouse/infrastructure/persistence/mappers/order_mappers.go
index ca4527bd4..b79bf58c7 100644
--- a/modules/warehouse/infrastructure/persistence/mappers/order_mappers.go
+++ b/modules/warehouse/infrastructure/persistence/mappers/order_mappers.go
@@ -1,6 +1,7 @@
 package mappers
 
 import (
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/domain/aggregates/order"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/infrastructure/persistence/models"
 )
@@ -19,6 +20,7 @@ func ToDBOrder(entity order.Order) (*models.WarehouseOrder, []*models.WarehouseP
 
 	dbOrder := &models.WarehouseOrder{
 		ID:        entity.ID(),
+		TenantID:  entity.TenantID().String(),
 		Status:    string(entity.Status()),
 		Type:      string(entity.Type()),
 		CreatedAt: entity.CreatedAt(),
@@ -35,5 +37,11 @@ func ToDomainOrder(dbOrder *models.WarehouseOrder) (order.Order, error) {
 	if err != nil {
 		return nil, err
 	}
-	return order.NewWithID(dbOrder.ID, orderType, status, dbOrder.CreatedAt), nil
+	tenantID, err := uuid.Parse(dbOrder.TenantID)
+	if err != nil {
+		return nil, err
+	}
+	orderEntity := order.NewWithID(dbOrder.ID, orderType, status, dbOrder.CreatedAt)
+	orderEntity.SetTenantID(tenantID)
+	return orderEntity, nil
 }
diff --git a/modules/warehouse/infrastructure/persistence/mappers/warehouse_mappers.go b/modules/warehouse/infrastructure/persistence/mappers/warehouse_mappers.go
index 93d2f516c..7f2f1c72e 100644
--- a/modules/warehouse/infrastructure/persistence/mappers/warehouse_mappers.go
+++ b/modules/warehouse/infrastructure/persistence/mappers/warehouse_mappers.go
@@ -15,6 +15,7 @@ import (
 func ToDBUnit(unit *unit.Unit) *models.WarehouseUnit {
 	return &models.WarehouseUnit{
 		ID:         unit.ID,
+		TenantID:   unit.TenantID.String(),
 		Title:      unit.Title,
 		ShortTitle: unit.ShortTitle,
 		CreatedAt:  unit.CreatedAt,
@@ -22,19 +23,25 @@ func ToDBUnit(unit *unit.Unit) *models.WarehouseUnit {
 	}
 }
 
-func ToDomainUnit(dbUnit *models.WarehouseUnit) *unit.Unit {
+func ToDomainUnit(dbUnit *models.WarehouseUnit) (*unit.Unit, error) {
+	tenantID, err := uuid.Parse(dbUnit.TenantID)
+	if err != nil {
+		return nil, err
+	}
 	return &unit.Unit{
 		ID:         dbUnit.ID,
+		TenantID:   tenantID,
 		Title:      dbUnit.Title,
 		ShortTitle: dbUnit.ShortTitle,
 		CreatedAt:  dbUnit.CreatedAt,
 		UpdatedAt:  dbUnit.UpdatedAt,
-	}
+	}, nil
 }
 
 func ToDBProduct(entity *product.Product) (*models.WarehouseProduct, error) {
 	return &models.WarehouseProduct{
 		ID:         entity.ID,
+		TenantID:   entity.TenantID.String(),
 		PositionID: entity.PositionID,
 		Rfid:       mapping.ValueToSQLNullString(entity.Rfid),
 		Status:     string(entity.Status),
@@ -56,8 +63,13 @@ func ToDomainProduct(
 	if err != nil {
 		return nil, err
 	}
+	tenantID, err := uuid.Parse(dbProduct.TenantID)
+	if err != nil {
+		return nil, err
+	}
 	return &product.Product{
 		ID:         dbProduct.ID,
+		TenantID:   tenantID,
 		PositionID: dbProduct.PositionID,
 		Rfid:       dbProduct.Rfid.String,
 		Position:   pos,
@@ -69,16 +81,29 @@ func ToDomainProduct(
 
 func ToDomainPosition(dbPosition *models.WarehousePosition, dbUnit *models.WarehouseUnit) (*position.Position, error) {
 	// TODO: decouple
-	images := make([]upload.Upload, len(dbPosition.Images))
-	for i, img := range dbPosition.Images {
-		images[i] = persistence.ToDomainUpload(&img)
+	images := make([]upload.Upload, 0, len(dbPosition.Images))
+	for _, img := range dbPosition.Images {
+		domainUpload, err := persistence.ToDomainUpload(&img)
+		if err != nil {
+			return nil, err
+		}
+		images = append(images, domainUpload)
+	}
+	unit, err := ToDomainUnit(dbUnit)
+	if err != nil {
+		return nil, err
+	}
+	tenantID, err := uuid.Parse(dbPosition.TenantID)
+	if err != nil {
+		return nil, err
 	}
 	return &position.Position{
 		ID:        dbPosition.ID,
+		TenantID:  tenantID,
 		Title:     dbPosition.Title,
 		Barcode:   dbPosition.Barcode,
 		UnitID:    uint(dbPosition.UnitID.Int32),
-		Unit:      ToDomainUnit(dbUnit),
+		Unit:      unit,
 		Images:    images,
 		CreatedAt: dbPosition.CreatedAt,
 		UpdatedAt: dbPosition.UpdatedAt,
@@ -97,6 +122,7 @@ func ToDBPosition(entity *position.Position) (*models.WarehousePosition, []*mode
 	}
 	dbPosition := &models.WarehousePosition{
 		ID:        entity.ID,
+		TenantID:  entity.TenantID.String(),
 		Title:     entity.Title,
 		Barcode:   entity.Barcode,
 		UnitID:    mapping.ValueToSQLNullInt32(int32(entity.UnitID)),
@@ -124,8 +150,13 @@ func ToDomainInventoryCheck(dbInventoryCheck *models.InventoryCheck) (*inventory
 	if err != nil {
 		return nil, err
 	}
+	tenantID, err := uuid.Parse(dbInventoryCheck.TenantID)
+	if err != nil {
+		return nil, err
+	}
 	check := &inventory.Check{
 		ID:           dbInventoryCheck.ID,
+		TenantID:     tenantID,
 		Status:       status,
 		Name:         dbInventoryCheck.Name,
 		Results:      results,
@@ -152,6 +183,7 @@ func ToDomainInventoryCheck(dbInventoryCheck *models.InventoryCheck) (*inventory
 func ToDBInventoryCheckResult(result *inventory.CheckResult) (*models.InventoryCheckResult, error) {
 	return &models.InventoryCheckResult{
 		ID:               result.ID,
+		TenantID:         result.TenantID.String(),
 		PositionID:       result.PositionID,
 		ExpectedQuantity: result.ExpectedQuantity,
 		ActualQuantity:   result.ActualQuantity,
@@ -165,8 +197,13 @@ func ToDomainInventoryCheckResult(result *models.InventoryCheckResult) (*invento
 	// if err != nil {
 	// 	return nil, err
 	// }
+	tenantID, err := uuid.Parse(result.TenantID)
+	if err != nil {
+		return nil, err
+	}
 	return &inventory.CheckResult{
 		ID:         result.ID,
+		TenantID:   tenantID,
 		PositionID: result.PositionID,
 		// Position:         pos,
 		ExpectedQuantity: result.ExpectedQuantity,
@@ -183,6 +220,7 @@ func ToDBInventoryCheck(check *inventory.Check) (*models.InventoryCheck, error)
 	}
 	return &models.InventoryCheck{
 		ID:           check.ID,
+		TenantID:     check.TenantID.String(),
 		Status:       string(check.Status),
 		Name:         check.Name,
 		Results:      results,
diff --git a/modules/warehouse/infrastructure/persistence/models/models.go b/modules/warehouse/infrastructure/persistence/models/models.go
index 51bf906de..13e3bcae9 100644
--- a/modules/warehouse/infrastructure/persistence/models/models.go
+++ b/modules/warehouse/infrastructure/persistence/models/models.go
@@ -5,11 +5,13 @@ import (
 	"time"
 
 	coremodels "github.com/iota-uz/iota-sdk/modules/core/infrastructure/persistence/models"
+
 	"github.com/lib/pq"
 )
 
 type WarehouseUnit struct {
 	ID         uint
+	TenantID   string
 	Title      string
 	ShortTitle string
 	CreatedAt  time.Time
@@ -18,6 +20,7 @@ type WarehouseUnit struct {
 
 type InventoryCheck struct {
 	ID           uint
+	TenantID     string
 	Status       string
 	Name         string
 	Results      []*InventoryCheckResult `gorm:"foreignKey:InventoryCheckID"`
@@ -38,6 +41,7 @@ type InventoryPosition struct {
 
 type InventoryCheckResult struct {
 	ID               uint
+	TenantID         string
 	InventoryCheckID uint
 	PositionID       uint
 	Position         *WarehousePosition
@@ -49,6 +53,7 @@ type InventoryCheckResult struct {
 
 type WarehouseOrder struct {
 	ID        uint
+	TenantID  string
 	Type      string
 	Status    string
 	CreatedAt time.Time
@@ -61,6 +66,7 @@ type WarehouseOrderItem struct {
 
 type WarehousePosition struct {
 	ID        uint
+	TenantID  string
 	Title     string
 	Barcode   string
 	UnitID    sql.NullInt32
@@ -71,6 +77,7 @@ type WarehousePosition struct {
 
 type WarehouseProduct struct {
 	ID         uint
+	TenantID   string
 	PositionID uint
 	Rfid       sql.NullString
 	Status     string
diff --git a/modules/warehouse/infrastructure/persistence/order_repository.go b/modules/warehouse/infrastructure/persistence/order_repository.go
index 6320d89fb..61bb9d11a 100644
--- a/modules/warehouse/infrastructure/persistence/order_repository.go
+++ b/modules/warehouse/infrastructure/persistence/order_repository.go
@@ -19,53 +19,56 @@ var (
 
 const (
 	orderFindQuery = `
-		SELECT id, type, status, created_at 
+		SELECT id, tenant_id, type, status, created_at
 		FROM warehouse_orders wo`
 
 	orderCountQuery = `
-		SELECT COUNT(*) as count 
+		SELECT COUNT(*) as count
 		FROM warehouse_orders`
 
 	orderInsertQuery = `
-		INSERT INTO warehouse_orders (type, status, created_at) 
-		VALUES ($1, $2, $3) 
+		INSERT INTO warehouse_orders (tenant_id, type, status, created_at)
+		VALUES ($1, $2, $3, $4)
 		RETURNING id`
 
 	orderItemInsertQuery = `
-		INSERT INTO warehouse_order_items (warehouse_order_id, warehouse_product_id) 
-		VALUES ($1, $2) 
+		INSERT INTO warehouse_order_items (warehouse_order_id, warehouse_product_id)
+		VALUES ($1, $2)
 		ON CONFLICT DO NOTHING`
 
 	orderUpdateQuery = `
-		UPDATE warehouse_orders wo 
-		SET 
+		UPDATE warehouse_orders wo
+		SET
 		type = COALESCE(NULLIF($1, ''), wo.type),
 		status = COALESCE(NULLIF($2, ''), wo.status)
-		WHERE wo.id = $3`
+		WHERE wo.id = $3 AND wo.tenant_id = $4`
 
 	orderItemsDeleteQuery = `
-		DELETE FROM warehouse_order_items 
+		DELETE FROM warehouse_order_items
 		WHERE warehouse_order_id = $1`
 
 	orderDeleteQuery = `
-		DELETE FROM warehouse_orders 
-		WHERE id = $1`
+		DELETE FROM warehouse_orders
+		WHERE id = $1 AND tenant_id = $2`
 
 	selectOrderProductsQuery = `
-		SELECT 
-			wp.id, 
+		SELECT
+			wp.id,
+			wp.tenant_id,
 			wp.position_id,
 			wp.rfid,
 			wp.status,
-			wp.created_at, 
+			wp.created_at,
 			wp.updated_at,
 			p.id,
+			p.tenant_id,
 			p.title,
 			p.barcode,
 			p.unit_id,
 			p.created_at,
 			p.updated_at,
 			wu.id,
+			wu.tenant_id,
 			wu.title,
 			wu.short_title,
 			wu.created_at,
@@ -75,14 +78,14 @@ const (
 		LEFT JOIN warehouse_units wu ON wu.id = p.unit_id`
 
 	insertOrderProductsQuery = `
-		INSERT INTO warehouse_products (position_id, rfid, status, created_at)
-		VALUES ($1, $2, $3, $4)
+		INSERT INTO warehouse_products (tenant_id, position_id, rfid, status, created_at)
+		VALUES ($1, $2, $3, $4, $5)
 		RETURNING id`
 
 	updateOrderProductsQuery = `
-		UPDATE warehouse_products 
+		UPDATE warehouse_products
 		SET position_id = $1, rfid = $2, status = $3
-		WHERE id = $4`
+		WHERE id = $4 AND tenant_id = $5`
 )
 
 type GormOrderRepository struct {
@@ -96,7 +99,12 @@ func NewOrderRepository(productRepo product.Repository) order.Repository {
 }
 
 func (g *GormOrderRepository) GetPaginated(ctx context.Context, params *order.FindParams) ([]order.Order, error) {
-	where, args := []string{"1 = 1"}, []interface{}{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where, args := []string{"wo.tenant_id = $1"}, []interface{}{tenant.ID}
 	if params.CreatedAt.To != "" && params.CreatedAt.From != "" {
 		where, args = append(where, fmt.Sprintf("wo.created_at BETWEEN $%d and $%d", len(args)+1, len(args)+2)), append(args, params.CreatedAt.From, params.CreatedAt.To)
 	}
@@ -120,23 +128,36 @@ func (g *GormOrderRepository) GetPaginated(ctx context.Context, params *order.Fi
 }
 
 func (g *GormOrderRepository) Count(ctx context.Context) (int64, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return 0, err
 	}
 	var count int64
-	if err := tx.QueryRow(ctx, orderCountQuery).Scan(&count); err != nil {
+	if err := tx.QueryRow(ctx, orderCountQuery+" WHERE tenant_id = $1", tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *GormOrderRepository) GetAll(ctx context.Context) ([]order.Order, error) {
-	return g.queryOrders(ctx, orderFindQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+	return g.queryOrders(ctx, orderFindQuery+" WHERE wo.tenant_id = $1", tenant.ID)
 }
 
 func (g *GormOrderRepository) GetByID(ctx context.Context, id uint) (order.Order, error) {
-	orders, err := g.queryOrders(ctx, orderFindQuery+" WHERE wo.id = $1", id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+	orders, err := g.queryOrders(ctx, orderFindQuery+" WHERE wo.id = $1 AND wo.tenant_id = $2", id, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -147,18 +168,31 @@ func (g *GormOrderRepository) GetByID(ctx context.Context, id uint) (order.Order
 }
 
 func (g *GormOrderRepository) Create(ctx context.Context, data order.Order) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return err
 	}
+
+	// Set tenant ID in domain entity
+	data.SetTenantID(tenant.ID)
+
 	dbOrder, dbProducts, err := mappers.ToDBOrder(data)
 	if err != nil {
 		return err
 	}
 
+	// Make sure tenant ID is set in DB model
+	dbOrder.TenantID = tenant.ID.String()
+
 	if err := tx.QueryRow(
 		ctx,
 		orderInsertQuery,
+		dbOrder.TenantID,
 		dbOrder.Type,
 		dbOrder.Status,
 		dbOrder.CreatedAt,
@@ -167,9 +201,13 @@ func (g *GormOrderRepository) Create(ctx context.Context, data order.Order) erro
 	}
 
 	for _, p := range dbProducts {
+		// Set tenant ID in product
+		p.TenantID = tenant.ID.String()
+
 		if err := tx.QueryRow(
 			ctx,
 			insertOrderProductsQuery,
+			p.TenantID,
 			p.PositionID,
 			p.Rfid,
 			p.Status,
@@ -194,21 +232,34 @@ func (g *GormOrderRepository) Create(ctx context.Context, data order.Order) erro
 }
 
 func (g *GormOrderRepository) Update(ctx context.Context, data order.Order) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return err
 	}
+
+	// Set tenant ID in domain entity
+	data.SetTenantID(tenant.ID)
+
 	dbOrder, dbProducts, err := mappers.ToDBOrder(data)
 	if err != nil {
 		return err
 	}
 
+	// Make sure tenant ID is set in DB model
+	dbOrder.TenantID = tenant.ID.String()
+
 	if _, err := tx.Exec(
 		ctx,
 		orderUpdateQuery,
 		dbOrder.Type,
 		dbOrder.Status,
 		dbOrder.ID,
+		dbOrder.TenantID,
 	); err != nil {
 		return err
 	}
@@ -229,6 +280,9 @@ func (g *GormOrderRepository) Update(ctx context.Context, data order.Order) erro
 	}
 
 	for _, product := range dbProducts {
+		// Set tenant ID
+		product.TenantID = tenant.ID.String()
+
 		if _, err := tx.Exec(
 			ctx,
 			updateOrderProductsQuery,
@@ -236,6 +290,7 @@ func (g *GormOrderRepository) Update(ctx context.Context, data order.Order) erro
 			product.Rfid,
 			product.Status,
 			product.ID,
+			product.TenantID,
 		); err != nil {
 			return err
 		}
@@ -245,11 +300,16 @@ func (g *GormOrderRepository) Update(ctx context.Context, data order.Order) erro
 }
 
 func (g *GormOrderRepository) Delete(ctx context.Context, id uint) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	tx, err := composables.UseTx(ctx)
 	if err != nil {
 		return err
 	}
-	if _, err := tx.Exec(ctx, orderDeleteQuery, id); err != nil {
+	if _, err := tx.Exec(ctx, orderDeleteQuery, id, tenant.ID); err != nil {
 		return err
 	}
 	return nil
@@ -276,18 +336,21 @@ func (g *GormOrderRepository) queryProducts(ctx context.Context, query string, a
 
 		if err := rows.Scan(
 			&wp.ID,
+			&wp.TenantID,
 			&wp.PositionID,
 			&wp.Rfid,
 			&wp.Status,
 			&wp.CreatedAt,
 			&wp.UpdatedAt,
 			&pos.ID,
+			&pos.TenantID,
 			&pos.Title,
 			&pos.Barcode,
 			&pos.UnitID,
 			&pos.CreatedAt,
 			&pos.UpdatedAt,
 			&wu.ID,
+			&wu.TenantID,
 			&wu.Title,
 			&wu.ShortTitle,
 			&wu.CreatedAt,
@@ -327,6 +390,7 @@ func (g *GormOrderRepository) queryOrders(ctx context.Context, query string, arg
 		var o models.WarehouseOrder
 		if err := rows.Scan(
 			&o.ID,
+			&o.TenantID,
 			&o.Type,
 			&o.Status,
 			&o.CreatedAt,
diff --git a/modules/warehouse/infrastructure/persistence/position_repository.go b/modules/warehouse/infrastructure/persistence/position_repository.go
index 6f09f22b1..dfe3c9cd4 100644
--- a/modules/warehouse/infrastructure/persistence/position_repository.go
+++ b/modules/warehouse/infrastructure/persistence/position_repository.go
@@ -21,25 +21,27 @@ var (
 
 const (
 	selectPositionQuery = `
-	SELECT 
+	SELECT
 		wp.id,
 		wp.title,
 		wp.barcode,
 		wp.unit_id,
 		wp.created_at,
 		wp.updated_at,
+		wp.tenant_id,
 		wu.id,
 		wu.title,
 		wu.short_title,
 		wu.created_at,
-		wu.updated_at 
+		wu.updated_at,
+		wu.tenant_id
 	FROM warehouse_positions wp JOIN warehouse_units wu ON wp.unit_id = wu.id`
 	selectPositionIdQuery     = `SELECT id FROM warehouse_positions`
 	countPositionQuery        = `SELECT COUNT(*) FROM warehouse_positions`
-	insertPositionQuery       = `INSERT INTO warehouse_positions (title, barcode, unit_id, created_at) VALUES ($1, $2, $3, $4) RETURNING id`
+	insertPositionQuery       = `INSERT INTO warehouse_positions (title, barcode, unit_id, created_at, tenant_id) VALUES ($1, $2, $3, $4, $5) RETURNING id`
 	insertPositionImageQuery  = `INSERT INTO warehouse_position_images (warehouse_position_id, upload_id) VALUES`
-	updatePositionQuery       = `UPDATE warehouse_positions SET title = $1, barcode = $2, unit_id = $3 WHERE id = $4`
-	deletePositionQuery       = `DELETE FROM warehouse_positions WHERE id = $1`
+	updatePositionQuery       = `UPDATE warehouse_positions SET title = $1, barcode = $2, unit_id = $3 WHERE id = $4 AND tenant_id = $5`
+	deletePositionQuery       = `DELETE FROM warehouse_positions WHERE id = $1 AND tenant_id = $2`
 	deletePositionImagesQuery = `DELETE FROM warehouse_position_images WHERE warehouse_position_id = $1`
 )
 
@@ -74,11 +76,13 @@ func (g *GormPositionRepository) queryPositions(ctx context.Context, query strin
 			&p.UnitID,
 			&p.CreatedAt,
 			&p.UpdatedAt,
+			&p.TenantID,
 			&u.ID,
 			&u.Title,
 			&u.ShortTitle,
 			&u.CreatedAt,
 			&u.UpdatedAt,
+			&u.TenantID,
 		); err != nil {
 			return nil, err
 		}
@@ -97,7 +101,12 @@ func (g *GormPositionRepository) queryPositions(ctx context.Context, query strin
 func (g *GormPositionRepository) GetPaginated(
 	ctx context.Context, params *position.FindParams,
 ) ([]*position.Position, error) {
-	where, args := []string{"1 = 1"}, []interface{}{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	where, args := []string{"wp.tenant_id = $1"}, []interface{}{tenant.ID}
 
 	if params.CreatedAt.To != "" && params.CreatedAt.From != "" {
 		where, args = append(where, fmt.Sprintf("wp.created_at BETWEEN $%d and $%d", len(args)+1, len(args)+2)), append(args, params.CreatedAt.From, params.CreatedAt.To)
@@ -135,15 +144,26 @@ func (g *GormPositionRepository) Count(ctx context.Context) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	var count int64
-	if err := tx.QueryRow(ctx, countPositionQuery).Scan(&count); err != nil {
+	if err := tx.QueryRow(ctx, countPositionQuery+" WHERE tenant_id = $1", tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *GormPositionRepository) GetAll(ctx context.Context) ([]*position.Position, error) {
-	positions, err := g.queryPositions(ctx, selectPositionQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	positions, err := g.queryPositions(ctx, selectPositionQuery+" WHERE wp.tenant_id = $1", tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get all positions")
 	}
@@ -155,7 +175,13 @@ func (g *GormPositionRepository) GetAllPositionIds(ctx context.Context) ([]uint,
 	if err != nil {
 		return make([]uint, 0), err
 	}
-	rows, err := pool.Query(ctx, selectPositionIdQuery)
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	rows, err := pool.Query(ctx, selectPositionIdQuery+" WHERE tenant_id = $1", tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -173,7 +199,12 @@ func (g *GormPositionRepository) GetAllPositionIds(ctx context.Context) ([]uint,
 }
 
 func (g *GormPositionRepository) GetByID(ctx context.Context, id uint) (*position.Position, error) {
-	positions, err := g.queryPositions(ctx, repo.Join(selectPositionQuery, "WHERE wp.id = $1"), id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	positions, err := g.queryPositions(ctx, repo.Join(selectPositionQuery, "WHERE wp.id = $1 AND wp.tenant_id = $2"), id, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -184,7 +215,12 @@ func (g *GormPositionRepository) GetByID(ctx context.Context, id uint) (*positio
 }
 
 func (g *GormPositionRepository) GetByIDs(ctx context.Context, ids []uint) ([]*position.Position, error) {
-	positions, err := g.queryPositions(ctx, repo.Join(selectPositionQuery, "WHERE wp.id = ANY($1)"), ids)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	positions, err := g.queryPositions(ctx, repo.Join(selectPositionQuery, "WHERE wp.id = ANY($1) AND wp.tenant_id = $2"), ids, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -192,7 +228,12 @@ func (g *GormPositionRepository) GetByIDs(ctx context.Context, ids []uint) ([]*p
 }
 
 func (g *GormPositionRepository) GetByBarcode(ctx context.Context, barcode string) (*position.Position, error) {
-	positions, err := g.queryPositions(ctx, repo.Join(selectPositionQuery, "WHERE wp.barcode = $1"), barcode)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	positions, err := g.queryPositions(ctx, repo.Join(selectPositionQuery, "WHERE wp.barcode = $1 AND wp.tenant_id = $2"), barcode, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -224,7 +265,16 @@ func (g *GormPositionRepository) Create(ctx context.Context, data *position.Posi
 	if err != nil {
 		return err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	positionRow, junctionRows := mappers.ToDBPosition(data)
+	positionRow.TenantID = tenant.ID.String()
+	data.TenantID = tenant.ID
+
 	if err := tx.QueryRow(
 		ctx,
 		insertPositionQuery,
@@ -232,6 +282,7 @@ func (g *GormPositionRepository) Create(ctx context.Context, data *position.Posi
 		positionRow.Barcode,
 		positionRow.UnitID,
 		positionRow.CreatedAt,
+		positionRow.TenantID,
 	).Scan(&data.ID); err != nil {
 		return err
 	}
@@ -254,7 +305,16 @@ func (g *GormPositionRepository) Update(ctx context.Context, data *position.Posi
 	if err != nil {
 		return err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get tenant from context")
+	}
+
 	positionRow, junctionRows := mappers.ToDBPosition(data)
+	positionRow.TenantID = tenant.ID.String()
+	data.TenantID = tenant.ID
+
 	if _, err := tx.Exec(
 		ctx,
 		updatePositionQuery,
@@ -262,6 +322,7 @@ func (g *GormPositionRepository) Update(ctx context.Context, data *position.Posi
 		positionRow.Barcode,
 		positionRow.UnitID,
 		positionRow.ID,
+		positionRow.TenantID,
 	); err != nil {
 		return err
 	}
@@ -287,7 +348,13 @@ func (g *GormPositionRepository) Delete(ctx context.Context, id uint) error {
 	if err != nil {
 		return err
 	}
-	if _, err := tx.Exec(ctx, deletePositionQuery, id); err != nil {
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	if _, err := tx.Exec(ctx, deletePositionQuery, id, tenant.ID); err != nil {
 		return err
 	}
 	return nil
diff --git a/modules/warehouse/infrastructure/persistence/position_repository_test.go b/modules/warehouse/infrastructure/persistence/position_repository_test.go
index 7df898221..df26caa71 100644
--- a/modules/warehouse/infrastructure/persistence/position_repository_test.go
+++ b/modules/warehouse/infrastructure/persistence/position_repository_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/gabriel-vasile/mimetype"
 	"github.com/go-faster/errors"
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/upload"
 	core "github.com/iota-uz/iota-sdk/modules/core/infrastructure/persistence"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/infrastructure/persistence"
@@ -41,6 +42,7 @@ func BenchmarkGormPositionRepository_Create(b *testing.B) {
 			f.ctx,
 			upload.NewWithID(
 				0,
+				uuid.Nil, // tenant_id will be set correctly in repository
 				random.String(32, random.LowerCharSet),
 				"image.png",
 				"image.png",
@@ -101,6 +103,7 @@ func TestGormPositionRepository_CRUD(t *testing.T) {
 		f.ctx,
 		upload.NewWithID(
 			1,
+			uuid.Nil, // tenant_id will be set correctly in repository
 			"hash",
 			"url",
 			"image.png",
diff --git a/modules/warehouse/infrastructure/persistence/product_repository.go b/modules/warehouse/infrastructure/persistence/product_repository.go
index 4198ea323..7836e3cad 100644
--- a/modules/warehouse/infrastructure/persistence/product_repository.go
+++ b/modules/warehouse/infrastructure/persistence/product_repository.go
@@ -19,20 +19,23 @@ var (
 
 const (
 	productFindQuery = `
-		SELECT 
-			wp.id, 
+		SELECT
+			wp.id,
+			wp.tenant_id,
 			wp.position_id,
 			wp.rfid,
 			wp.status,
-			wp.created_at, 
+			wp.created_at,
 			wp.updated_at,
 			p.id,
+			p.tenant_id,
 			p.title,
 			p.barcode,
 			p.unit_id,
 			p.created_at,
 			p.updated_at,
 			wu.id,
+			wu.tenant_id,
 			wu.title,
 			wu.short_title,
 			wu.created_at,
@@ -45,27 +48,27 @@ const (
 		SELECT COUNT(DISTINCT wp.id) FROM warehouse_products wp`
 
 	productInsertQuery = `
-		INSERT INTO warehouse_products (position_id, rfid, status, created_at) 
-		VALUES ($1, $2, $3, $4)
+		INSERT INTO warehouse_products (tenant_id, position_id, rfid, status, created_at)
+		VALUES ($1, $2, $3, $4, $5)
 		RETURNING id`
 
 	productUpdateQuery = `
-		UPDATE warehouse_products 
+		UPDATE warehouse_products
 		SET position_id = $1, rfid = $2, status = $3
-		WHERE id = $4`
+		WHERE id = $4 AND tenant_id = $5`
 
 	productUpdateStatusQuery = `
-		UPDATE warehouse_products 
+		UPDATE warehouse_products
 		SET status = $1
-		WHERE id = ANY($2)`
+		WHERE id = ANY($2) AND tenant_id = $3`
 
 	productDeleteQuery = `
-		DELETE FROM warehouse_products 
-		WHERE id = $1`
+		DELETE FROM warehouse_products
+		WHERE id = $1 AND tenant_id = $2`
 
 	productBulkDeleteQuery = `
-		DELETE FROM warehouse_products 
-		WHERE id = ANY($1)`
+		DELETE FROM warehouse_products
+		WHERE id = ANY($1) AND tenant_id = $2`
 )
 
 type GormProductRepository struct {
@@ -76,7 +79,12 @@ func NewProductRepository() product.Repository {
 }
 
 func (g *GormProductRepository) GetPaginated(ctx context.Context, params *product.FindParams) ([]*product.Product, error) {
-	where, args := []string{"1 = 1"}, []interface{}{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where, args := []string{"wp.tenant_id = $1"}, []interface{}{tenant.ID}
 
 	if params.OrderID != 0 {
 		where = append(where, fmt.Sprintf(
@@ -132,7 +140,12 @@ func (g *GormProductRepository) GetPaginated(ctx context.Context, params *produc
 }
 
 func (g *GormProductRepository) Count(ctx context.Context, opts *product.CountParams) (int64, error) {
-	where, args := []string{"1 = 1"}, []interface{}{}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	where, args := []string{"tenant_id = $1"}, []interface{}{tenant.ID}
 
 	if opts.PositionID != 0 {
 		where = append(where, fmt.Sprintf("position_id = $%d", len(args)+1))
@@ -167,11 +180,20 @@ func (g *GormProductRepository) FindByPositionID(ctx context.Context, opts *prod
 }
 
 func (g *GormProductRepository) GetAll(ctx context.Context) ([]*product.Product, error) {
-	return g.queryProducts(ctx, productFindQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+	return g.queryProducts(ctx, productFindQuery+" WHERE wp.tenant_id = $1", tenant.ID)
 }
 
 func (g *GormProductRepository) GetByID(ctx context.Context, id uint) (*product.Product, error) {
-	products, err := g.queryProducts(ctx, productFindQuery+" WHERE wp.id = $1", id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	products, err := g.queryProducts(ctx, productFindQuery+" WHERE wp.id = $1 AND wp.tenant_id = $2", id, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -182,7 +204,12 @@ func (g *GormProductRepository) GetByID(ctx context.Context, id uint) (*product.
 }
 
 func (g *GormProductRepository) GetByRfid(ctx context.Context, rfid string) (*product.Product, error) {
-	products, err := g.queryProducts(ctx, productFindQuery+" WHERE wp.rfid = $1", rfid)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	products, err := g.queryProducts(ctx, productFindQuery+" WHERE wp.rfid = $1 AND wp.tenant_id = $2", rfid, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -204,14 +231,23 @@ func (g *GormProductRepository) Create(ctx context.Context, data *product.Produc
 		return err
 	}
 
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	dbProduct, err := mappers.ToDBProduct(data)
 	if err != nil {
 		return err
 	}
 
+	dbProduct.TenantID = tenant.ID.String()
+	data.TenantID = tenant.ID
+
 	if err := tx.QueryRow(
 		ctx,
 		productInsertQuery,
+		dbProduct.TenantID,
 		dbProduct.PositionID,
 		dbProduct.Rfid,
 		dbProduct.Status,
@@ -243,31 +279,55 @@ func (g *GormProductRepository) CreateOrUpdate(ctx context.Context, data *produc
 }
 
 func (g *GormProductRepository) Update(ctx context.Context, data *product.Product) error {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
 	dbProduct, err := mappers.ToDBProduct(data)
 	if err != nil {
 		return err
 	}
+
+	dbProduct.TenantID = tenant.ID.String()
+	data.TenantID = tenant.ID
+
 	return g.execQuery(
 		ctx,
 		productUpdateQuery,
 		dbProduct.PositionID,
 		dbProduct.Rfid,
 		dbProduct.Status,
-		dbProduct.UpdatedAt,
 		dbProduct.ID,
+		dbProduct.TenantID,
 	)
 }
 
 func (g *GormProductRepository) UpdateStatus(ctx context.Context, ids []uint, status product.Status) error {
-	return g.execQuery(ctx, productUpdateStatusQuery, status, ids)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	return g.execQuery(ctx, productUpdateStatusQuery, status, ids, tenant.ID)
 }
 
 func (g *GormProductRepository) Delete(ctx context.Context, id uint) error {
-	return g.execQuery(ctx, productDeleteQuery, id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	return g.execQuery(ctx, productDeleteQuery, id, tenant.ID)
 }
 
 func (g *GormProductRepository) BulkDelete(ctx context.Context, ids []uint) error {
-	return g.execQuery(ctx, productBulkDeleteQuery, ids)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get tenant from context: %w", err)
+	}
+
+	return g.execQuery(ctx, productBulkDeleteQuery, ids, tenant.ID)
 }
 
 func (g *GormProductRepository) queryProducts(ctx context.Context, query string, args ...interface{}) ([]*product.Product, error) {
@@ -291,18 +351,21 @@ func (g *GormProductRepository) queryProducts(ctx context.Context, query string,
 
 		if err := rows.Scan(
 			&wp.ID,
+			&wp.TenantID,
 			&wp.PositionID,
 			&wp.Rfid,
 			&wp.Status,
 			&wp.CreatedAt,
 			&wp.UpdatedAt,
 			&pos.ID,
+			&pos.TenantID,
 			&pos.Title,
 			&pos.Barcode,
 			&pos.UnitID,
 			&pos.CreatedAt,
 			&pos.UpdatedAt,
 			&wu.ID,
+			&wu.TenantID,
 			&wu.Title,
 			&wu.ShortTitle,
 			&wu.CreatedAt,
diff --git a/modules/warehouse/infrastructure/persistence/schema/warehouse-schema.sql b/modules/warehouse/infrastructure/persistence/schema/warehouse-schema.sql
index eaead9933..938c1de59 100644
--- a/modules/warehouse/infrastructure/persistence/schema/warehouse-schema.sql
+++ b/modules/warehouse/infrastructure/persistence/schema/warehouse-schema.sql
@@ -1,19 +1,24 @@
 CREATE TABLE warehouse_units (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     title varchar(255) NOT NULL, -- Kilogram, Piece, etc.
     short_title varchar(255) NOT NULL, -- kg, pcs, etc.
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, title),
+    UNIQUE (tenant_id, short_title)
 );
 
 CREATE TABLE warehouse_positions (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     title varchar(255) NOT NULL,
-    barcode varchar(255) NOT NULL UNIQUE,
+    barcode varchar(255) NOT NULL,
     description text,
     unit_id int REFERENCES warehouse_units (id) ON DELETE SET NULL,
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, barcode)
 );
 
 CREATE TABLE warehouse_position_images (
@@ -24,15 +29,18 @@ CREATE TABLE warehouse_position_images (
 
 CREATE TABLE warehouse_products (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     position_id int NOT NULL REFERENCES warehouse_positions (id) ON DELETE CASCADE,
-    rfid varchar(255) NULL UNIQUE,
+    rfid varchar(255) NULL,
     status varchar(255) NOT NULL,
     created_at timestamp with time zone DEFAULT now(),
-    updated_at timestamp with time zone DEFAULT now()
+    updated_at timestamp with time zone DEFAULT now(),
+    UNIQUE (tenant_id, rfid)
 );
 
 CREATE TABLE warehouse_orders (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     type VARCHAR(255) NOT NULL,
     status varchar(255) NOT NULL,
     created_at timestamp with time zone DEFAULT now()
@@ -46,6 +54,7 @@ CREATE TABLE warehouse_order_items (
 
 CREATE TABLE inventory_checks (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     status varchar(255) NOT NULL,
     name varchar(255) NOT NULL,
     type VARCHAR(255) NOT NULL,
@@ -57,6 +66,7 @@ CREATE TABLE inventory_checks (
 
 CREATE TABLE inventory_check_results (
     id serial PRIMARY KEY,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     inventory_check_id int NOT NULL REFERENCES inventory_checks (id) ON DELETE CASCADE,
     position_id int NOT NULL REFERENCES warehouse_positions (id) ON DELETE CASCADE,
     expected_quantity int NOT NULL,
@@ -65,3 +75,15 @@ CREATE TABLE inventory_check_results (
     created_at timestamp with time zone DEFAULT now()
 );
 
+CREATE INDEX warehouse_units_tenant_id_idx ON warehouse_units (tenant_id);
+
+CREATE INDEX warehouse_positions_tenant_id_idx ON warehouse_positions (tenant_id);
+
+CREATE INDEX warehouse_products_tenant_id_idx ON warehouse_products (tenant_id);
+
+CREATE INDEX warehouse_orders_tenant_id_idx ON warehouse_orders (tenant_id);
+
+CREATE INDEX inventory_checks_tenant_id_idx ON inventory_checks (tenant_id);
+
+CREATE INDEX inventory_check_results_tenant_id_idx ON inventory_check_results (tenant_id);
+
diff --git a/modules/warehouse/infrastructure/persistence/setup_test.go b/modules/warehouse/infrastructure/persistence/setup_test.go
index d39db60ed..b8f191c95 100644
--- a/modules/warehouse/infrastructure/persistence/setup_test.go
+++ b/modules/warehouse/infrastructure/persistence/setup_test.go
@@ -53,11 +53,24 @@ func setupBenchmark(b *testing.B) *testFixtures {
 	ctx = composables.WithTx(ctx, tx)
 	ctx = composables.WithSession(ctx, &session.Session{})
 
+	// Setup application and run migrations
 	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
 	if err != nil {
 		b.Fatal(err)
 	}
 
+	// Run migrations first to create all tables including tenants
+	if err := app.Migrations().Run(); err != nil {
+		b.Fatal(err)
+	}
+
+	// Create a test tenant and add it to the context
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		b.Fatal(err)
+	}
+	ctx = composables.WithTenant(ctx, tenant)
+
 	return &testFixtures{
 		ctx:  ctx,
 		pool: pool,
@@ -88,11 +101,24 @@ func setupTest(t *testing.T) *testFixtures {
 	ctx = composables.WithTx(ctx, tx)
 	ctx = composables.WithSession(ctx, &session.Session{})
 
+	// Setup application and run migrations
 	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
 	if err != nil {
 		t.Fatal(err)
 	}
 
+	// Run migrations first to create all tables including tenants
+	if err := app.Migrations().Run(); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a test tenant and add it to the context
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx = composables.WithTenant(ctx, tenant)
+
 	return &testFixtures{
 		ctx:  ctx,
 		pool: pool,
diff --git a/modules/warehouse/infrastructure/persistence/unit_repository.go b/modules/warehouse/infrastructure/persistence/unit_repository.go
index 9f5b60299..b8b334c3d 100644
--- a/modules/warehouse/infrastructure/persistence/unit_repository.go
+++ b/modules/warehouse/infrastructure/persistence/unit_repository.go
@@ -16,11 +16,11 @@ var (
 )
 
 const (
-	selectUnitsQuery = `SELECT id, title, short_title, created_at, updated_at FROM warehouse_units`
+	selectUnitsQuery = `SELECT id, title, short_title, created_at, updated_at, tenant_id FROM warehouse_units`
 	countUnitsQuery  = `SELECT COUNT(*) FROM warehouse_units`
-	insertUnitQuery  = `INSERT INTO warehouse_units (title, short_title, created_at) VALUES ($1, $2, $3) RETURNING id`
-	updateUnitQuery  = `UPDATE warehouse_units SET title = $1, short_title = $2, updated_at = $3 WHERE id = $4`
-	deleteUnitQuery  = `DELETE FROM warehouse_units WHERE id = $1`
+	insertUnitQuery  = `INSERT INTO warehouse_units (title, short_title, created_at, tenant_id) VALUES ($1, $2, $3, $4) RETURNING id`
+	updateUnitQuery  = `UPDATE warehouse_units SET title = $1, short_title = $2, updated_at = $3 WHERE id = $4 AND tenant_id = $5`
+	deleteUnitQuery  = `DELETE FROM warehouse_units WHERE id = $1 AND tenant_id = $2`
 )
 
 type GormUnitRepository struct{}
@@ -30,12 +30,19 @@ func NewUnitRepository() unit.Repository {
 }
 
 func (g *GormUnitRepository) GetPaginated(ctx context.Context, params *unit.FindParams) ([]*unit.Unit, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	return g.queryUnits(
 		ctx,
 		repo.Join(
 			selectUnitsQuery,
+			"WHERE tenant_id = $1",
 			repo.FormatLimitOffset(params.Limit, params.Offset),
 		),
+		tenant.ID,
 	)
 }
 
@@ -44,15 +51,26 @@ func (g *GormUnitRepository) Count(ctx context.Context) (uint, error) {
 	if err != nil {
 		return 0, err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return 0, err
+	}
+
 	var count uint
-	if err := pool.QueryRow(ctx, countUnitsQuery).Scan(&count); err != nil {
+	if err := pool.QueryRow(ctx, countUnitsQuery+" WHERE tenant_id = $1", tenant.ID).Scan(&count); err != nil {
 		return 0, err
 	}
 	return count, nil
 }
 
 func (g *GormUnitRepository) GetAll(ctx context.Context) ([]*unit.Unit, error) {
-	units, err := g.queryUnits(ctx, selectUnitsQuery)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	units, err := g.queryUnits(ctx, selectUnitsQuery+" WHERE tenant_id = $1", tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -61,7 +79,12 @@ func (g *GormUnitRepository) GetAll(ctx context.Context) ([]*unit.Unit, error) {
 }
 
 func (g *GormUnitRepository) GetByID(ctx context.Context, id uint) (*unit.Unit, error) {
-	units, err := g.queryUnits(ctx, selectUnitsQuery+" WHERE id = $1", id)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	units, err := g.queryUnits(ctx, selectUnitsQuery+" WHERE id = $1 AND tenant_id = $2", id, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -74,7 +97,12 @@ func (g *GormUnitRepository) GetByID(ctx context.Context, id uint) (*unit.Unit,
 }
 
 func (g *GormUnitRepository) GetByTitleOrShortTitle(ctx context.Context, name string) (*unit.Unit, error) {
-	units, err := g.queryUnits(ctx, selectUnitsQuery+" WHERE title = $1 OR short_title = $1", name)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	units, err := g.queryUnits(ctx, selectUnitsQuery+" WHERE (title = $1 OR short_title = $1) AND tenant_id = $2", name, tenant.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -90,13 +118,22 @@ func (g *GormUnitRepository) Create(ctx context.Context, data *unit.Unit) error
 	if err != nil {
 		return err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return err
+	}
+
 	dbRow := mappers.ToDBUnit(data)
+	dbRow.TenantID = tenant.ID.String()
+
 	if err := tx.QueryRow(
 		ctx,
 		insertUnitQuery,
 		dbRow.Title,
 		dbRow.ShortTitle,
 		dbRow.CreatedAt,
+		dbRow.TenantID,
 	).Scan(&data.ID); err != nil {
 		return err
 	}
@@ -125,7 +162,15 @@ func (g *GormUnitRepository) Update(ctx context.Context, data *unit.Unit) error
 	if err != nil {
 		return err
 	}
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return err
+	}
+
 	dbRow := mappers.ToDBUnit(data)
+	dbRow.TenantID = tenant.ID.String()
+
 	if _, err := tx.Exec(
 		ctx,
 		updateUnitQuery,
@@ -133,6 +178,7 @@ func (g *GormUnitRepository) Update(ctx context.Context, data *unit.Unit) error
 		dbRow.ShortTitle,
 		dbRow.UpdatedAt,
 		dbRow.ID,
+		dbRow.TenantID,
 	); err != nil {
 		return err
 	}
@@ -144,7 +190,13 @@ func (g *GormUnitRepository) Delete(ctx context.Context, id uint) error {
 	if err != nil {
 		return err
 	}
-	if _, err := tx.Exec(ctx, deleteUnitQuery, id); err != nil {
+
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return err
+	}
+
+	if _, err := tx.Exec(ctx, deleteUnitQuery, id, tenant.ID); err != nil {
 		return err
 	}
 	return nil
@@ -170,11 +222,15 @@ func (g *GormUnitRepository) queryUnits(ctx context.Context, query string, args
 			&u.ShortTitle,
 			&u.CreatedAt,
 			&u.UpdatedAt,
+			&u.TenantID,
 		); err != nil {
 			return nil, err
 		}
 
-		domainUnit := mappers.ToDomainUnit(&u)
+		domainUnit, err := mappers.ToDomainUnit(&u)
+		if err != nil {
+			return nil, err
+		}
 		units = append(units, domainUnit)
 	}
 
diff --git a/modules/warehouse/services/orderservice/setup_test.go b/modules/warehouse/services/orderservice/setup_test.go
index b933ad42c..f427718bc 100644
--- a/modules/warehouse/services/orderservice/setup_test.go
+++ b/modules/warehouse/services/orderservice/setup_test.go
@@ -60,11 +60,24 @@ func setupTest(t *testing.T) *testFixtures {
 	ctx = composables.WithTx(ctx, tx)
 	ctx = composables.WithSession(ctx, &session.Session{})
 
+	// Setup application and run migrations
 	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
 	if err != nil {
 		t.Fatal(err)
 	}
 
+	// Run migrations first to create all tables including tenants
+	if err := app.Migrations().Run(); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a test tenant and add it to the context
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx = composables.WithTenant(ctx, tenant)
+
 	return &testFixtures{
 		ctx:  ctx,
 		pool: pool,
diff --git a/modules/warehouse/services/positionservice/position_service_test.go b/modules/warehouse/services/positionservice/position_service_test.go
index 49c8316d8..5fe5f2b4a 100644
--- a/modules/warehouse/services/positionservice/position_service_test.go
+++ b/modules/warehouse/services/positionservice/position_service_test.go
@@ -1,115 +1,12 @@
 package positionservice_test
 
 import (
-	"context"
-	"log"
-	"os"
 	"testing"
 
-	"github.com/jackc/pgx/v5/pgxpool"
-	"github.com/xuri/excelize/v2"
-
-	"github.com/iota-uz/iota-sdk/modules"
-	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/session"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/infrastructure/persistence"
-	"github.com/iota-uz/iota-sdk/modules/warehouse/permissions"
 	"github.com/iota-uz/iota-sdk/modules/warehouse/services/positionservice"
-	"github.com/iota-uz/iota-sdk/pkg/application"
-	"github.com/iota-uz/iota-sdk/pkg/composables"
-	"github.com/iota-uz/iota-sdk/pkg/testutils"
-)
-
-var (
-	TestFilePath = "test.xlsx"
-	Data         = []map[string]interface{}{
-		{"A1": "Наименование", "B1": "Код в справочнике", "C1": "Ед. изм.", "D1": "Количество"},
-		{"A2": "Дрель Молоток N.C.V (900W)", "B2": "3241324132", "C2": "шт", "D2": 10},
-		{"A3": "Дрель Молоток N.C.V (900W)", "B3": "9230891234", "C3": "шт", "D3": 10},
-		{"A4": "Дрель Молоток N.C.V (900W)", "B4": "3242198021", "C4": "шт", "D4": 3},
-	}
-	TotalProducts = 23
 )
 
-func TestMain(m *testing.M) {
-	if err := os.Chdir("../../../../"); err != nil {
-		panic(err)
-	}
-	if err := createTestFile(TestFilePath); err != nil {
-		panic(err)
-	}
-	code := m.Run()
-	if err := os.Remove(TestFilePath); err != nil {
-		log.Println(err)
-	}
-	os.Exit(code)
-}
-
-// testFixtures contains common test dependencies
-type testFixtures struct {
-	ctx  context.Context
-	pool *pgxpool.Pool
-	app  application.Application
-}
-
-// setupTest creates all necessary dependencies for tests
-func setupTest(t *testing.T) *testFixtures {
-	t.Helper()
-
-	testutils.CreateDB(t.Name())
-	pool := testutils.NewPool(testutils.DbOpts(t.Name()))
-
-	ctx := composables.WithUser(context.Background(), testutils.MockUser(
-		permissions.PositionCreate,
-		permissions.PositionRead,
-		permissions.ProductCreate,
-		permissions.ProductRead,
-		permissions.UnitCreate,
-		permissions.UnitRead,
-	))
-	tx, err := pool.Begin(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Cleanup(func() {
-		if err := tx.Commit(ctx); err != nil {
-			t.Fatal(err)
-		}
-		pool.Close()
-	})
-
-	ctx = composables.WithTx(ctx, tx)
-	ctx = composables.WithSession(ctx, &session.Session{})
-
-	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return &testFixtures{
-		ctx:  ctx,
-		pool: pool,
-		app:  app,
-	}
-}
-
-func createTestFile(path string) error {
-	f := excelize.NewFile()
-	defer func() {
-		if err := f.Close(); err != nil {
-			log.Println(err)
-		}
-	}()
-	for _, v := range Data {
-		for k, val := range v {
-			if err := f.SetCellValue("Sheet1", k, val); err != nil {
-				return err
-			}
-		}
-	}
-	return f.SaveAs(path)
-}
-
 func TestPositionService_LoadFromFilePath(t *testing.T) {
 	t.Parallel()
 	f := setupTest(t)
@@ -128,31 +25,45 @@ func TestPositionService_LoadFromFilePath(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	if len(positions) != len(Data)-1 {
-		t.Fatalf("expected %d, got %d", len(Data)-1, len(positions))
-	}
 
-	if positions[0].Title != Data[1]["A2"] {
-		t.Errorf("expected %s, got %s", Data[1]["A2"], positions[0].Title)
+	if len(positions) != 3 {
+		t.Errorf("expected 3 position, got %d", len(positions))
 	}
 
-	if positions[0].Barcode != Data[1]["B2"] {
-		t.Errorf("expected %s, got %s", Data[1]["B2"], positions[0].Barcode)
+	found := false
+	for _, pos := range positions {
+		if pos.Title == "Дрель Молоток N.C.V (900W)" {
+			found = true
+			break
+		}
+	}
+	if !found {
+		t.Errorf("position with title 'Дрель Молоток N.C.V (900W)' not found")
 	}
 
 	units, err := unitRepo.GetAll(f.ctx)
 	if err != nil {
 		t.Error(err)
 	}
+
 	if len(units) != 1 {
-		t.Errorf("expected %d, got %d", 1, len(units))
+		t.Errorf("expected 1 unit, got %d", len(units))
+	}
+
+	if units[0].Title != "шт" {
+		t.Errorf("expected title %s, got %s", "шт", units[0].Title)
+	}
+
+	if units[0].ShortTitle != "шт" {
+		t.Errorf("expected short title %s, got %s", "шт", units[0].ShortTitle)
 	}
 
 	products, err := productRepo.GetAll(f.ctx)
 	if err != nil {
 		t.Error(err)
 	}
+
 	if len(products) != TotalProducts {
-		t.Errorf("expected %d, got %d", TotalProducts, len(products))
+		t.Errorf("expected %d products, got %d", TotalProducts, len(products))
 	}
 }
diff --git a/modules/warehouse/services/positionservice/setup_test.go b/modules/warehouse/services/positionservice/setup_test.go
new file mode 100644
index 000000000..e37180dc8
--- /dev/null
+++ b/modules/warehouse/services/positionservice/setup_test.go
@@ -0,0 +1,127 @@
+package positionservice_test
+
+import (
+	"context"
+	"log"
+	"os"
+	"testing"
+
+	"github.com/iota-uz/iota-sdk/modules"
+	"github.com/iota-uz/iota-sdk/modules/core/domain/entities/session"
+	"github.com/iota-uz/iota-sdk/modules/warehouse/permissions"
+	"github.com/iota-uz/iota-sdk/pkg/application"
+	"github.com/iota-uz/iota-sdk/pkg/composables"
+	"github.com/iota-uz/iota-sdk/pkg/testutils"
+	"github.com/jackc/pgx/v5/pgxpool"
+	"github.com/xuri/excelize/v2"
+)
+
+var (
+	TestFilePath = "test.xlsx"
+	Data         = []map[string]interface{}{
+		{"A1": "Наименование", "B1": "Код в справочнике", "C1": "Ед. изм.", "D1": "Количество"},
+		{"A2": "Дрель Молоток N.C.V (900W)", "B2": "3241324132", "C2": "шт", "D2": 10},
+		{"A3": "Дрель Молоток N.C.V (900W)", "B3": "9230891234", "C3": "шт", "D3": 10},
+		{"A4": "Дрель Молоток N.C.V (900W)", "B4": "3242198021", "C4": "шт", "D4": 3},
+	}
+	TotalProducts = 23
+)
+
+func TestMain(m *testing.M) {
+	if err := os.Chdir("../../../../"); err != nil {
+		panic(err)
+	}
+
+	// Create the test file for position service tests
+	if err := createTestFile(TestFilePath); err != nil {
+		panic(err)
+	}
+
+	code := m.Run()
+
+	// Clean up the test file
+	if err := os.Remove(TestFilePath); err != nil {
+		log.Println("Failed to remove test file:", err)
+	}
+
+	os.Exit(code)
+}
+
+// testFixtures contains common test dependencies
+type testFixtures struct {
+	ctx  context.Context
+	pool *pgxpool.Pool
+	app  application.Application
+}
+
+// setupTest creates all necessary dependencies for tests
+func setupTest(t *testing.T) *testFixtures {
+	t.Helper()
+
+	testutils.CreateDB(t.Name())
+	pool := testutils.NewPool(testutils.DbOpts(t.Name()))
+
+	ctx := composables.WithUser(context.Background(), testutils.MockUser(
+		permissions.PositionCreate,
+		permissions.PositionRead,
+		permissions.ProductCreate,
+		permissions.ProductRead,
+		permissions.UnitCreate,
+		permissions.UnitRead,
+	))
+	tx, err := pool.Begin(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Cleanup(func() {
+		if err := tx.Commit(ctx); err != nil {
+			t.Fatal(err)
+		}
+		pool.Close()
+	})
+
+	ctx = composables.WithTx(ctx, tx)
+	ctx = composables.WithSession(ctx, &session.Session{})
+
+	// Setup application and run migrations
+	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Run migrations first to create all tables including tenants
+	if err := app.Migrations().Run(); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a test tenant and add it to the context
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx = composables.WithTenant(ctx, tenant)
+
+	return &testFixtures{
+		ctx:  ctx,
+		pool: pool,
+		app:  app,
+	}
+}
+
+func createTestFile(path string) error {
+	f := excelize.NewFile()
+	defer func() {
+		if err := f.Close(); err != nil {
+			log.Println(err)
+		}
+	}()
+	for _, v := range Data {
+		for k, val := range v {
+			if err := f.SetCellValue("Sheet1", k, val); err != nil {
+				return err
+			}
+		}
+	}
+	return f.SaveAs(path)
+}
diff --git a/modules/website/domain/entities/aichatconfig/aichatconfig.go b/modules/website/domain/entities/aichatconfig/aichatconfig.go
index ecb973024..1b75c96ec 100644
--- a/modules/website/domain/entities/aichatconfig/aichatconfig.go
+++ b/modules/website/domain/entities/aichatconfig/aichatconfig.go
@@ -24,6 +24,7 @@ const (
 
 type AIConfig interface {
 	ID() uuid.UUID
+	TenantID() uuid.UUID
 	ModelName() string
 	ModelType() AIModelType
 	SystemPrompt() string
@@ -54,6 +55,7 @@ type Repository interface {
 
 type aiConfig struct {
 	id           uuid.UUID
+	tenantID     uuid.UUID
 	modelName    string
 	modelType    AIModelType
 	systemPrompt string
@@ -95,6 +97,7 @@ func New(
 
 	cfg := &aiConfig{
 		id:           uuid.New(),
+		tenantID:     uuid.Nil, // Will be set via WithTenantID option
 		modelName:    modelName,
 		modelType:    modelType,
 		systemPrompt: "",
@@ -123,6 +126,14 @@ func WithID(id uuid.UUID) Option {
 	}
 }
 
+func WithTenantID(tenantID uuid.UUID) Option {
+	return func(c *aiConfig) {
+		if tenantID != uuid.Nil {
+			c.tenantID = tenantID
+		}
+	}
+}
+
 func WithSystemPrompt(prompt string) Option {
 	return func(c *aiConfig) {
 		c.systemPrompt = prompt
@@ -185,6 +196,10 @@ func (c *aiConfig) ID() uuid.UUID {
 	return c.id
 }
 
+func (c *aiConfig) TenantID() uuid.UUID {
+	return c.tenantID
+}
+
 func (c *aiConfig) ModelName() string {
 	return c.modelName
 }
diff --git a/modules/website/infrastructure/persistence/aichatconfig_repository.go b/modules/website/infrastructure/persistence/aichatconfig_repository.go
index d30586587..c14b951aa 100644
--- a/modules/website/infrastructure/persistence/aichatconfig_repository.go
+++ b/modules/website/infrastructure/persistence/aichatconfig_repository.go
@@ -16,6 +16,7 @@ import (
 const (
 	aiConfigFindQuery = `
 		SELECT id,
+			tenant_id,
 			model_name,
 			model_type,
 			system_prompt,
@@ -32,8 +33,8 @@ const (
 
 	aiConfigInsertQuery = `
 		INSERT INTO ai_chat_configs 
-		(id, model_name, model_type, system_prompt, temperature, max_tokens, base_url, access_token, is_default, created_at, updated_at) 
-		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) 
+		(id, tenant_id, model_name, model_type, system_prompt, temperature, max_tokens, base_url, access_token, is_default, created_at, updated_at) 
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) 
 		RETURNING id`
 
 	aiConfigUpdateQuery = `
@@ -44,7 +45,7 @@ const (
 
 	aiConfigDeleteQuery = `DELETE FROM ai_chat_configs WHERE id = $1`
 
-	aiConfigClearDefaultQuery = `UPDATE ai_chat_configs SET is_default = false, updated_at = $1 WHERE is_default = true`
+	aiConfigClearDefaultQuery = `UPDATE ai_chat_configs SET is_default = false, updated_at = $1 WHERE is_default = true AND tenant_id = $2`
 
 	aiConfigSetDefaultQuery = `UPDATE ai_chat_configs SET is_default = true, updated_at = $1 WHERE id = $2`
 
@@ -69,7 +70,12 @@ func (r *AIChatConfigRepository) GetByID(ctx context.Context, id uuid.UUID) (aic
 }
 
 func (r *AIChatConfigRepository) GetDefault(ctx context.Context) (aichatconfig.AIConfig, error) {
-	configs, err := r.queryConfigs(ctx, repo.Join(aiConfigFindQuery, "WHERE is_default = true LIMIT 1"))
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	configs, err := r.queryConfigs(ctx, repo.Join(aiConfigFindQuery, "WHERE is_default = true AND tenant_id = $1 LIMIT 1"), tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to query default AI chat config")
 	}
@@ -80,7 +86,13 @@ func (r *AIChatConfigRepository) GetDefault(ctx context.Context) (aichatconfig.A
 }
 
 func (r *AIChatConfigRepository) List(ctx context.Context) ([]aichatconfig.AIConfig, error) {
-	configs, err := r.queryConfigs(ctx, aiConfigFindQuery+" ORDER BY is_default DESC, id ASC")
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	q := repo.Join(aiConfigFindQuery, "WHERE tenant_id = $1 ORDER BY is_default DESC, id ASC")
+	configs, err := r.queryConfigs(ctx, q, tenant.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to list AI chat configs")
 	}
@@ -94,7 +106,6 @@ func (r *AIChatConfigRepository) Save(ctx context.Context, config aichatconfig.A
 	}
 
 	dbConfig := ToDBConfig(config)
-	now := time.Now()
 
 	var exists bool
 	if config.ID() != uuid.Nil {
@@ -103,9 +114,10 @@ func (r *AIChatConfigRepository) Save(ctx context.Context, config aichatconfig.A
 		}
 	}
 
-	var rows error
 	if exists {
-		rows = tx.QueryRow(ctx, aiConfigUpdateQuery,
+		rows := tx.QueryRow(
+			ctx,
+			aiConfigUpdateQuery,
 			dbConfig.ModelName,
 			dbConfig.ModelType,
 			dbConfig.SystemPrompt,
@@ -114,16 +126,18 @@ func (r *AIChatConfigRepository) Save(ctx context.Context, config aichatconfig.A
 			dbConfig.BaseURL,
 			dbConfig.AccessToken,
 			dbConfig.IsDefault,
-			now,
+			dbConfig.UpdatedAt,
 			dbConfig.ID,
 		).Scan(&dbConfig.ID)
 		if rows != nil {
 			return nil, errors.Wrap(rows, fmt.Sprintf("failed to update AI chat config with ID: %s", dbConfig.ID))
 		}
 	} else {
-		configID := uuid.New()
-		rows = tx.QueryRow(ctx, aiConfigInsertQuery,
-			configID.String(),
+		rows := tx.QueryRow(
+			ctx,
+			aiConfigInsertQuery,
+			dbConfig.ID,
+			dbConfig.TenantID,
 			dbConfig.ModelName,
 			dbConfig.ModelType,
 			dbConfig.SystemPrompt,
@@ -132,8 +146,8 @@ func (r *AIChatConfigRepository) Save(ctx context.Context, config aichatconfig.A
 			dbConfig.BaseURL,
 			dbConfig.AccessToken,
 			dbConfig.IsDefault,
-			now,
-			now,
+			dbConfig.CreatedAt,
+			dbConfig.UpdatedAt,
 		).Scan(
 			&dbConfig.ID,
 		)
@@ -163,7 +177,12 @@ func (r *AIChatConfigRepository) SetDefault(ctx context.Context, id uuid.UUID) e
 
 	now := time.Now()
 
-	_, err = tx.Exec(ctx, aiConfigClearDefaultQuery, now)
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get tenant from context")
+	}
+
+	_, err = tx.Exec(ctx, aiConfigClearDefaultQuery, now, tenant.ID)
 	if err != nil {
 		return errors.Wrap(err, "failed to clear default config")
 	}
@@ -237,6 +256,7 @@ func (r *AIChatConfigRepository) queryConfigs(ctx context.Context, query string,
 
 		if err := rows.Scan(
 			&cfg.ID,
+			&cfg.TenantID,
 			&cfg.ModelName,
 			&cfg.ModelType,
 			&cfg.SystemPrompt,
diff --git a/modules/website/infrastructure/persistence/aichatconfig_repository_test.go b/modules/website/infrastructure/persistence/aichatconfig_repository_test.go
index ef4975d4f..02d9b49c6 100644
--- a/modules/website/infrastructure/persistence/aichatconfig_repository_test.go
+++ b/modules/website/infrastructure/persistence/aichatconfig_repository_test.go
@@ -21,6 +21,7 @@ func TestAIChatConfigRepository_Save_Create(t *testing.T) {
 		aichatconfig.WithSystemPrompt("You are a helpful assistant"),
 		aichatconfig.WithTemperature(0.8),
 		aichatconfig.WithMaxTokens(2048),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config, err := aichatconfig.New(
@@ -59,6 +60,7 @@ func TestAIChatConfigRepository_Save_Update(t *testing.T) {
 		aichatconfig.WithSystemPrompt("Original system prompt"),
 		aichatconfig.WithTemperature(0.7),
 		aichatconfig.WithMaxTokens(1024),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	originalConfig, err := aichatconfig.New(
@@ -107,6 +109,7 @@ func TestAIChatConfigRepository_GetByID(t *testing.T) {
 		aichatconfig.WithSystemPrompt("Test system prompt"),
 		aichatconfig.WithTemperature(0.8),
 		aichatconfig.WithMaxTokens(2048),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config, err := aichatconfig.New(
@@ -159,6 +162,7 @@ func TestAIChatConfigRepository_List(t *testing.T) {
 	// Create and save multiple configs
 	options1 := []aichatconfig.Option{
 		aichatconfig.WithSystemPrompt("Config 1 system prompt"),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config1, err := aichatconfig.New(
@@ -172,6 +176,7 @@ func TestAIChatConfigRepository_List(t *testing.T) {
 	options2 := []aichatconfig.Option{
 		aichatconfig.WithSystemPrompt("Config 2 system prompt"),
 		aichatconfig.WithTemperature(0.9),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config2, err := aichatconfig.New(
@@ -224,6 +229,7 @@ func TestAIChatConfigRepository_SetDefault(t *testing.T) {
 	// Create and save a new config
 	options := []aichatconfig.Option{
 		aichatconfig.WithSystemPrompt("Test system prompt"),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config, err := aichatconfig.New(
@@ -263,6 +269,7 @@ func TestAIChatConfigRepository_SetDefault_MultipleTimes(t *testing.T) {
 	// Create and save two configs
 	options1 := []aichatconfig.Option{
 		aichatconfig.WithSystemPrompt("Config 1 system prompt"),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config1, err := aichatconfig.New(
@@ -275,6 +282,7 @@ func TestAIChatConfigRepository_SetDefault_MultipleTimes(t *testing.T) {
 
 	options2 := []aichatconfig.Option{
 		aichatconfig.WithSystemPrompt("Config 2 system prompt"),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config2, err := aichatconfig.New(
@@ -334,6 +342,7 @@ func TestAIChatConfigRepository_Delete(t *testing.T) {
 	// Create and save a new config
 	options := []aichatconfig.Option{
 		aichatconfig.WithSystemPrompt("Test system prompt"),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config, err := aichatconfig.New(
@@ -367,6 +376,7 @@ func TestAIChatConfigRepository_Delete_DefaultConfig(t *testing.T) {
 	// Create and save a new config
 	options := []aichatconfig.Option{
 		aichatconfig.WithSystemPrompt("Test system prompt"),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config, err := aichatconfig.New(
@@ -418,6 +428,7 @@ func TestAIChatConfigRepository_GetDefault_NoDefaultConfig(t *testing.T) {
 	// Create and save a new config without setting it as default
 	options := []aichatconfig.Option{
 		aichatconfig.WithSystemPrompt("Test system prompt"),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config, err := aichatconfig.New(
@@ -447,6 +458,7 @@ func TestAIChatConfigRepository_SaveWithIsDefault(t *testing.T) {
 	options := []aichatconfig.Option{
 		aichatconfig.WithSystemPrompt("Test system prompt"),
 		aichatconfig.WithIsDefault(true),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	config, err := aichatconfig.New(
diff --git a/modules/website/infrastructure/persistence/models/models.go b/modules/website/infrastructure/persistence/models/models.go
index ca22c8867..4d1e78bc1 100644
--- a/modules/website/infrastructure/persistence/models/models.go
+++ b/modules/website/infrastructure/persistence/models/models.go
@@ -6,6 +6,7 @@ import (
 
 type AIChatConfig struct {
 	ID           string
+	TenantID     string
 	ModelName    string
 	ModelType    string
 	SystemPrompt string
diff --git a/modules/website/infrastructure/persistence/schema/website-schema.sql b/modules/website/infrastructure/persistence/schema/website-schema.sql
index 10ea41d4a..168909fcd 100644
--- a/modules/website/infrastructure/persistence/schema/website-schema.sql
+++ b/modules/website/infrastructure/persistence/schema/website-schema.sql
@@ -8,6 +8,7 @@ CREATE TABLE IF NOT EXISTS ai_chat_configs (
     base_url varchar(255) NOT NULL,
     access_token varchar(1024),
     is_default boolean NOT NULL DEFAULT FALSE,
+    tenant_id uuid NOT NULL REFERENCES tenants (id) ON DELETE CASCADE,
     created_at timestamp with time zone NOT NULL DEFAULT NOW(),
     updated_at timestamp with time zone NOT NULL DEFAULT NOW()
 );
diff --git a/modules/website/infrastructure/persistence/setup_test.go b/modules/website/infrastructure/persistence/setup_test.go
index 2dd6e44e6..e6ac35dfe 100644
--- a/modules/website/infrastructure/persistence/setup_test.go
+++ b/modules/website/infrastructure/persistence/setup_test.go
@@ -21,9 +21,10 @@ func TestMain(m *testing.M) {
 
 // testFixtures contains common test dependencies
 type testFixtures struct {
-	ctx  context.Context
-	pool *pgxpool.Pool
-	app  application.Application
+	ctx    context.Context
+	pool   *pgxpool.Pool
+	app    application.Application
+	tenant *composables.Tenant
 }
 
 // setupTest creates all necessary dependencies for tests
@@ -33,7 +34,19 @@ func setupTest(t *testing.T) *testFixtures {
 	testutils.CreateDB(t.Name())
 	pool := testutils.NewPool(testutils.DbOpts(t.Name()))
 
+	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	ctx := context.Background()
+
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx = composables.WithTenant(ctx, tenant)
+
 	tx, err := pool.Begin(ctx)
 	if err != nil {
 		t.Fatal(err)
@@ -47,14 +60,11 @@ func setupTest(t *testing.T) *testFixtures {
 	})
 
 	ctx = composables.WithTx(ctx, tx)
-	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
-	if err != nil {
-		t.Fatal(err)
-	}
 
 	return &testFixtures{
-		ctx:  ctx,
-		pool: pool,
-		app:  app,
+		ctx:    ctx,
+		pool:   pool,
+		app:    app,
+		tenant: tenant,
 	}
 }
diff --git a/modules/website/infrastructure/persistence/website_mappers.go b/modules/website/infrastructure/persistence/website_mappers.go
index fb3d5615c..d7116cd26 100644
--- a/modules/website/infrastructure/persistence/website_mappers.go
+++ b/modules/website/infrastructure/persistence/website_mappers.go
@@ -13,6 +13,7 @@ import (
 func ToDBConfig(config aichatconfig.AIConfig) models.AIChatConfig {
 	return models.AIChatConfig{
 		ID:           config.ID().String(),
+		TenantID:     config.TenantID().String(),
 		ModelName:    config.ModelName(),
 		ModelType:    string(config.ModelType()),
 		SystemPrompt: config.SystemPrompt(),
@@ -33,8 +34,14 @@ func ToDomainConfig(model models.AIChatConfig) (aichatconfig.AIConfig, error) {
 		return nil, errors.Wrap(err, fmt.Sprintf("failed to parse UUID from string: %s", model.ID))
 	}
 
+	tenantID, err := uuid.Parse(model.TenantID)
+	if err != nil {
+		return nil, errors.Wrap(err, fmt.Sprintf("failed to parse tenant UUID from string: %s", model.TenantID))
+	}
+
 	options := []aichatconfig.Option{
 		aichatconfig.WithID(id),
+		aichatconfig.WithTenantID(tenantID),
 		aichatconfig.WithTemperature(model.Temperature),
 		aichatconfig.WithMaxTokens(model.MaxTokens),
 		aichatconfig.WithAccessToken(model.AccessToken),
diff --git a/modules/website/presentation/controllers/aichat_controller.go b/modules/website/presentation/controllers/aichat_controller.go
index a38259f56..b02f98947 100644
--- a/modules/website/presentation/controllers/aichat_controller.go
+++ b/modules/website/presentation/controllers/aichat_controller.go
@@ -166,7 +166,12 @@ func (c *AIChatController) saveConfig(
 		return
 	}
 
-	configEntity, err := dto.Apply(config)
+	tenant, err := composables.UseTenant(r.Context())
+	if err != nil {
+		panic(err)
+	}
+
+	configEntity, err := dto.Apply(config, tenant.ID)
 	if err != nil {
 		logger.WithError(err).Error("failed to convert DTO to entity")
 		w.Header().Set("Content-Type", "application/json")
diff --git a/modules/website/presentation/controllers/aichat_controller_test.go b/modules/website/presentation/controllers/aichat_controller_test.go
index 93f751a0c..38673a5a8 100644
--- a/modules/website/presentation/controllers/aichat_controller_test.go
+++ b/modules/website/presentation/controllers/aichat_controller_test.go
@@ -46,6 +46,7 @@ type testFixtures struct {
 	tx      pgx.Tx
 	app     application.Application
 	router  *mux.Router
+	tenant  *composables.Tenant
 	service *services.AIChatConfigService
 }
 
@@ -57,7 +58,16 @@ func setupTest(t *testing.T) *testFixtures {
 	testutils.CreateDB(t.Name())
 	pool := testutils.NewPool(testutils.DbOpts(t.Name()))
 
+	// Setup real application with required modules
+	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
+	require.NoError(t, err, "Failed to setup application")
+
 	ctx := context.Background()
+	// Create tenant first before starting transaction
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	require.NoError(t, err, "Failed to create test tenant")
+
+	// Begin transaction after tenant creation
 	tx, err := pool.Begin(ctx)
 	require.NoError(t, err, "Failed to begin transaction")
 
@@ -69,14 +79,11 @@ func setupTest(t *testing.T) *testFixtures {
 		}
 	})
 
-	// Create context with transaction
+	// Create context with transaction and tenant
 	ctx = composables.WithTx(ctx, tx)
+	ctx = composables.WithTenant(ctx, tenant)
 	ctx = composables.WithParams(ctx, testutils.DefaultParams())
 
-	// Setup real application with required modules
-	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
-	require.NoError(t, err, "Failed to setup application")
-
 	// Create admin user
 	adminEmail, _ := internet.NewEmail("admin@example.com")
 	adminUser := user.New(
@@ -85,6 +92,7 @@ func setupTest(t *testing.T) *testFixtures {
 		adminEmail,
 		user.UILanguageEN,
 		user.WithID(1),
+		user.WithTenantID(tenant.ID),
 	)
 
 	// Get service from application
@@ -110,6 +118,10 @@ func setupTest(t *testing.T) *testFixtures {
 			reqCtx = composables.WithTx(reqCtx, tx)
 			reqCtx = context.WithValue(reqCtx, constants.AppKey, app)
 
+			// Important: Add tenant to context
+			reqCtx = composables.WithTenant(reqCtx, tenant)
+			reqCtx = context.WithValue(reqCtx, constants.TenantKey, tenant)
+
 			// Add logger to context
 			logger := logrus.New()
 			fieldsLogger := logger.WithFields(logrus.Fields{
@@ -143,13 +155,13 @@ func setupTest(t *testing.T) *testFixtures {
 		})
 	})
 
-	// Register routes
 	controller.Register(router)
 
 	return &testFixtures{
 		ctx:     ctx,
 		tx:      tx,
 		app:     app,
+		tenant:  tenant,
 		router:  router,
 		service: configService,
 	}
@@ -233,6 +245,7 @@ func TestAIChatController_SaveConfig_UpdateExisting(t *testing.T) {
 		aichatconfig.WithMaxTokens(512),
 		aichatconfig.WithAccessToken("initial-key"),
 		aichatconfig.WithIsDefault(true),
+		aichatconfig.WithTenantID(fixtures.tenant.ID),
 	}
 
 	initialConfig, err := aichatconfig.New(
diff --git a/modules/website/presentation/controllers/dtos/aichat_config_dto.go b/modules/website/presentation/controllers/dtos/aichat_config_dto.go
index 62a6c11a3..76f1d6eb6 100644
--- a/modules/website/presentation/controllers/dtos/aichat_config_dto.go
+++ b/modules/website/presentation/controllers/dtos/aichat_config_dto.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/go-playground/validator/v10"
+	"github.com/google/uuid"
 	"github.com/iota-uz/go-i18n/v2/i18n"
 	"github.com/iota-uz/iota-sdk/modules/website/domain/entities/aichatconfig"
 	"github.com/iota-uz/iota-sdk/pkg/constants"
@@ -21,12 +22,13 @@ type AIConfigDTO struct {
 	AccessToken  string  `validate:"omitempty"`
 }
 
-func (dto *AIConfigDTO) Apply(cfg aichatconfig.AIConfig) (aichatconfig.AIConfig, error) {
+func (dto *AIConfigDTO) Apply(cfg aichatconfig.AIConfig, tenantID uuid.UUID) (aichatconfig.AIConfig, error) {
 	if cfg == nil {
 		options := []aichatconfig.Option{
 			aichatconfig.WithTemperature(mapping.Or(dto.Temperature, 0.7)),
 			aichatconfig.WithMaxTokens(mapping.Or(dto.MaxTokens, 1024)),
 			aichatconfig.WithIsDefault(true),
+			aichatconfig.WithTenantID(tenantID),
 		}
 
 		if dto.AccessToken != "" {
diff --git a/modules/website/services/setup_test.go b/modules/website/services/setup_test.go
index 40a020618..343244675 100644
--- a/modules/website/services/setup_test.go
+++ b/modules/website/services/setup_test.go
@@ -20,9 +20,10 @@ func TestMain(m *testing.M) {
 }
 
 type testFixtures struct {
-	ctx  context.Context
-	pool *pgxpool.Pool
-	app  application.Application
+	ctx    context.Context
+	pool   *pgxpool.Pool
+	app    application.Application
+	tenant *composables.Tenant
 }
 
 func setupTest(t *testing.T) *testFixtures {
@@ -30,6 +31,10 @@ func setupTest(t *testing.T) *testFixtures {
 
 	testutils.CreateDB(t.Name())
 	pool := testutils.NewPool(testutils.DbOpts(t.Name()))
+	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	ctx := context.Background()
 	tx, err := pool.Begin(ctx)
@@ -37,6 +42,11 @@ func setupTest(t *testing.T) *testFixtures {
 		t.Fatal(err)
 	}
 
+	tenant, err := testutils.CreateTestTenant(ctx, pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	t.Cleanup(func() {
 		if err := tx.Rollback(ctx); err != nil {
 			t.Fatal(err)
@@ -44,17 +54,14 @@ func setupTest(t *testing.T) *testFixtures {
 		pool.Close()
 	})
 
+	ctx = composables.WithTenant(ctx, tenant)
 	ctx = composables.WithPool(ctx, pool)
 	ctx = composables.WithParams(ctx, testutils.DefaultParams())
 
-	app, err := testutils.SetupApplication(pool, modules.BuiltInModules...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	return &testFixtures{
-		ctx:  ctx,
-		pool: pool,
-		app:  app,
+		ctx:    ctx,
+		pool:   pool,
+		app:    app,
+		tenant: tenant,
 	}
 }
diff --git a/modules/website/services/website_chat_service.go b/modules/website/services/website_chat_service.go
index 82d6e2742..a1be87fc2 100644
--- a/modules/website/services/website_chat_service.go
+++ b/modules/website/services/website_chat_service.go
@@ -93,10 +93,15 @@ func (s *WebsiteChatService) CreateThread(ctx context.Context, dto CreateThreadD
 	if err != nil {
 		return nil, err
 	}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	chatEntity := chat.New(
 		member.Sender().(chat.ClientSender).ClientID(),
 		chat.WithMembers([]chat.Member{member}),
+		chat.WithTenantID(tenant.ID),
 	)
 
 	var createdChat chat.Chat
@@ -340,6 +345,10 @@ func (s *WebsiteChatService) memberFromUserID(ctx context.Context, userID uint)
 	if err != nil {
 		return nil, err
 	}
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	return chat.NewMember(
 		chat.NewUserSender(
@@ -348,10 +357,15 @@ func (s *WebsiteChatService) memberFromUserID(ctx context.Context, userID uint)
 			usr.LastName(),
 		),
 		chat.WebsiteTransport,
+		chat.WithMemberTenantID(tenant.ID),
 	), nil
 }
 
 func (s *WebsiteChatService) memberFromPhone(ctx context.Context, phoneNumber phone.Phone) (chat.Member, error) {
+	tenant, err := composables.UseTenant(ctx)
+	if err != nil {
+		return nil, err
+	}
 	match, err := s.clientRepo.GetByContactValue(ctx, client.ContactTypePhone, phoneNumber.Value())
 	if err == nil {
 		var contactID uint
@@ -369,12 +383,17 @@ func (s *WebsiteChatService) memberFromPhone(ctx context.Context, phoneNumber ph
 				match.LastName(),
 			),
 			chat.WebsiteTransport,
+			chat.WithMemberTenantID(tenant.ID),
 		), nil
 	} else if err != nil && !errors.Is(err, persistence.ErrClientNotFound) {
 		return nil, err
 	}
 
-	c, err := client.New(phoneNumber.Value(), client.WithPhone(phoneNumber))
+	c, err := client.New(
+		phoneNumber.Value(),
+		client.WithPhone(phoneNumber),
+		client.WithTenantID(tenant.ID),
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -406,6 +425,7 @@ func (s *WebsiteChatService) memberFromPhone(ctx context.Context, phoneNumber ph
 			clientEntity.LastName(),
 		),
 		chat.WebsiteTransport,
+		chat.WithMemberTenantID(tenant.ID),
 	)
 	return member, nil
 }
diff --git a/modules/website/services/website_chat_service_test.go b/modules/website/services/website_chat_service_test.go
index fb9c9669e..b92826d8e 100644
--- a/modules/website/services/website_chat_service_test.go
+++ b/modules/website/services/website_chat_service_test.go
@@ -13,6 +13,7 @@ import (
 	crmPersistence "github.com/iota-uz/iota-sdk/modules/crm/infrastructure/persistence"
 	"github.com/iota-uz/iota-sdk/modules/website/infrastructure/persistence"
 	"github.com/iota-uz/iota-sdk/modules/website/services"
+	"github.com/iota-uz/iota-sdk/pkg/composables"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -81,12 +82,20 @@ func TestWebsiteChatService_CreateThread_ExistingClient(t *testing.T) {
 	chatRepo := crmPersistence.NewChatRepository()
 	fixtures, sut, clientRepo := setupChatTest(t)
 
+	// Get tenant ID for the client
+	tenant, err := composables.UseTenant(fixtures.ctx)
+	require.NoError(t, err)
+
 	// Create an existing client first with phone
 	phoneStr := "+12126647668" // Valid US number format
 	p, err := phone.Parse(phoneStr, country.UnitedStates)
 	require.NoError(t, err)
 
-	existingClient, err := client.New(phoneStr, client.WithPhone(p))
+	existingClient, err := client.New(
+		phoneStr,
+		client.WithPhone(p),
+		client.WithTenantID(tenant.ID),
+	)
 	require.NoError(t, err)
 
 	savedClient, err := clientRepo.Save(fixtures.ctx, existingClient)
@@ -110,12 +119,19 @@ func TestWebsiteChatService_CreateThread_NewThreadEachTime(t *testing.T) {
 	chatRepo := crmPersistence.NewChatRepository()
 	fixtures, sut, clientRepo := setupChatTest(t)
 
+	// Get tenant ID for the client
+	tenant, err := composables.UseTenant(fixtures.ctx)
+	require.NoError(t, err)
+
 	// 1. Create a client and get the client ID
 	phoneStr := "+12126647669" // Valid US number format
 	p, err := phone.Parse(phoneStr, country.UnitedStates)
 	require.NoError(t, err)
 
-	existingClient, err := client.New(phoneStr, client.WithPhone(p))
+	existingClient, err := client.New(phoneStr,
+		client.WithPhone(p),
+		client.WithTenantID(tenant.ID),
+	)
 	require.NoError(t, err)
 
 	savedClient, err := clientRepo.Save(fixtures.ctx, existingClient)
@@ -297,6 +313,7 @@ func TestWebsiteChatService_ReplyToThread(t *testing.T) {
 		"Agent",
 		internet.MustParseEmail("test@gmail.com"),
 		user.UILanguageEN,
+		user.WithTenantID(fixtures.tenant.ID),
 	))
 	require.NoError(t, err)
 
diff --git a/pkg/composables/tenant.go b/pkg/composables/tenant.go
new file mode 100644
index 000000000..d153ad057
--- /dev/null
+++ b/pkg/composables/tenant.go
@@ -0,0 +1,39 @@
+package composables
+
+import (
+	"context"
+	"errors"
+
+	"github.com/google/uuid"
+	"github.com/iota-uz/iota-sdk/pkg/constants"
+)
+
+var (
+	ErrNoTenantFound = errors.New("no tenant found in context")
+)
+
+type Tenant struct {
+	ID     uuid.UUID
+	Name   string
+	Domain string
+}
+
+func UseTenant(ctx context.Context) (*Tenant, error) {
+	t, ok := ctx.Value(constants.TenantKey).(*Tenant)
+	if !ok {
+		return nil, ErrNoTenantFound
+	}
+	return t, nil
+}
+
+func MustUseTenant(ctx context.Context) *Tenant {
+	t, err := UseTenant(ctx)
+	if err != nil {
+		panic(err)
+	}
+	return t
+}
+
+func WithTenant(ctx context.Context, tenant *Tenant) context.Context {
+	return context.WithValue(ctx, constants.TenantKey, tenant)
+}
diff --git a/pkg/constants/middleware.go b/pkg/constants/middleware.go
index 9a81b2d5d..f88ea0f1a 100644
--- a/pkg/constants/middleware.go
+++ b/pkg/constants/middleware.go
@@ -20,6 +20,7 @@ const (
 	RequestStart   ContextKey = "requestStart"
 
 	PageContext ContextKey = "pageContext"
+	TenantKey   ContextKey = "tenant"
 )
 
 var Validate = validator.New(validator.WithRequiredStructEnabled())
diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go
index 45071a384..60c35d089 100644
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -4,8 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log"
 	"net/http"
 
+	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 
 	"github.com/iota-uz/iota-sdk/modules/core/services"
@@ -51,6 +53,57 @@ func Authorize() mux.MiddlewareFunc {
 					next.ServeHTTP(w, r)
 					return
 				}
+
+				// Now that we have the session, let's ensure we have the tenant in the context
+				// First check if we already have a tenant
+				_, tenantErr := composables.UseTenant(ctx)
+				if tenantErr != nil {
+					// First try to get tenant from session (already loaded from DB)
+					if sess.TenantID != uuid.Nil {
+						// Get tenant info directly
+						tx, txErr := composables.UseTx(ctx)
+						if txErr == nil {
+							var name string
+							var domain string
+							err := tx.QueryRow(ctx, "SELECT name, domain FROM tenants WHERE id = $1 LIMIT 1", sess.TenantID.String()).Scan(&name, &domain)
+							if err == nil {
+								// Add tenant to context from session
+								t := &composables.Tenant{
+									ID:     sess.TenantID,
+									Name:   name,
+									Domain: domain,
+								}
+								ctx = context.WithValue(ctx, constants.TenantKey, t)
+							}
+						}
+					} else {
+						// Fallback: use direct database query to get the tenant ID for the user
+						tx, txErr := composables.UseTx(ctx)
+						if txErr == nil {
+							var tenantIDStr string
+							err := tx.QueryRow(ctx, "SELECT tenant_id FROM users WHERE id = $1 LIMIT 1", sess.UserID).Scan(&tenantIDStr)
+							if err == nil && tenantIDStr != "" {
+								tenantID, uuidErr := uuid.Parse(tenantIDStr)
+								if uuidErr == nil {
+									// Now query for the tenant info
+									var name string
+									var domain string
+									err := tx.QueryRow(ctx, "SELECT name, domain FROM tenants WHERE id = $1 LIMIT 1", tenantIDStr).Scan(&name, &domain)
+									if err == nil {
+										// Add tenant to context
+										t := &composables.Tenant{
+											ID:     tenantID,
+											Name:   name,
+											Domain: domain,
+										}
+										ctx = context.WithValue(ctx, constants.TenantKey, t)
+									}
+								}
+							}
+						}
+					}
+				}
+
 				params, ok := composables.UseParams(ctx)
 				if !ok {
 					panic("params not found. Add RequestParams middleware up the chain")
@@ -82,7 +135,24 @@ func ProvideUser() mux.MiddlewareFunc {
 					next.ServeHTTP(w, r)
 					return
 				}
+				// Set the user in context
 				ctx = context.WithValue(ctx, constants.UserKey, u)
+
+				// Check if we already have a tenant in context
+				_, tenantErr := composables.UseTenant(ctx)
+				if tenantErr != nil {
+					// If not, get it from the user's tenant ID
+					tenantService := app.Service(services.TenantService{}).(*services.TenantService)
+					t, err := tenantService.GetByID(ctx, u.TenantID())
+					if err != nil {
+						log.Printf("Error retrieving tenant: %v", err)
+						// Don't add tenant to context if we couldn't get it
+					} else {
+						// Add tenant to context
+						ctx = context.WithValue(ctx, constants.TenantKey, t)
+					}
+				}
+
 				next.ServeHTTP(w, r.WithContext(ctx))
 			},
 		)
diff --git a/pkg/testutils/utils.go b/pkg/testutils/utils.go
index 6f67a84d8..9d172c449 100644
--- a/pkg/testutils/utils.go
+++ b/pkg/testutils/utils.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/iota-uz/iota-sdk/modules"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/role"
 	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/user"
@@ -39,6 +40,7 @@ func MockUser(permissions ...*permission.Permission) user.User {
 		role.WithPermissions(permissions),
 		role.WithCreatedAt(time.Now()),
 		role.WithUpdatedAt(time.Now()),
+		role.WithTenantID(uuid.Nil), // tenant_id will be set correctly in repository
 	)
 
 	email, err := internet.NewEmail("test@example.com")
@@ -89,6 +91,34 @@ func DefaultParams() *composables.Params {
 	}
 }
 
+// CreateTestTenant creates a test tenant for testing
+func CreateTestTenant(ctx context.Context, pool *pgxpool.Pool) (*composables.Tenant, error) {
+	testTenant := &composables.Tenant{
+		ID:     uuid.MustParse("00000000-0000-0000-0000-000000000001"),
+		Name:   "Test Tenant",
+		Domain: "test.com",
+	}
+
+	_, err := pool.Exec(ctx, "INSERT INTO tenants (id, name, domain, created_at, updated_at) VALUES ($1, $2, $3, $4, $5) ON CONFLICT (id) DO NOTHING",
+		testTenant.ID,
+		testTenant.Name,
+		testTenant.Domain,
+		time.Now(),
+		time.Now(),
+	)
+
+	if err == nil {
+		return testTenant, nil
+	}
+
+	// If the error is not about missing table, return it
+	if !strings.Contains(err.Error(), "relation") && !strings.Contains(err.Error(), "does not exist") {
+		return nil, err
+	}
+
+	return testTenant, nil
+}
+
 // sanitizeDBName replaces special characters in database names with underscores
 func sanitizeDBName(name string) string {
 	sanitized := strings.ReplaceAll(name, "/", "_")