diff --git a/modules/core/src/api/infrastructure/express/express-controller.ts b/modules/core/src/api/infrastructure/express/express-controller.ts
index 5617f3f4..6041e22b 100644
--- a/modules/core/src/api/infrastructure/express/express-controller.ts
+++ b/modules/core/src/api/infrastructure/express/express-controller.ts
@@ -1,4 +1,4 @@
-import { Criteria, CriteriaFromUrlConverter } from "@repo/rdx-criteria";
+import { Criteria, CriteriaFromUrlConverter } from "@repo/rdx-criteria/server";
 import { UniqueID } from "@repo/rdx-ddd";
 import { NextFunction, Request, Response } from "express";
 import httpStatus from "http-status";
@@ -175,7 +175,7 @@ export abstract class ExpressController {
 
   // ───────────────────────────────────────────────────────────────────────────
   // Guards API
-  protected useGuards(...guards: GuardFn[]): this {
+  protected registerGuards(...guards: GuardFn[]): this {
     this.guards.push(...guards);
     return this;
   }
diff --git a/modules/core/src/api/infrastructure/express/express-guards.ts b/modules/core/src/api/infrastructure/express/express-guards.ts
index ddd289f7..14989303 100644
--- a/modules/core/src/api/infrastructure/express/express-guards.ts
+++ b/modules/core/src/api/infrastructure/express/express-guards.ts
@@ -1,4 +1,4 @@
-import { Criteria } from "@repo/rdx-criteria";
+import { Criteria } from "@repo/rdx-criteria/server";
 import { NextFunction, Request, Response } from "express";
 import { ApiError, ForbiddenApiError, UnauthorizedApiError, ValidationApiError } from "./errors";
 import { ExpressController } from "./express-controller";
diff --git a/modules/core/src/api/infrastructure/sequelize/sequelize-repository.ts b/modules/core/src/api/infrastructure/sequelize/sequelize-repository.ts
index dae011b2..9d5a9f94 100644
--- a/modules/core/src/api/infrastructure/sequelize/sequelize-repository.ts
+++ b/modules/core/src/api/infrastructure/sequelize/sequelize-repository.ts
@@ -1,4 +1,4 @@
-import { Criteria, CriteriaToSequelizeConverter } from "@repo/rdx-criteria";
+import { Criteria, CriteriaToSequelizeConverter } from "@repo/rdx-criteria/server";
 import { IAggregateRootRepository, UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { FindOptions, ModelDefined, Sequelize, Transaction } from "sequelize";
diff --git a/modules/customer-invoices/src/api/application/use-cases/report/reporter/customer-invoice.report.html.ts b/modules/customer-invoices/src/api/application/use-cases/report/reporter/customer-invoice.report.html.ts
index 5a55150c..a58e01a3 100644
--- a/modules/customer-invoices/src/api/application/use-cases/report/reporter/customer-invoice.report.html.ts
+++ b/modules/customer-invoices/src/api/application/use-cases/report/reporter/customer-invoice.report.html.ts
@@ -3,7 +3,7 @@ import path from "node:path";
 import { Presenter } from "@erp/core/api";
 import * as handlebars from "handlebars";
 import { CustomerInvoice } from "../../../../domain";
-import { CustomerInvoiceReportPresenter, CustomerInvoiceFullPresenter } from "../../../presenters";
+import { CustomerInvoiceFullPresenter, CustomerInvoiceReportPresenter } from "../../../presenters";
 
 export class CustomerInvoiceReportHTMLPresenter extends Presenter {
   toOutput(customerInvoice: CustomerInvoice): string {
diff --git a/modules/customer-invoices/src/api/infrastructure/express/controllers/create-customer-invoice.controller.ts b/modules/customer-invoices/src/api/infrastructure/express/controllers/create-customer-invoice.controller.ts
index 4c111d2b..923434d6 100644
--- a/modules/customer-invoices/src/api/infrastructure/express/controllers/create-customer-invoice.controller.ts
+++ b/modules/customer-invoices/src/api/infrastructure/express/controllers/create-customer-invoice.controller.ts
@@ -7,7 +7,7 @@ export class CreateCustomerInvoiceController extends ExpressController {
   public constructor(private readonly useCase: CreateCustomerInvoiceUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   protected async executeImpl() {
diff --git a/modules/customer-invoices/src/api/infrastructure/express/controllers/delete-customer-invoice.controller.ts b/modules/customer-invoices/src/api/infrastructure/express/controllers/delete-customer-invoice.controller.ts
index 259b8560..5b76ee54 100644
--- a/modules/customer-invoices/src/api/infrastructure/express/controllers/delete-customer-invoice.controller.ts
+++ b/modules/customer-invoices/src/api/infrastructure/express/controllers/delete-customer-invoice.controller.ts
@@ -8,7 +8,7 @@ export class DeleteCustomerInvoiceController extends ExpressController {
   ) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   async executeImpl() {
diff --git a/modules/customer-invoices/src/api/infrastructure/express/controllers/get-customer-invoice.controller.ts b/modules/customer-invoices/src/api/infrastructure/express/controllers/get-customer-invoice.controller.ts
index 06f3dd21..9d2e9cc6 100644
--- a/modules/customer-invoices/src/api/infrastructure/express/controllers/get-customer-invoice.controller.ts
+++ b/modules/customer-invoices/src/api/infrastructure/express/controllers/get-customer-invoice.controller.ts
@@ -5,7 +5,7 @@ export class GetCustomerInvoiceController extends ExpressController {
   public constructor(private readonly useCase: GetCustomerInvoiceUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   protected async executeImpl() {
diff --git a/modules/customer-invoices/src/api/infrastructure/express/controllers/issue-customer-invoice.controller.ts b/modules/customer-invoices/src/api/infrastructure/express/controllers/issue-customer-invoice.controller.ts
index 8fdf90f9..9d7a96d3 100644
--- a/modules/customer-invoices/src/api/infrastructure/express/controllers/issue-customer-invoice.controller.ts
+++ b/modules/customer-invoices/src/api/infrastructure/express/controllers/issue-customer-invoice.controller.ts
@@ -8,7 +8,7 @@ export class IssueCustomerInvoiceController extends ExpressController {
   ) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   async executeImpl() {
diff --git a/modules/customer-invoices/src/api/infrastructure/express/controllers/list-customer-invoices.controller.ts b/modules/customer-invoices/src/api/infrastructure/express/controllers/list-customer-invoices.controller.ts
index ccea7da2..dc90c4db 100644
--- a/modules/customer-invoices/src/api/infrastructure/express/controllers/list-customer-invoices.controller.ts
+++ b/modules/customer-invoices/src/api/infrastructure/express/controllers/list-customer-invoices.controller.ts
@@ -1,12 +1,12 @@
 import { authGuard, ExpressController, forbidQueryFieldGuard, tenantGuard } from "@erp/core/api";
-import { Criteria } from "@repo/rdx-criteria";
+import { Criteria } from "@repo/rdx-criteria/server";
 import { ListCustomerInvoicesUseCase } from "../../../application";
 
 export class ListCustomerInvoicesController extends ExpressController {
   public constructor(private readonly useCase: ListCustomerInvoicesUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   private getCriteriaWithDefaultOrder() {
diff --git a/modules/customer-invoices/src/api/infrastructure/express/controllers/report-customer-invoice.controller.ts b/modules/customer-invoices/src/api/infrastructure/express/controllers/report-customer-invoice.controller.ts
index ecbaee63..dae8fc88 100644
--- a/modules/customer-invoices/src/api/infrastructure/express/controllers/report-customer-invoice.controller.ts
+++ b/modules/customer-invoices/src/api/infrastructure/express/controllers/report-customer-invoice.controller.ts
@@ -5,7 +5,7 @@ export class ReportCustomerInvoiceController extends ExpressController {
   public constructor(private readonly useCase: ReportCustomerInvoiceUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   protected async executeImpl() {
diff --git a/modules/customer-invoices/src/api/infrastructure/express/controllers/update-customer-invoice.controller.ts b/modules/customer-invoices/src/api/infrastructure/express/controllers/update-customer-invoice.controller.ts
index 913e9362..ad1f8d9d 100644
--- a/modules/customer-invoices/src/api/infrastructure/express/controllers/update-customer-invoice.controller.ts
+++ b/modules/customer-invoices/src/api/infrastructure/express/controllers/update-customer-invoice.controller.ts
@@ -6,7 +6,7 @@ export class UpdateCustomerInvoiceController extends ExpressController {
   public constructor(private readonly useCase: UpdateCustomerInvoiceUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   async executeImpl(): Promise<any> {
diff --git a/modules/customer-invoices/src/api/infrastructure/sequelize/customer-invoice.repository.ts b/modules/customer-invoices/src/api/infrastructure/sequelize/customer-invoice.repository.ts
index 32f0d04d..ba0c5633 100644
--- a/modules/customer-invoices/src/api/infrastructure/sequelize/customer-invoice.repository.ts
+++ b/modules/customer-invoices/src/api/infrastructure/sequelize/customer-invoice.repository.ts
@@ -4,7 +4,7 @@ import {
   SequelizeRepository,
   translateSequelizeError,
 } from "@erp/core/api";
-import { Criteria, CriteriaToSequelizeConverter } from "@repo/rdx-criteria";
+import { Criteria, CriteriaToSequelizeConverter } from "@repo/rdx-criteria/server";
 import { UniqueID } from "@repo/rdx-ddd";
 import { Collection, Result } from "@repo/rdx-utils";
 import { Transaction } from "sequelize";
@@ -14,10 +14,10 @@ import {
   ICustomerInvoiceDomainMapper,
   ICustomerInvoiceListMapper,
 } from "../mappers";
-import { CustomerInvoiceItemTaxModel } from "./models/customer-invoice-item-tax.model";
-import { CustomerInvoiceItemModel } from "./models/customer-invoice-item.model";
-import { CustomerInvoiceTaxModel } from "./models/customer-invoice-tax.model";
 import { CustomerInvoiceModel } from "./models/customer-invoice.model";
+import { CustomerInvoiceItemModel } from "./models/customer-invoice-item.model";
+import { CustomerInvoiceItemTaxModel } from "./models/customer-invoice-item-tax.model";
+import { CustomerInvoiceTaxModel } from "./models/customer-invoice-tax.model";
 
 export class CustomerInvoiceRepository
   extends SequelizeRepository<CustomerInvoice>
diff --git a/modules/customers/src/api/infrastructure/express/controllers/create-customer.controller.ts b/modules/customers/src/api/infrastructure/express/controllers/create-customer.controller.ts
index 2103368c..4caa1eb9 100644
--- a/modules/customers/src/api/infrastructure/express/controllers/create-customer.controller.ts
+++ b/modules/customers/src/api/infrastructure/express/controllers/create-customer.controller.ts
@@ -6,7 +6,7 @@ export class CreateCustomerController extends ExpressController {
   public constructor(private readonly useCase: CreateCustomerUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   protected async executeImpl() {
diff --git a/modules/customers/src/api/infrastructure/express/controllers/delete-customer.controller.ts b/modules/customers/src/api/infrastructure/express/controllers/delete-customer.controller.ts
index 20dc8215..ac2483e9 100644
--- a/modules/customers/src/api/infrastructure/express/controllers/delete-customer.controller.ts
+++ b/modules/customers/src/api/infrastructure/express/controllers/delete-customer.controller.ts
@@ -5,7 +5,7 @@ export class DeleteCustomerController extends ExpressController {
   public constructor(private readonly useCase: DeleteCustomerUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   async executeImpl(): Promise<any> {
diff --git a/modules/customers/src/api/infrastructure/express/controllers/get-customer.controller.ts b/modules/customers/src/api/infrastructure/express/controllers/get-customer.controller.ts
index aaf367b0..a6a570ee 100644
--- a/modules/customers/src/api/infrastructure/express/controllers/get-customer.controller.ts
+++ b/modules/customers/src/api/infrastructure/express/controllers/get-customer.controller.ts
@@ -5,7 +5,7 @@ export class GetCustomerController extends ExpressController {
   public constructor(private readonly useCase: GetCustomerUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   protected async executeImpl() {
diff --git a/modules/customers/src/api/infrastructure/express/controllers/list-customers.controller.ts b/modules/customers/src/api/infrastructure/express/controllers/list-customers.controller.ts
index c098540a..f2159296 100644
--- a/modules/customers/src/api/infrastructure/express/controllers/list-customers.controller.ts
+++ b/modules/customers/src/api/infrastructure/express/controllers/list-customers.controller.ts
@@ -1,12 +1,12 @@
 import { authGuard, ExpressController, forbidQueryFieldGuard, tenantGuard } from "@erp/core/api";
-import { Criteria } from "@repo/rdx-criteria";
+import { Criteria } from "@repo/rdx-criteria/server";
 import { ListCustomersUseCase } from "../../../application";
 
 export class ListCustomersController extends ExpressController {
   public constructor(private readonly listCustomers: ListCustomersUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   private getCriteriaWithDefaultOrder() {
diff --git a/modules/customers/src/api/infrastructure/express/controllers/update-customer.controller.ts b/modules/customers/src/api/infrastructure/express/controllers/update-customer.controller.ts
index 54097941..61db095c 100644
--- a/modules/customers/src/api/infrastructure/express/controllers/update-customer.controller.ts
+++ b/modules/customers/src/api/infrastructure/express/controllers/update-customer.controller.ts
@@ -6,7 +6,7 @@ export class UpdateCustomerController extends ExpressController {
   public constructor(private readonly useCase: UpdateCustomerUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   protected async executeImpl() {
diff --git a/modules/customers/src/api/infrastructure/sequelize/repositories/customer.repository.ts b/modules/customers/src/api/infrastructure/sequelize/repositories/customer.repository.ts
index 42cb71c8..5dbc08d8 100644
--- a/modules/customers/src/api/infrastructure/sequelize/repositories/customer.repository.ts
+++ b/modules/customers/src/api/infrastructure/sequelize/repositories/customer.repository.ts
@@ -4,7 +4,7 @@ import {
   SequelizeRepository,
   translateSequelizeError,
 } from "@erp/core/api";
-import { Criteria, CriteriaToSequelizeConverter } from "@repo/rdx-criteria";
+import { Criteria, CriteriaToSequelizeConverter } from "@repo/rdx-criteria/server";
 import { UniqueID } from "@repo/rdx-ddd";
 import { Collection, Result } from "@repo/rdx-utils";
 import { Transaction } from "sequelize";
diff --git a/modules/verifactu/src/api/infrastructure/express/controllers/send-invoice-verifactu.controller.ts b/modules/verifactu/src/api/infrastructure/express/controllers/send-invoice-verifactu.controller.ts
index c4cdb05a..ef8383d0 100644
--- a/modules/verifactu/src/api/infrastructure/express/controllers/send-invoice-verifactu.controller.ts
+++ b/modules/verifactu/src/api/infrastructure/express/controllers/send-invoice-verifactu.controller.ts
@@ -1,11 +1,11 @@
-import { ExpressController, authGuard, forbidQueryFieldGuard, tenantGuard } from "@erp/core/api";
+import { authGuard, ExpressController, forbidQueryFieldGuard, tenantGuard } from "@erp/core/api";
 import { SendInvoiceUseCase } from "@erp/customer-invoices/api/application";
 
 export class SendInvoiceVerifactuController extends ExpressController {
   public constructor(private readonly useCase: SendInvoiceUseCase) {
     super();
     // 🔐 Reutiliza guards de auth/tenant y prohíbe 'companyId' en query
-    this.useGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
+    this.registerGuards(authGuard(), tenantGuard(), forbidQueryFieldGuard("companyId"));
   }
 
   protected async executeImpl() {