diff --git a/packages/server/src/common/decorators/ApiCommonHeaders.ts b/packages/server/src/common/decorators/ApiCommonHeaders.ts
new file mode 100644
index 000000000..14e334a3a
--- /dev/null
+++ b/packages/server/src/common/decorators/ApiCommonHeaders.ts
@@ -0,0 +1,20 @@
+import { applyDecorators } from '@nestjs/common';
+import { ApiHeader } from '@nestjs/swagger';
+
+export function ApiCommonHeaders() {
+  return applyDecorators(
+    ApiHeader({
+      name: 'Authorization',
+      description:
+        "Value must be 'Bearer <token>' where <token> is an API key prefixed with 'bc_' or a JWT token.",
+      schema: { type: 'string', example: 'Bearer bc_1234567890abcdef' },
+      required: true,
+    }),
+    ApiHeader({
+      name: 'organization-id',
+      description:
+        'Required if Authorization is a JWT token. The organization ID to operate within.',
+      required: true,
+    }),
+  );
+}
diff --git a/packages/server/src/main.ts b/packages/server/src/main.ts
index 13178dcf3..8990a2020 100644
--- a/packages/server/src/main.ts
+++ b/packages/server/src/main.ts
@@ -30,7 +30,6 @@ async function bootstrap() {
     .setTitle('Bigcapital')
     .setDescription('Financial accounting software')
     .setVersion('1.0')
-    .addTag('cats')
     .build();
 
   const documentFactory = () => SwaggerModule.createDocument(app, config);
diff --git a/packages/server/src/modules/Accounts/Accounts.controller.ts b/packages/server/src/modules/Accounts/Accounts.controller.ts
index f9bf545c3..826b14b32 100644
--- a/packages/server/src/modules/Accounts/Accounts.controller.ts
+++ b/packages/server/src/modules/Accounts/Accounts.controller.ts
@@ -24,12 +24,14 @@ import { AccountResponseDto } from './dtos/AccountResponse.dto';
 import { AccountTypeResponseDto } from './dtos/AccountTypeResponse.dto';
 import { GetAccountTransactionResponseDto } from './dtos/GetAccountTransactionResponse.dto';
 import { GetAccountTransactionsQueryDto } from './dtos/GetAccountTransactionsQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('accounts')
 @ApiTags('Accounts')
 @ApiExtraModels(AccountResponseDto)
 @ApiExtraModels(AccountTypeResponseDto)
 @ApiExtraModels(GetAccountTransactionResponseDto)
+@ApiCommonHeaders()
 export class AccountsController {
   constructor(private readonly accountsApplication: AccountsApplication) {}
 
diff --git a/packages/server/src/modules/App/App.controller.ts b/packages/server/src/modules/App/App.controller.ts
index 6e79e7576..27fd20110 100644
--- a/packages/server/src/modules/App/App.controller.ts
+++ b/packages/server/src/modules/App/App.controller.ts
@@ -2,11 +2,4 @@ import { Controller, Get } from '@nestjs/common';
 import { AppService } from './App.service';
 
 @Controller()
-export class AppController {
-  constructor(private readonly appService: AppService) {}
-
-  @Get()
-  getHello(): string {
-    return this.appService.getHello();
-  }
-}
+export class AppController {}
diff --git a/packages/server/src/modules/Attachments/Attachments.controller.ts b/packages/server/src/modules/Attachments/Attachments.controller.ts
index 4ceddf6ad..f94f46715 100644
--- a/packages/server/src/modules/Attachments/Attachments.controller.ts
+++ b/packages/server/src/modules/Attachments/Attachments.controller.ts
@@ -30,9 +30,11 @@ import { AttachmentsApplication } from './AttachmentsApplication';
 import { AttachmentUploadPipeline } from './S3UploadPipeline';
 import { FileInterceptor } from '@/common/interceptors/file.interceptor';
 import { ConfigService } from '@nestjs/config';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @ApiTags('Attachments')
 @Controller('/attachments')
+@ApiCommonHeaders()
 export class AttachmentsController {
   /**
    * @param {AttachmentsApplication} attachmentsApplication - Attachments application.
@@ -109,9 +111,7 @@ export class AttachmentsController {
     status: 200,
     description: 'The document has been deleted successfully',
   })
-  async deleteAttachment(
-    @Param('id') documentId: string,
-  ) {
+  async deleteAttachment(@Param('id') documentId: string) {
     await this.attachmentsApplication.delete(documentId);
 
     return {
diff --git a/packages/server/src/modules/Auth/Auth.controller.ts b/packages/server/src/modules/Auth/Auth.controller.ts
index 8b9193986..df22d4a79 100644
--- a/packages/server/src/modules/Auth/Auth.controller.ts
+++ b/packages/server/src/modules/Auth/Auth.controller.ts
@@ -8,7 +8,13 @@ import {
   Request,
   UseGuards,
 } from '@nestjs/common';
-import { ApiTags, ApiOperation, ApiBody, ApiParam } from '@nestjs/swagger';
+import {
+  ApiTags,
+  ApiOperation,
+  ApiBody,
+  ApiParam,
+  ApiExcludeController,
+} from '@nestjs/swagger';
 import { PublicRoute } from './guards/jwt.guard';
 import { AuthenticationApplication } from './AuthApplication.sevice';
 import { AuthSignupDto } from './dtos/AuthSignup.dto';
@@ -20,6 +26,7 @@ import { SystemUser } from '../System/models/SystemUser';
 
 @Controller('/auth')
 @ApiTags('Auth')
+@ApiExcludeController()
 @PublicRoute()
 export class AuthController {
   constructor(
diff --git a/packages/server/src/modules/Auth/AuthApiKeys.controllers.ts b/packages/server/src/modules/Auth/AuthApiKeys.controllers.ts
index 98109436e..f47f63be9 100644
--- a/packages/server/src/modules/Auth/AuthApiKeys.controllers.ts
+++ b/packages/server/src/modules/Auth/AuthApiKeys.controllers.ts
@@ -1,8 +1,12 @@
 import { Controller, Post, Param, Get, Put } from '@nestjs/common';
 import { GenerateApiKey } from './commands/GenerateApiKey.service';
 import { GetApiKeysService } from './queries/GetApiKeys.service';
+import { ApiExcludeController, ApiTags } from '@nestjs/swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('api-keys')
+@ApiTags('Api keys')
+@ApiCommonHeaders()
 export class AuthApiKeysController {
   constructor(
     private readonly getApiKeysService: GetApiKeysService,
diff --git a/packages/server/src/modules/Auth/Authed.controller.ts b/packages/server/src/modules/Auth/Authed.controller.ts
index 8dba39fbf..14565cfa4 100644
--- a/packages/server/src/modules/Auth/Authed.controller.ts
+++ b/packages/server/src/modules/Auth/Authed.controller.ts
@@ -1,4 +1,9 @@
-import { ApiBody, ApiOperation, ApiTags } from '@nestjs/swagger';
+import {
+  ApiBody,
+  ApiExcludeController,
+  ApiOperation,
+  ApiTags,
+} from '@nestjs/swagger';
 import { GetAuthenticatedAccount } from './queries/GetAuthedAccount.service';
 import { Controller, Get, Post } from '@nestjs/common';
 import { IgnoreTenantSeededRoute } from '../Tenancy/EnsureTenantIsSeeded.guards';
@@ -9,6 +14,7 @@ import { IgnoreUserVerifiedRoute } from './guards/EnsureUserVerified.guard';
 
 @Controller('/auth')
 @ApiTags('Auth')
+@ApiExcludeController()
 @IgnoreTenantSeededRoute()
 @IgnoreTenantInitializedRoute()
 @IgnoreUserVerifiedRoute()
diff --git a/packages/server/src/modules/BankRules/BankRules.controller.ts b/packages/server/src/modules/BankRules/BankRules.controller.ts
index d66c5cd01..e4d62dd4e 100644
--- a/packages/server/src/modules/BankRules/BankRules.controller.ts
+++ b/packages/server/src/modules/BankRules/BankRules.controller.ts
@@ -18,10 +18,12 @@ import { BankRulesApplication } from './BankRulesApplication';
 import { CreateBankRuleDto } from './dtos/BankRule.dto';
 import { EditBankRuleDto } from './dtos/BankRule.dto';
 import { BankRuleResponseDto } from './dtos/BankRuleResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('banking/rules')
 @ApiTags('Bank Rules')
 @ApiExtraModels(BankRuleResponseDto)
+@ApiCommonHeaders()
 export class BankRulesController {
   constructor(private readonly bankRulesApplication: BankRulesApplication) {}
 
diff --git a/packages/server/src/modules/BankingCategorize/BankingCategorize.controller.ts b/packages/server/src/modules/BankingCategorize/BankingCategorize.controller.ts
index 86f257941..400208851 100644
--- a/packages/server/src/modules/BankingCategorize/BankingCategorize.controller.ts
+++ b/packages/server/src/modules/BankingCategorize/BankingCategorize.controller.ts
@@ -3,9 +3,11 @@ import { castArray, omit } from 'lodash';
 import { BankingCategorizeApplication } from './BankingCategorize.application';
 import { CategorizeBankTransactionRouteDto } from './dtos/CategorizeBankTransaction.dto';
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('banking/categorize')
 @ApiTags('Banking Categorization')
+@ApiCommonHeaders()
 export class BankingCategorizeController {
   constructor(
     private readonly bankingCategorizeApplication: BankingCategorizeApplication,
diff --git a/packages/server/src/modules/BankingMatching/BankingMatching.controller.ts b/packages/server/src/modules/BankingMatching/BankingMatching.controller.ts
index 294e38f18..458332634 100644
--- a/packages/server/src/modules/BankingMatching/BankingMatching.controller.ts
+++ b/packages/server/src/modules/BankingMatching/BankingMatching.controller.ts
@@ -3,9 +3,11 @@ import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common';
 import { BankingMatchingApplication } from './BankingMatchingApplication';
 import { GetMatchedTransactionsFilter } from './types';
 import { MatchBankTransactionDto } from './dtos/MatchBankTransaction.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('banking/matching')
 @ApiTags('Banking Transactions Matching')
+@ApiCommonHeaders()
 export class BankingMatchingController {
   constructor(
     private readonly bankingMatchingApplication: BankingMatchingApplication,
diff --git a/packages/server/src/modules/BankingTranasctionsRegonize/BankingRecognizedTransactions.controller.ts b/packages/server/src/modules/BankingTranasctionsRegonize/BankingRecognizedTransactions.controller.ts
index 7735494a7..f4072ee7a 100644
--- a/packages/server/src/modules/BankingTranasctionsRegonize/BankingRecognizedTransactions.controller.ts
+++ b/packages/server/src/modules/BankingTranasctionsRegonize/BankingRecognizedTransactions.controller.ts
@@ -10,10 +10,12 @@ import {
 } from '@nestjs/swagger';
 import { RecognizedTransactionsApplication } from './RecognizedTransactions.application';
 import { GetRecognizedTransactionResponseDto } from './dtos/GetRecognizedTransactionResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('banking/recognized')
 @ApiTags('Banking Recognized Transactions')
 @ApiExtraModels(GetRecognizedTransactionResponseDto)
+@ApiCommonHeaders()
 export class BankingRecognizedTransactionsController {
   constructor(
     private readonly recognizedTransactionsApplication: RecognizedTransactionsApplication,
diff --git a/packages/server/src/modules/BankingTransactions/controllers/BankingPendingTransactions.controller.ts b/packages/server/src/modules/BankingTransactions/controllers/BankingPendingTransactions.controller.ts
index 45d0121ef..2a5bd8fcc 100644
--- a/packages/server/src/modules/BankingTransactions/controllers/BankingPendingTransactions.controller.ts
+++ b/packages/server/src/modules/BankingTransactions/controllers/BankingPendingTransactions.controller.ts
@@ -10,10 +10,12 @@ import {
 import { BankingTransactionsApplication } from '../BankingTransactionsApplication.service';
 import { GetPendingTransactionsQueryDto } from '../dtos/GetPendingTransactionsQuery.dto';
 import { GetPendingTransactionResponseDto } from '../dtos/GetPendingTransactionResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('banking/pending')
 @ApiTags('Banking Pending Transactions')
 @ApiExtraModels(GetPendingTransactionResponseDto)
+@ApiCommonHeaders()
 export class BankingPendingTransactionsController {
   constructor(
     private readonly bankingTransactionsApplication: BankingTransactionsApplication,
diff --git a/packages/server/src/modules/BankingTransactions/controllers/BankingTransactions.controller.ts b/packages/server/src/modules/BankingTransactions/controllers/BankingTransactions.controller.ts
index 5686d1ea2..697b7f142 100644
--- a/packages/server/src/modules/BankingTransactions/controllers/BankingTransactions.controller.ts
+++ b/packages/server/src/modules/BankingTransactions/controllers/BankingTransactions.controller.ts
@@ -22,10 +22,12 @@ import { CreateBankTransactionDto } from '../dtos/CreateBankTransaction.dto';
 import { GetBankTransactionsQueryDto } from '../dtos/GetBankTranasctionsQuery.dto';
 import { BankTransactionResponseDto } from '../dtos/BankTransactionResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('banking/transactions')
 @ApiTags('Banking Transactions')
 @ApiExtraModels(BankTransactionResponseDto, PaginatedResponseDto)
+@ApiCommonHeaders()
 export class BankingTransactionsController {
   constructor(
     private readonly bankingTransactionsApplication: BankingTransactionsApplication,
diff --git a/packages/server/src/modules/BankingTransactions/controllers/BankingUncategorizedTransactions.controller.ts b/packages/server/src/modules/BankingTransactions/controllers/BankingUncategorizedTransactions.controller.ts
index 75e10142f..2d50bf66b 100644
--- a/packages/server/src/modules/BankingTransactions/controllers/BankingUncategorizedTransactions.controller.ts
+++ b/packages/server/src/modules/BankingTransactions/controllers/BankingUncategorizedTransactions.controller.ts
@@ -8,9 +8,11 @@ import {
 } from '@nestjs/swagger';
 import { GetUncategorizedTransactionsQueryDto } from '../dtos/GetUncategorizedTransactionsQuery.dto';
 import { BankingTransactionsApplication } from '../BankingTransactionsApplication.service';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('banking/uncategorized')
 @ApiTags('Banking Uncategorized Transactions')
+@ApiCommonHeaders()
 export class BankingUncategorizedTransactionsController {
   constructor(
     private readonly bankingTransactionsApplication: BankingTransactionsApplication,
@@ -35,9 +37,10 @@ export class BankingUncategorizedTransactionsController {
     description: 'Uncategorize transactions ID',
   })
   async getAutofillCategorizeTransaction(
-    @Query('uncategorizedTransactionIds') uncategorizedTransactionIds: Array<number> | number,
+    @Query('uncategorizedTransactionIds')
+    uncategorizedTransactionIds: Array<number> | number,
   ) {
-    console.log(uncategorizedTransactionIds)
+    console.log(uncategorizedTransactionIds);
     return this.bankingTransactionsApplication.getAutofillCategorizeTransaction(
       uncategorizedTransactionIds,
     );
diff --git a/packages/server/src/modules/BankingTransactionsExclude/BankingTransactionsExclude.controller.ts b/packages/server/src/modules/BankingTransactionsExclude/BankingTransactionsExclude.controller.ts
index 344c00bff..f0a040995 100644
--- a/packages/server/src/modules/BankingTransactionsExclude/BankingTransactionsExclude.controller.ts
+++ b/packages/server/src/modules/BankingTransactionsExclude/BankingTransactionsExclude.controller.ts
@@ -18,10 +18,12 @@ import {
   getSchemaPath,
 } from '@nestjs/swagger';
 import { GetExcludedBankTransactionResponseDto } from './dtos/GetExcludedBankTransactionResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('banking/exclude')
 @ApiTags('Banking Transactions')
 @ApiExtraModels(GetExcludedBankTransactionResponseDto)
+@ApiCommonHeaders()
 export class BankingTransactionsExcludeController {
   constructor(
     private readonly excludeBankTransactionsApplication: ExcludeBankTransactionsApplication,
diff --git a/packages/server/src/modules/BillLandedCosts/LandedCost.controller.ts b/packages/server/src/modules/BillLandedCosts/LandedCost.controller.ts
index caaec566e..6ed7ed8a5 100644
--- a/packages/server/src/modules/BillLandedCosts/LandedCost.controller.ts
+++ b/packages/server/src/modules/BillLandedCosts/LandedCost.controller.ts
@@ -14,9 +14,11 @@ import { BillAllocatedLandedCostTransactions } from './commands/BillAllocatedLan
 import { RevertAllocatedLandedCost } from './commands/RevertAllocatedLandedCost.service';
 import { LandedCostTranasctions } from './commands/LandedCostTransactions.service';
 import { LandedCostTransactionsQueryDto } from './dtos/LandedCostTransactionsQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @ApiTags('Landed Cost')
 @Controller('landed-cost')
+@ApiCommonHeaders()
 export class BillAllocateLandedCostController {
   constructor(
     private allocateLandedCost: AllocateLandedCostService,
diff --git a/packages/server/src/modules/BillPayments/BillPayments.controller.ts b/packages/server/src/modules/BillPayments/BillPayments.controller.ts
index 686fb6aa4..36d9c5785 100644
--- a/packages/server/src/modules/BillPayments/BillPayments.controller.ts
+++ b/packages/server/src/modules/BillPayments/BillPayments.controller.ts
@@ -25,11 +25,13 @@ import { GetBillPaymentsFilterDto } from './dtos/GetBillPaymentsFilter.dto';
 import { BillPaymentsPages } from './commands/BillPaymentsPages.service';
 import { BillPaymentResponseDto } from './dtos/BillPaymentResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('bill-payments')
 @ApiTags('Bill Payments')
 @ApiExtraModels(BillPaymentResponseDto)
 @ApiExtraModels(PaginatedResponseDto)
+@ApiCommonHeaders()
 export class BillPaymentsController {
   constructor(
     private billPaymentsApplication: BillPaymentsApplication,
diff --git a/packages/server/src/modules/Bills/Bills.controller.ts b/packages/server/src/modules/Bills/Bills.controller.ts
index 29d3d2869..c77639715 100644
--- a/packages/server/src/modules/Bills/Bills.controller.ts
+++ b/packages/server/src/modules/Bills/Bills.controller.ts
@@ -21,11 +21,13 @@ import { IBillsFilter } from './Bills.types';
 import { CreateBillDto, EditBillDto } from './dtos/Bill.dto';
 import { BillResponseDto } from './dtos/BillResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('bills')
 @ApiTags('Bills')
 @ApiExtraModels(BillResponseDto)
 @ApiExtraModels(PaginatedResponseDto)
+@ApiCommonHeaders()
 export class BillsController {
   constructor(private billsApplication: BillsApplication) {}
 
diff --git a/packages/server/src/modules/Branches/Branches.controller.ts b/packages/server/src/modules/Branches/Branches.controller.ts
index 7221a020a..02d7e5d8f 100644
--- a/packages/server/src/modules/Branches/Branches.controller.ts
+++ b/packages/server/src/modules/Branches/Branches.controller.ts
@@ -17,10 +17,12 @@ import {
   getSchemaPath,
 } from '@nestjs/swagger';
 import { BranchResponseDto } from './dtos/BranchResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('branches')
 @ApiTags('Branches')
 @ApiExtraModels(BranchResponseDto)
+@ApiCommonHeaders()
 export class BranchesController {
   constructor(private readonly branchesApplication: BranchesApplication) {}
 
diff --git a/packages/server/src/modules/CreditNoteRefunds/CreditNoteRefunds.controller.ts b/packages/server/src/modules/CreditNoteRefunds/CreditNoteRefunds.controller.ts
index 99a6d7a7d..5945a0a5e 100644
--- a/packages/server/src/modules/CreditNoteRefunds/CreditNoteRefunds.controller.ts
+++ b/packages/server/src/modules/CreditNoteRefunds/CreditNoteRefunds.controller.ts
@@ -4,9 +4,11 @@ import { ICreditNoteRefundDTO } from '../CreditNotes/types/CreditNotes.types';
 import { CreditNotesRefundsApplication } from './CreditNotesRefundsApplication.service';
 import { RefundCreditNote } from './models/RefundCreditNote';
 import { CreditNoteRefundDto } from './dto/CreditNoteRefund.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('credit-notes')
 @ApiTags('Credit Note Refunds')
+@ApiCommonHeaders()
 export class CreditNoteRefundsController {
   constructor(
     private readonly creditNotesRefundsApplication: CreditNotesRefundsApplication,
diff --git a/packages/server/src/modules/CreditNotes/CreditNotes.controller.ts b/packages/server/src/modules/CreditNotes/CreditNotes.controller.ts
index b8da211f3..52dde0e72 100644
--- a/packages/server/src/modules/CreditNotes/CreditNotes.controller.ts
+++ b/packages/server/src/modules/CreditNotes/CreditNotes.controller.ts
@@ -21,11 +21,13 @@ import { ICreditNotesQueryDTO } from './types/CreditNotes.types';
 import { CreateCreditNoteDto, EditCreditNoteDto } from './dtos/CreditNote.dto';
 import { CreditNoteResponseDto } from './dtos/CreditNoteResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('credit-notes')
 @ApiTags('Credit Notes')
 @ApiExtraModels(CreditNoteResponseDto)
 @ApiExtraModels(PaginatedResponseDto)
+@ApiCommonHeaders()
 export class CreditNotesController {
   /**
    * @param {CreditNoteApplication} creditNoteApplication - The credit note application service.
diff --git a/packages/server/src/modules/Currencies/Currencies.controller.ts b/packages/server/src/modules/Currencies/Currencies.controller.ts
index 9d5885695..169294f63 100644
--- a/packages/server/src/modules/Currencies/Currencies.controller.ts
+++ b/packages/server/src/modules/Currencies/Currencies.controller.ts
@@ -23,10 +23,12 @@ import { CurrenciesApplication } from './CurrenciesApplication.service';
 import { CreateCurrencyDto } from './dtos/CreateCurrency.dto';
 import { EditCurrencyDto } from './dtos/EditCurrency.dto';
 import { CurrencyResponseDto } from './dtos/CurrencyResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @ApiTags('Currencies')
 @Controller('/currencies')
 @ApiExtraModels(CurrencyResponseDto)
+@ApiCommonHeaders()
 export class CurrenciesController {
   constructor(private readonly currenciesApp: CurrenciesApplication) {}
 
diff --git a/packages/server/src/modules/Customers/Customers.controller.ts b/packages/server/src/modules/Customers/Customers.controller.ts
index 4d91efa0f..71de58616 100644
--- a/packages/server/src/modules/Customers/Customers.controller.ts
+++ b/packages/server/src/modules/Customers/Customers.controller.ts
@@ -24,10 +24,12 @@ import { CreateCustomerDto } from './dtos/CreateCustomer.dto';
 import { EditCustomerDto } from './dtos/EditCustomer.dto';
 import { CustomerResponseDto } from './dtos/CustomerResponse.dto';
 import { GetCustomersQueryDto } from './dtos/GetCustomersQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('customers')
 @ApiTags('Customers')
 @ApiExtraModels(CustomerResponseDto)
+@ApiCommonHeaders()
 export class CustomersController {
   constructor(private customersApplication: CustomersApplication) {}
 
diff --git a/packages/server/src/modules/Expenses/Expenses.controller.ts b/packages/server/src/modules/Expenses/Expenses.controller.ts
index 2c021f682..2dfb05409 100644
--- a/packages/server/src/modules/Expenses/Expenses.controller.ts
+++ b/packages/server/src/modules/Expenses/Expenses.controller.ts
@@ -20,10 +20,12 @@ import {
 import { CreateExpenseDto, EditExpenseDto } from './dtos/Expense.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
 import { ExpenseResponseDto } from './dtos/ExpenseResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('expenses')
 @ApiTags('Expenses')
 @ApiExtraModels(PaginatedResponseDto, ExpenseResponseDto)
+@ApiCommonHeaders()
 export class ExpensesController {
   constructor(private readonly expensesApplication: ExpensesApplication) {}
 
diff --git a/packages/server/src/modules/FinancialStatements/modules/APAgingSummary/APAgingSummary.controller.ts b/packages/server/src/modules/FinancialStatements/modules/APAgingSummary/APAgingSummary.controller.ts
index 4e9bbec54..3d5db12b2 100644
--- a/packages/server/src/modules/FinancialStatements/modules/APAgingSummary/APAgingSummary.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/APAgingSummary/APAgingSummary.controller.ts
@@ -10,9 +10,11 @@ import {
 } from '@nestjs/swagger';
 import { APAgingSummaryQueryDto } from './APAgingSummaryQuery.dto';
 import { APAgingSummaryResponseExample } from './APAgingSummary.swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('reports/payable-aging-summary')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class APAgingSummaryController {
   constructor(private readonly APAgingSummaryApp: APAgingSummaryApplication) {}
 
diff --git a/packages/server/src/modules/FinancialStatements/modules/ARAgingSummary/ARAgingSummary.controller.ts b/packages/server/src/modules/FinancialStatements/modules/ARAgingSummary/ARAgingSummary.controller.ts
index 1abc2f2d0..32a64a237 100644
--- a/packages/server/src/modules/FinancialStatements/modules/ARAgingSummary/ARAgingSummary.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/ARAgingSummary/ARAgingSummary.controller.ts
@@ -11,9 +11,11 @@ import {
 } from '@nestjs/swagger';
 import { ARAgingSummaryQueryDto } from './ARAgingSummaryQuery.dto';
 import { ARAgingSummaryResponseExample } from './ARAgingSummary.swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('reports/receivable-aging-summary')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class ARAgingSummaryController {
   constructor(private readonly ARAgingSummaryApp: ARAgingSummaryApplication) {}
 
diff --git a/packages/server/src/modules/FinancialStatements/modules/BalanceSheet/BalanceSheet.controller.ts b/packages/server/src/modules/FinancialStatements/modules/BalanceSheet/BalanceSheet.controller.ts
index acc1a1870..3b186cc52 100644
--- a/packages/server/src/modules/FinancialStatements/modules/BalanceSheet/BalanceSheet.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/BalanceSheet/BalanceSheet.controller.ts
@@ -10,9 +10,11 @@ import {
 } from '@nestjs/swagger';
 import { BalanceSheetQueryDto } from './BalanceSheet.dto';
 import { BalanceSheetResponseExample } from './BalanceSheet.swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/balance-sheet')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class BalanceSheetStatementController {
   constructor(private readonly balanceSheetApp: BalanceSheetApplication) {}
 
diff --git a/packages/server/src/modules/FinancialStatements/modules/CashFlowStatement/Cashflow.controller.ts b/packages/server/src/modules/FinancialStatements/modules/CashFlowStatement/Cashflow.controller.ts
index aac91ffe5..77489b30f 100644
--- a/packages/server/src/modules/FinancialStatements/modules/CashFlowStatement/Cashflow.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/CashFlowStatement/Cashflow.controller.ts
@@ -10,9 +10,11 @@ import {
 } from '@nestjs/swagger';
 import { CashFlowStatementQueryDto } from './CashFlowStatementQuery.dto';
 import { CashflowStatementResponseExample } from './CashflowStatement.swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('reports/cashflow-statement')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class CashflowController {
   constructor(private readonly cashflowSheetApp: CashflowSheetApplication) {}
 
diff --git a/packages/server/src/modules/FinancialStatements/modules/CustomerBalanceSummary/CustomerBalanceSummary.controller.ts b/packages/server/src/modules/FinancialStatements/modules/CustomerBalanceSummary/CustomerBalanceSummary.controller.ts
index 1ed6189d3..5736b522e 100644
--- a/packages/server/src/modules/FinancialStatements/modules/CustomerBalanceSummary/CustomerBalanceSummary.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/CustomerBalanceSummary/CustomerBalanceSummary.controller.ts
@@ -9,9 +9,11 @@ import { Controller, Get, Headers, Query, Res } from '@nestjs/common';
 import { CustomerBalanceSummaryApplication } from './CustomerBalanceSummaryApplication';
 import { CustomerBalanceSummaryQueryDto } from './CustomerBalanceSummaryQuery.dto';
 import { AcceptType } from '@/constants/accept-type';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/customer-balance-summary')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class CustomerBalanceSummaryController {
   constructor(
     private readonly customerBalanceSummaryApp: CustomerBalanceSummaryApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/GeneralLedger/GeneralLedger.controller.ts b/packages/server/src/modules/FinancialStatements/modules/GeneralLedger/GeneralLedger.controller.ts
index f9fd8a45c..d413c4795 100644
--- a/packages/server/src/modules/FinancialStatements/modules/GeneralLedger/GeneralLedger.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/GeneralLedger/GeneralLedger.controller.ts
@@ -10,9 +10,11 @@ import { GeneralLedgerApplication } from './GeneralLedgerApplication';
 import { AcceptType } from '@/constants/accept-type';
 import { GeneralLedgerQueryDto } from './GeneralLedgerQuery.dto';
 import { GeneralLedgerResponseExample } from './GeneralLedger.swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/general-ledger')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class GeneralLedgerController {
   constructor(
     private readonly generalLedgerApplication: GeneralLedgerApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/InventoryItemDetails/InventoryItemDetails.controller.ts b/packages/server/src/modules/FinancialStatements/modules/InventoryItemDetails/InventoryItemDetails.controller.ts
index 567b5ab9c..634a95d05 100644
--- a/packages/server/src/modules/FinancialStatements/modules/InventoryItemDetails/InventoryItemDetails.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/InventoryItemDetails/InventoryItemDetails.controller.ts
@@ -4,9 +4,11 @@ import { Controller, Get, Headers, Query, Res } from '@nestjs/common';
 import { InventoryItemDetailsApplication } from './InventoryItemDetailsApplication';
 import { AcceptType } from '@/constants/accept-type';
 import { InventoryItemDetailsQueryDto } from './InventoryItemDetailsQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('reports/inventory-item-details')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class InventoryItemDetailsController {
   constructor(
     private readonly inventoryItemDetailsApp: InventoryItemDetailsApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/InventoryValuationSheet/InventoryValuation.controller.ts b/packages/server/src/modules/FinancialStatements/modules/InventoryValuationSheet/InventoryValuation.controller.ts
index a7de4a60e..eeba1370e 100644
--- a/packages/server/src/modules/FinancialStatements/modules/InventoryValuationSheet/InventoryValuation.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/InventoryValuationSheet/InventoryValuation.controller.ts
@@ -9,9 +9,11 @@ import { Controller, Get, Headers, Query, Res } from '@nestjs/common';
 import { InventoryValuationSheetApplication } from './InventoryValuationSheetApplication';
 import { InventoryValuationQueryDto } from './InventoryValuationQuery.dto';
 import { AcceptType } from '@/constants/accept-type';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('reports/inventory-valuation')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class InventoryValuationController {
   constructor(
     private readonly inventoryValuationApp: InventoryValuationSheetApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/JournalSheet/JournalSheet.controller.ts b/packages/server/src/modules/FinancialStatements/modules/JournalSheet/JournalSheet.controller.ts
index a1b7cf8a2..40df5840e 100644
--- a/packages/server/src/modules/FinancialStatements/modules/JournalSheet/JournalSheet.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/JournalSheet/JournalSheet.controller.ts
@@ -10,9 +10,11 @@ import {
 } from '@nestjs/swagger';
 import { JournalSheetQueryDto } from './JournalSheetQuery.dto';
 import { JournalSheetResponseExample } from './JournalSheet.swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/journal')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class JournalSheetController {
   constructor(private readonly journalSheetApp: JournalSheetApplication) {}
 
diff --git a/packages/server/src/modules/FinancialStatements/modules/ProfitLossSheet/ProfitLossSheet.controller.ts b/packages/server/src/modules/FinancialStatements/modules/ProfitLossSheet/ProfitLossSheet.controller.ts
index 3e823c649..916f2bf3b 100644
--- a/packages/server/src/modules/FinancialStatements/modules/ProfitLossSheet/ProfitLossSheet.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/ProfitLossSheet/ProfitLossSheet.controller.ts
@@ -10,9 +10,11 @@ import {
 } from '@nestjs/swagger';
 import { ProfitLossSheetQueryDto } from './ProfitLossSheetQuery.dto';
 import { ProfitLossSheetResponseExample } from './ProfitLossSheet.swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/profit-loss-sheet')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class ProfitLossSheetController {
   constructor(
     private readonly profitLossSheetApp: ProfitLossSheetApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/PurchasesByItems/PurchasesByItems.controller.ts b/packages/server/src/modules/FinancialStatements/modules/PurchasesByItems/PurchasesByItems.controller.ts
index 09d17ff95..1cf6716e7 100644
--- a/packages/server/src/modules/FinancialStatements/modules/PurchasesByItems/PurchasesByItems.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/PurchasesByItems/PurchasesByItems.controller.ts
@@ -4,9 +4,11 @@ import { PurchasesByItemsApplication } from './PurchasesByItemsApplication';
 import { AcceptType } from '@/constants/accept-type';
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { PurchasesByItemsQueryDto } from './PurchasesByItemsQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/purchases-by-items')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class PurchasesByItemReportController {
   constructor(
     private readonly purchasesByItemsApp: PurchasesByItemsApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/SalesByItems/SalesByItems.controller.ts b/packages/server/src/modules/FinancialStatements/modules/SalesByItems/SalesByItems.controller.ts
index 9f9164d20..c51c0a0a0 100644
--- a/packages/server/src/modules/FinancialStatements/modules/SalesByItems/SalesByItems.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/SalesByItems/SalesByItems.controller.ts
@@ -12,9 +12,11 @@ import { SalesByItemsApplication } from './SalesByItemsApplication';
 import { Response } from 'express';
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { SalesByItemsQueryDto } from './SalesByItemsQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/sales-by-items')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class SalesByItemsController {
   constructor(private readonly salesByItemsApp: SalesByItemsApplication) {}
 
diff --git a/packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.controller.ts b/packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.controller.ts
index d60170c62..681996360 100644
--- a/packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.controller.ts
@@ -9,9 +9,11 @@ import { Controller, Get, Headers, Query, Res } from '@nestjs/common';
 import { AcceptType } from '@/constants/accept-type';
 import { SalesTaxLiabilitySummaryApplication } from './SalesTaxLiabilitySummaryApplication';
 import { SalesTaxLiabilitySummaryQueryDto } from './dtos/SalesTaxLiabilityQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/sales-tax-liability-summary')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class SalesTaxLiabilitySummaryController {
   constructor(
     private readonly salesTaxLiabilitySummaryApp: SalesTaxLiabilitySummaryApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/TransactionsByCustomer/TransactionsByCustomer.controller.ts b/packages/server/src/modules/FinancialStatements/modules/TransactionsByCustomer/TransactionsByCustomer.controller.ts
index 8fd032a0f..5fa03791f 100644
--- a/packages/server/src/modules/FinancialStatements/modules/TransactionsByCustomer/TransactionsByCustomer.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/TransactionsByCustomer/TransactionsByCustomer.controller.ts
@@ -5,9 +5,11 @@ import { TransactionsByCustomerApplication } from './TransactionsByCustomersAppl
 import { AcceptType } from '@/constants/accept-type';
 import { Response } from 'express';
 import { TransactionsByCustomerQueryDto } from './TransactionsByCustomerQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/transactions-by-customers')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class TransactionsByCustomerController {
   constructor(
     private readonly transactionsByCustomersApp: TransactionsByCustomerApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/TransactionsByVendor/TransactionsByVendor.controller.ts b/packages/server/src/modules/FinancialStatements/modules/TransactionsByVendor/TransactionsByVendor.controller.ts
index 596ec6a66..0bee361d6 100644
--- a/packages/server/src/modules/FinancialStatements/modules/TransactionsByVendor/TransactionsByVendor.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/TransactionsByVendor/TransactionsByVendor.controller.ts
@@ -5,9 +5,11 @@ import { Response } from 'express';
 import { TransactionsByVendorApplication } from './TransactionsByVendorApplication';
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { TransactionsByVendorQueryDto } from './TransactionsByVendorQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/transactions-by-vendors')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class TransactionsByVendorController {
   constructor(
     private readonly transactionsByVendorsApp: TransactionsByVendorApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/TrialBalanceSheet/TrialBalanceSheet.controller.ts b/packages/server/src/modules/FinancialStatements/modules/TrialBalanceSheet/TrialBalanceSheet.controller.ts
index e93e65198..a6df56623 100644
--- a/packages/server/src/modules/FinancialStatements/modules/TrialBalanceSheet/TrialBalanceSheet.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/TrialBalanceSheet/TrialBalanceSheet.controller.ts
@@ -11,9 +11,11 @@ import { AcceptType } from '@/constants/accept-type';
 import { TrialBalanceSheetApplication } from './TrialBalanceSheetApplication';
 import { TrialBalanceSheetQueryDto } from './TrialBalanceSheetQuery.dto';
 import { TrialBalanceSheetResponseExample } from './TrialBalanceSheet.swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('reports/trial-balance-sheet')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class TrialBalanceSheetController {
   constructor(
     private readonly trialBalanceSheetApp: TrialBalanceSheetApplication,
diff --git a/packages/server/src/modules/FinancialStatements/modules/VendorBalanceSummary/VendorBalanceSummary.controller.ts b/packages/server/src/modules/FinancialStatements/modules/VendorBalanceSummary/VendorBalanceSummary.controller.ts
index 57517eb24..04ff6d084 100644
--- a/packages/server/src/modules/FinancialStatements/modules/VendorBalanceSummary/VendorBalanceSummary.controller.ts
+++ b/packages/server/src/modules/FinancialStatements/modules/VendorBalanceSummary/VendorBalanceSummary.controller.ts
@@ -10,9 +10,11 @@ import {
   ApiTags,
 } from '@nestjs/swagger';
 import { VendorBalanceSummaryQueryDto } from './VendorBalanceSummaryQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/reports/vendor-balance-summary')
 @ApiTags('Reports')
+@ApiCommonHeaders()
 export class VendorBalanceSummaryController {
   constructor(
     private readonly vendorBalanceSummaryApp: VendorBalanceSummaryApplication,
diff --git a/packages/server/src/modules/Import/Import.controller.ts b/packages/server/src/modules/Import/Import.controller.ts
index 8439ea9b6..466bd26f2 100644
--- a/packages/server/src/modules/Import/Import.controller.ts
+++ b/packages/server/src/modules/Import/Import.controller.ts
@@ -16,9 +16,11 @@ import { ApiTags, ApiOperation, ApiResponse } from '@nestjs/swagger';
 import { ImportResourceApplication } from './ImportResourceApplication';
 import { uploadImportFileMulterOptions } from './ImportMulter.utils';
 import { parseJsonSafe } from '@/utils/parse-json';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('import')
 @ApiTags('Import')
+@ApiCommonHeaders()
 export class ImportController {
   constructor(private readonly importResourceApp: ImportResourceApplication) {}
 
diff --git a/packages/server/src/modules/InventoryAdjutments/InventoryAdjustments.controller.ts b/packages/server/src/modules/InventoryAdjutments/InventoryAdjustments.controller.ts
index a8a4ef7af..00e4c8e5b 100644
--- a/packages/server/src/modules/InventoryAdjutments/InventoryAdjustments.controller.ts
+++ b/packages/server/src/modules/InventoryAdjutments/InventoryAdjustments.controller.ts
@@ -20,10 +20,12 @@ import { IInventoryAdjustmentsFilter } from './types/InventoryAdjustments.types'
 import { InventoryAdjustment } from './models/InventoryAdjustment';
 import { CreateQuickInventoryAdjustmentDto } from './dtos/CreateQuickInventoryAdjustment.dto';
 import { InventoryAdjustmentResponseDto } from './dtos/InventoryAdjustmentResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('inventory-adjustments')
 @ApiTags('Inventory Adjustments')
 @ApiExtraModels(InventoryAdjustmentResponseDto)
+@ApiCommonHeaders()
 export class InventoryAdjustmentsController {
   constructor(
     private readonly inventoryAdjustmentsApplicationService: InventoryAdjustmentsApplicationService,
diff --git a/packages/server/src/modules/InventoryCost/InventoryCost.controller.ts b/packages/server/src/modules/InventoryCost/InventoryCost.controller.ts
index 40f0e38a1..15b456b0b 100644
--- a/packages/server/src/modules/InventoryCost/InventoryCost.controller.ts
+++ b/packages/server/src/modules/InventoryCost/InventoryCost.controller.ts
@@ -2,9 +2,11 @@ import { Controller, Get, Query } from '@nestjs/common';
 import { GetItemsInventoryValuationListService } from './queries/GetItemsInventoryValuationList.service';
 import { GetInventoyItemsCostQueryDto } from './dtos/GetInventoryItemsCostQuery.dto';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('inventory-cost')
 @ApiTags('Inventory Cost')
+@ApiCommonHeaders()
 export class InventoryCostController {
   constructor(
     private readonly inventoryItemCost: GetItemsInventoryValuationListService,
diff --git a/packages/server/src/modules/ItemCategories/ItemCategory.controller.ts b/packages/server/src/modules/ItemCategories/ItemCategory.controller.ts
index a95d34661..ea902928d 100644
--- a/packages/server/src/modules/ItemCategories/ItemCategory.controller.ts
+++ b/packages/server/src/modules/ItemCategories/ItemCategory.controller.ts
@@ -25,10 +25,12 @@ import {
   EditItemCategoryDto,
 } from './dtos/ItemCategory.dto';
 import { ItemCategoryResponseDto } from './dtos/ItemCategoryResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('item-categories')
 @ApiTags('Item Categories')
 @ApiExtraModels(ItemCategoryResponseDto)
+@ApiCommonHeaders()
 export class ItemCategoryController {
   constructor(
     private readonly itemCategoryApplication: ItemCategoryApplication,
diff --git a/packages/server/src/modules/Items/Item.controller.ts b/packages/server/src/modules/Items/Item.controller.ts
index 0b77aeace..4a71770c4 100644
--- a/packages/server/src/modules/Items/Item.controller.ts
+++ b/packages/server/src/modules/Items/Item.controller.ts
@@ -4,7 +4,6 @@ import {
   Delete,
   Param,
   Post,
-  UseGuards,
   Patch,
   Get,
   Put,
@@ -29,6 +28,7 @@ import { ItemInvoiceResponseDto } from './dtos/itemInvoiceResponse.dto';
 import { ItemEstimatesResponseDto } from './dtos/ItemEstimatesResponse.dto';
 import { ItemBillsResponseDto } from './dtos/itemBillsResponse.dto';
 import { ItemReceiptsResponseDto } from './dtos/ItemReceiptsResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('/items')
 @ApiTags('Items')
@@ -39,6 +39,7 @@ import { ItemReceiptsResponseDto } from './dtos/ItemReceiptsResponse.dto';
 @ApiExtraModels(ItemBillsResponseDto)
 @ApiExtraModels(ItemEstimatesResponseDto)
 @ApiExtraModels(ItemReceiptsResponseDto)
+@ApiCommonHeaders()
 export class ItemsController extends TenantController {
   constructor(private readonly itemsApplication: ItemsApplicationService) {
     super();
diff --git a/packages/server/src/modules/ManualJournals/ManualJournals.controller.ts b/packages/server/src/modules/ManualJournals/ManualJournals.controller.ts
index 0d9eef165..1d813c346 100644
--- a/packages/server/src/modules/ManualJournals/ManualJournals.controller.ts
+++ b/packages/server/src/modules/ManualJournals/ManualJournals.controller.ts
@@ -24,10 +24,12 @@ import {
 } from './dtos/ManualJournal.dto';
 import { IManualJournalsFilter } from './types/ManualJournals.types';
 import { ManualJournalResponseDto } from './dtos/ManualJournalResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('manual-journals')
 @ApiTags('Manual Journals')
 @ApiExtraModels(ManualJournalResponseDto)
+@ApiCommonHeaders()
 export class ManualJournalsController {
   constructor(private manualJournalsApplication: ManualJournalsApplication) {}
 
diff --git a/packages/server/src/modules/Organization/Organization.controller.ts b/packages/server/src/modules/Organization/Organization.controller.ts
index 0586d45aa..0bd2b055a 100644
--- a/packages/server/src/modules/Organization/Organization.controller.ts
+++ b/packages/server/src/modules/Organization/Organization.controller.ts
@@ -33,12 +33,14 @@ import {
   OrganizationBuiltResponseExample,
 } from './Organization.swagger';
 import { GetCurrentOrganizationResponseDto } from './dtos/GetCurrentOrganizationResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @ApiTags('Organization')
 @Controller('organization')
 @IgnoreTenantInitializedRoute()
 @IgnoreTenantSeededRoute()
 @ApiExtraModels(GetCurrentOrganizationResponseDto)
+@ApiCommonHeaders()
 export class OrganizationController {
   constructor(
     private readonly buildOrganizationService: BuildOrganizationService,
diff --git a/packages/server/src/modules/PaymentLinks/PaymentLinks.controller.ts b/packages/server/src/modules/PaymentLinks/PaymentLinks.controller.ts
index 7d69f1bad..66686356d 100644
--- a/packages/server/src/modules/PaymentLinks/PaymentLinks.controller.ts
+++ b/packages/server/src/modules/PaymentLinks/PaymentLinks.controller.ts
@@ -2,9 +2,11 @@ import { Response } from 'express';
 import { Controller, Get, Param, Res } from '@nestjs/common';
 import { PaymentLinksApplication } from './PaymentLinksApplication';
 import { ApiOperation, ApiParam, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('payment-links')
 @ApiTags('Payment Links')
+@ApiCommonHeaders()
 export class PaymentLinksController {
   constructor(private readonly paymentLinkApp: PaymentLinksApplication) {}
 
diff --git a/packages/server/src/modules/PaymentReceived/PaymentsReceived.controller.ts b/packages/server/src/modules/PaymentReceived/PaymentsReceived.controller.ts
index 950e81b8b..abc5577d0 100644
--- a/packages/server/src/modules/PaymentReceived/PaymentsReceived.controller.ts
+++ b/packages/server/src/modules/PaymentReceived/PaymentsReceived.controller.ts
@@ -31,12 +31,14 @@ import { AcceptType } from '@/constants/accept-type';
 import { PaymentReceivedResponseDto } from './dtos/PaymentReceivedResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
 import { PaymentReceivedStateResponseDto } from './dtos/PaymentReceivedStateResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('payments-received')
 @ApiTags('Payments Received')
 @ApiExtraModels(PaymentReceivedResponseDto)
 @ApiExtraModels(PaginatedResponseDto)
 @ApiExtraModels(PaymentReceivedStateResponseDto)
+@ApiCommonHeaders()
 export class PaymentReceivesController {
   constructor(private paymentReceivesApplication: PaymentReceivesApplication) {}
 
diff --git a/packages/server/src/modules/PdfTemplate/PdfTemplates.controller.ts b/packages/server/src/modules/PdfTemplate/PdfTemplates.controller.ts
index d90a91a2e..b11157fc4 100644
--- a/packages/server/src/modules/PdfTemplate/PdfTemplates.controller.ts
+++ b/packages/server/src/modules/PdfTemplate/PdfTemplates.controller.ts
@@ -10,9 +10,11 @@ import {
 } from '@nestjs/common';
 import { PdfTemplateApplication } from './PdfTemplate.application';
 import { ICreateInvoicePdfTemplateDTO, IEditPdfTemplateDTO } from './types';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('pdf-templates')
 @ApiTags('Pdf Templates')
+@ApiCommonHeaders()
 export class PdfTemplatesController {
   constructor(
     private readonly pdfTemplateApplication: PdfTemplateApplication,
diff --git a/packages/server/src/modules/Roles/Roles.controller.ts b/packages/server/src/modules/Roles/Roles.controller.ts
index a80accf12..1418351c2 100644
--- a/packages/server/src/modules/Roles/Roles.controller.ts
+++ b/packages/server/src/modules/Roles/Roles.controller.ts
@@ -5,12 +5,11 @@ import {
   Delete,
   Param,
   Body,
-  Res,
   Next,
   HttpStatus,
   ParseIntPipe,
 } from '@nestjs/common';
-import { Response, NextFunction } from 'express';
+import { NextFunction } from 'express';
 import { CreateRoleDto, EditRoleDto } from './dtos/Role.dto';
 import { RolesApplication } from './Roles.application';
 import {
@@ -23,10 +22,12 @@ import {
   ApiExtraModels,
 } from '@nestjs/swagger';
 import { RoleResponseDto } from './dtos/RoleResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @ApiTags('Roles')
 @Controller('roles')
 @ApiExtraModels(RoleResponseDto)
+@ApiCommonHeaders()
 export class RolesController {
   constructor(private readonly rolesApp: RolesApplication) {}
 
diff --git a/packages/server/src/modules/SaleEstimates/SaleEstimates.controller.ts b/packages/server/src/modules/SaleEstimates/SaleEstimates.controller.ts
index 7f9e6bb53..449dbfce2 100644
--- a/packages/server/src/modules/SaleEstimates/SaleEstimates.controller.ts
+++ b/packages/server/src/modules/SaleEstimates/SaleEstimates.controller.ts
@@ -35,12 +35,14 @@ import { Response } from 'express';
 import { SaleEstimateResponseDto } from './dtos/SaleEstimateResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
 import { SaleEstiamteStateResponseDto } from './dtos/SaleEstimateStateResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('sale-estimates')
 @ApiTags('Sale Estimates')
 @ApiExtraModels(SaleEstimateResponseDto)
 @ApiExtraModels(PaginatedResponseDto)
 @ApiExtraModels(SaleEstiamteStateResponseDto)
+@ApiCommonHeaders()
 export class SaleEstimatesController {
   /**
    * @param {SaleEstimatesApplication} saleEstimatesApplication - Sale estimates application.
diff --git a/packages/server/src/modules/SaleInvoices/SaleInvoices.controller.ts b/packages/server/src/modules/SaleInvoices/SaleInvoices.controller.ts
index 1704d1aab..b16eb7493 100644
--- a/packages/server/src/modules/SaleInvoices/SaleInvoices.controller.ts
+++ b/packages/server/src/modules/SaleInvoices/SaleInvoices.controller.ts
@@ -21,7 +21,6 @@ import {
 } from './SaleInvoice.types';
 import { SaleInvoiceApplication } from './SaleInvoices.application';
 import {
-  ApiHeader,
   ApiOperation,
   ApiParam,
   ApiQuery,
@@ -39,6 +38,7 @@ import { SaleInvoiceResponseDto } from './dtos/SaleInvoiceResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
 import { SaleInvoiceStateResponseDto } from './dtos/SaleInvoiceState.dto';
 import { GenerateSaleInvoiceSharableLinkResponseDto } from './dtos/generateSaleInvoiceSharableLinkResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('sale-invoices')
 @ApiTags('Sale Invoices')
@@ -46,16 +46,7 @@ import { GenerateSaleInvoiceSharableLinkResponseDto } from './dtos/generateSaleI
 @ApiExtraModels(PaginatedResponseDto)
 @ApiExtraModels(SaleInvoiceStateResponseDto)
 @ApiExtraModels(GenerateSaleInvoiceSharableLinkResponseDto)
-@ApiHeader({
-  name: 'organization-id',
-  description: 'The organization id',
-  required: true,
-})
-@ApiHeader({
-  name: 'x-access-token',
-  description: 'The authentication token',
-  required: true,
-})
+@ApiCommonHeaders()
 export class SaleInvoicesController {
   constructor(private saleInvoiceApplication: SaleInvoiceApplication) {}
 
diff --git a/packages/server/src/modules/SaleReceipts/SaleReceipts.controller.ts b/packages/server/src/modules/SaleReceipts/SaleReceipts.controller.ts
index 845c8e073..c0b1dc959 100644
--- a/packages/server/src/modules/SaleReceipts/SaleReceipts.controller.ts
+++ b/packages/server/src/modules/SaleReceipts/SaleReceipts.controller.ts
@@ -31,12 +31,14 @@ import { Response } from 'express';
 import { SaleReceiptResponseDto } from './dtos/SaleReceiptResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
 import { SaleReceiptStateResponseDto } from './dtos/SaleReceiptState.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('sale-receipts')
 @ApiTags('Sale Receipts')
 @ApiExtraModels(SaleReceiptResponseDto)
 @ApiExtraModels(PaginatedResponseDto)
 @ApiExtraModels(SaleReceiptStateResponseDto)
+@ApiCommonHeaders()
 export class SaleReceiptsController {
   constructor(private saleReceiptApplication: SaleReceiptApplication) {}
 
diff --git a/packages/server/src/modules/System/SystemDB/SystemDB.module.ts b/packages/server/src/modules/System/SystemDB/SystemDB.module.ts
index 2c9ade2c4..4abb02588 100644
--- a/packages/server/src/modules/System/SystemDB/SystemDB.module.ts
+++ b/packages/server/src/modules/System/SystemDB/SystemDB.module.ts
@@ -5,7 +5,6 @@ import {
   SystemKnexConnection,
   SystemKnexConnectionConfigure,
 } from './SystemDB.constants';
-import { SystemDatabaseController } from './SystemDB.controller';
 import { knexSnakeCaseMappers } from 'objection';
 
 const providers = [
@@ -44,6 +43,5 @@ const providers = [
 @Module({
   providers: [...providers],
   exports: [...providers],
-  controllers: [SystemDatabaseController],
 })
 export class SystemDatabaseModule {}
diff --git a/packages/server/src/modules/TaxRates/TaxRate.controller.ts b/packages/server/src/modules/TaxRates/TaxRate.controller.ts
index 24c75b22a..b8263696d 100644
--- a/packages/server/src/modules/TaxRates/TaxRate.controller.ts
+++ b/packages/server/src/modules/TaxRates/TaxRate.controller.ts
@@ -17,10 +17,12 @@ import {
 } from '@nestjs/swagger';
 import { CreateTaxRateDto, EditTaxRateDto } from './dtos/TaxRate.dto';
 import { TaxRateResponseDto } from './dtos/TaxRateResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('tax-rates')
 @ApiTags('Tax Rates')
 @ApiExtraModels(TaxRateResponseDto)
+@ApiCommonHeaders()
 export class TaxRatesController {
   constructor(private readonly taxRatesApplication: TaxRatesApplication) {}
 
diff --git a/packages/server/src/modules/Tenancy/Tenancy.module.ts b/packages/server/src/modules/Tenancy/Tenancy.module.ts
index de45d4046..174093112 100644
--- a/packages/server/src/modules/Tenancy/Tenancy.module.ts
+++ b/packages/server/src/modules/Tenancy/Tenancy.module.ts
@@ -1,16 +1,13 @@
-import { Module } from "@nestjs/common";
-import { EnsureTenantIsInitializedGuard } from "./EnsureTenantIsInitialized.guard";
-import { TenancyGlobalGuard } from "./TenancyGlobal.guard";
-import { EnsureTenantIsSeededGuard } from "./EnsureTenantIsSeeded.guards";
-import { APP_GUARD } from "@nestjs/core";
-import { TenancyContext } from "./TenancyContext.service";
-import { TenantController } from "./Tenant.controller";
-import { TenancyInitializeModelsGuard } from "./TenancyInitializeModels.guard";
-
+import { Module } from '@nestjs/common';
+import { EnsureTenantIsInitializedGuard } from './EnsureTenantIsInitialized.guard';
+import { TenancyGlobalGuard } from './TenancyGlobal.guard';
+import { EnsureTenantIsSeededGuard } from './EnsureTenantIsSeeded.guards';
+import { APP_GUARD } from '@nestjs/core';
+import { TenancyContext } from './TenancyContext.service';
+import { TenancyInitializeModelsGuard } from './TenancyInitializeModels.guard';
 
 @Module({
   exports: [TenancyContext],
-  controllers: [TenantController],
   providers: [
     TenancyContext,
     {
@@ -23,12 +20,12 @@ import { TenancyInitializeModelsGuard } from "./TenancyInitializeModels.guard";
     },
     {
       provide: APP_GUARD,
-      useClass: EnsureTenantIsSeededGuard
+      useClass: EnsureTenantIsSeededGuard,
     },
     {
       provide: APP_GUARD,
-      useClass: TenancyInitializeModelsGuard
-    }
-  ]
+      useClass: TenancyInitializeModelsGuard,
+    },
+  ],
 })
-export class TenancyModule {}
\ No newline at end of file
+export class TenancyModule {}
diff --git a/packages/server/src/modules/TransactionsLocking/TransactionsLocking.controller.ts b/packages/server/src/modules/TransactionsLocking/TransactionsLocking.controller.ts
index 7b5243449..33d2556b9 100644
--- a/packages/server/src/modules/TransactionsLocking/TransactionsLocking.controller.ts
+++ b/packages/server/src/modules/TransactionsLocking/TransactionsLocking.controller.ts
@@ -15,10 +15,12 @@ import {
   TransactionsLockingDto,
 } from './dtos/TransactionsLocking.dto';
 import { TransactionLockingResponseDto } from './dtos/TransactionLockingResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('transactions-locking')
 @ApiTags('Transactions Locking')
 @ApiExtraModels(TransactionLockingResponseDto)
+@ApiCommonHeaders()
 export class TransactionsLockingController {
   constructor(
     private readonly transactionsLockingService: TransactionsLockingService,
diff --git a/packages/server/src/modules/UsersModule/Users.controller.ts b/packages/server/src/modules/UsersModule/Users.controller.ts
index 9909fd9b7..301202de0 100644
--- a/packages/server/src/modules/UsersModule/Users.controller.ts
+++ b/packages/server/src/modules/UsersModule/Users.controller.ts
@@ -11,9 +11,11 @@ import {
 import { ApiOperation, ApiTags, ApiResponse } from '@nestjs/swagger';
 import { UsersApplication } from './Users.application';
 import { EditUserDto } from './dtos/EditUser.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('users')
 @ApiTags('Users')
+@ApiCommonHeaders()
 export class UsersController {
   constructor(private readonly usersApplication: UsersApplication) {}
 
diff --git a/packages/server/src/modules/VendorCredit/VendorCredits.controller.ts b/packages/server/src/modules/VendorCredit/VendorCredits.controller.ts
index 9acaf4094..2f0c85235 100644
--- a/packages/server/src/modules/VendorCredit/VendorCredits.controller.ts
+++ b/packages/server/src/modules/VendorCredit/VendorCredits.controller.ts
@@ -15,9 +15,11 @@ import {
   CreateVendorCreditDto,
   EditVendorCreditDto,
 } from './dtos/VendorCredit.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('vendor-credits')
 @ApiTags('Vendor Credits')
+@ApiCommonHeaders()
 export class VendorCreditsController {
   constructor(
     private readonly vendorCreditsApplication: VendorCreditsApplicationService,
diff --git a/packages/server/src/modules/Vendors/Vendors.controller.ts b/packages/server/src/modules/Vendors/Vendors.controller.ts
index 063c0a3bb..6e19e2c32 100644
--- a/packages/server/src/modules/Vendors/Vendors.controller.ts
+++ b/packages/server/src/modules/Vendors/Vendors.controller.ts
@@ -17,9 +17,11 @@ import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateVendorDto } from './dtos/CreateVendor.dto';
 import { EditVendorDto } from './dtos/EditVendor.dto';
 import { GetVendorsQueryDto } from './dtos/GetVendorsQuery.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('vendors')
-@ApiTags('vendors')
+@ApiTags('Vendors')
+@ApiCommonHeaders()
 export class VendorsController {
   constructor(private vendorsApplication: VendorsApplication) {}
 
diff --git a/packages/server/src/modules/Warehouses/Warehouses.controller.ts b/packages/server/src/modules/Warehouses/Warehouses.controller.ts
index 848ba273c..c77e89393 100644
--- a/packages/server/src/modules/Warehouses/Warehouses.controller.ts
+++ b/packages/server/src/modules/Warehouses/Warehouses.controller.ts
@@ -17,10 +17,12 @@ import {
 } from '@nestjs/swagger';
 import { CreateWarehouseDto, EditWarehouseDto } from './dtos/Warehouse.dto';
 import { WarehouseResponseDto } from './dtos/WarehouseResponse.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('warehouses')
 @ApiTags('Warehouses')
 @ApiExtraModels(WarehouseResponseDto)
+@ApiCommonHeaders()
 export class WarehousesController {
   constructor(private warehousesApplication: WarehousesApplication) {}
 
diff --git a/packages/server/src/modules/WarehousesTransfers/WarehouseTransfers.controller.ts b/packages/server/src/modules/WarehousesTransfers/WarehouseTransfers.controller.ts
index 3b4310090..483e8c637 100644
--- a/packages/server/src/modules/WarehousesTransfers/WarehouseTransfers.controller.ts
+++ b/packages/server/src/modules/WarehousesTransfers/WarehouseTransfers.controller.ts
@@ -24,10 +24,12 @@ import {
 import { GetWarehouseTransfersQueryDto } from '../Warehouses/dtos/GetWarehouseTransfersQuery.dto';
 import { WarehouseTransferResponseDto } from './dtos/WarehouseTransferResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
+import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 
 @Controller('warehouse-transfers')
 @ApiTags('Warehouse Transfers')
 @ApiExtraModels(WarehouseTransferResponseDto, PaginatedResponseDto)
+@ApiCommonHeaders()
 export class WarehouseTransfersController {
   /**
    * @param {WarehouseTransferApplication} warehouseTransferApplication - Warehouse transfer application.