diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 1c9657d..2e85bd4 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -34,7 +34,7 @@ runs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-         dotnet-version: '9.x.x'      
+        dotnet-version: '9.x.x'
 
       # https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools
     - name: Restore .NET Tools
@@ -55,11 +55,11 @@ runs:
       if: success()
       run: npm install
 
-    # - name: Format Service
-    # shell: bash
-    # if: ${{ success()}}
-    # run: |
-    #   npm run ci-format
+    - name: Format Service
+      shell: bash
+      if: ${{ success()}}
+      run: |
+        npm run ci-format
 
     - name: Build Service
       shell: bash
diff --git a/.husky/pre-commit b/.husky/pre-commit
index b7807b0..bc7d452 100644
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +1,2 @@
-npm run format
\ No newline at end of file
+npm run format
+npm run ci-format
diff --git a/2-modular-monolith-architecture-style/src/Modules/Booking/src/Booking/Features/CreatingBook/V1/CreateBooking.cs b/2-modular-monolith-architecture-style/src/Modules/Booking/src/Booking/Features/CreatingBook/V1/CreateBooking.cs
index 9707156..9e83db0 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Booking/src/Booking/Features/CreatingBook/V1/CreateBooking.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Booking/src/Booking/Features/CreatingBook/V1/CreateBooking.cs
@@ -2,6 +2,7 @@ namespace Booking.Booking.Features.CreatingBook.V1;
 
 using Ardalis.GuardClauses;
 using BookingFlight;
+using BookingPassenger;
 using BuildingBlocks.Core;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.Core.Event;
@@ -18,7 +19,6 @@ using MediatR;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
-using BookingPassenger;
 using ValueObjects;
 
 public record CreateBooking(Guid PassengerId, Guid FlightId, string Description) : ICommand<CreateBookingResult>
diff --git a/2-modular-monolith-architecture-style/src/Modules/Booking/src/Extensions/Infrastructure/GrpcClientExtensions.cs b/2-modular-monolith-architecture-style/src/Modules/Booking/src/Extensions/Infrastructure/GrpcClientExtensions.cs
index 69ea4d7..12a98cf 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Booking/src/Extensions/Infrastructure/GrpcClientExtensions.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Booking/src/Extensions/Infrastructure/GrpcClientExtensions.cs
@@ -1,8 +1,8 @@
 using Booking.Configuration;
 using BookingFlight;
+using BookingPassenger;
 using BuildingBlocks.Web;
 using Microsoft.Extensions.DependencyInjection;
-using BookingPassenger;
 
 namespace Booking.Extensions.Infrastructure;
 
diff --git a/2-modular-monolith-architecture-style/src/Modules/Booking/tests/Integration.Test/Booking/Features/CreateBookingTests.cs b/2-modular-monolith-architecture-style/src/Modules/Booking/tests/Integration.Test/Booking/Features/CreateBookingTests.cs
index 2e5559b..669664b 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Booking/tests/Integration.Test/Booking/Features/CreateBookingTests.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Booking/tests/Integration.Test/Booking/Features/CreateBookingTests.cs
@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Api;
 using Booking.Data;
+using BookingFlight;
+using BookingPassenger;
 using BuildingBlocks.Contracts.EventBus.Messages;
 using BuildingBlocks.TestBase;
-using BookingFlight;
 using FluentAssertions;
 using Grpc.Core;
 using Grpc.Core.Testing;
@@ -11,7 +12,6 @@ using Integration.Test.Fakes;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using NSubstitute;
-using BookingPassenger;
 using Xunit;
 using GetByIdRequest = BookingFlight.GetByIdRequest;
 
diff --git a/2-modular-monolith-architecture-style/src/Modules/Booking/tests/Integration.Test/Fakes/FakePassengerResponse.cs b/2-modular-monolith-architecture-style/src/Modules/Booking/tests/Integration.Test/Fakes/FakePassengerResponse.cs
index d105a75..bce13be 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Booking/tests/Integration.Test/Fakes/FakePassengerResponse.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Booking/tests/Integration.Test/Fakes/FakePassengerResponse.cs
@@ -1,7 +1,7 @@
 namespace Integration.Test.Fakes;
 
-using MassTransit;
 using BookingPassenger;
+using MassTransit;
 
 public static class FakePassengerResponse
 {
diff --git a/2-modular-monolith-architecture-style/src/Modules/Identity/tests/Integration.Test/Identity/Features/RegisterNewUserTests.cs b/2-modular-monolith-architecture-style/src/Modules/Identity/tests/Integration.Test/Identity/Features/RegisterNewUserTests.cs
index 15e33ed..e74a528 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Identity/tests/Integration.Test/Identity/Features/RegisterNewUserTests.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Identity/tests/Integration.Test/Identity/Features/RegisterNewUserTests.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
+using Api;
 using BuildingBlocks.Contracts.EventBus.Messages;
 using BuildingBlocks.TestBase;
 using FluentAssertions;
-using Api;
 using Identity.Data;
 using Integration.Test.Fakes;
 using Xunit;
diff --git a/2-modular-monolith-architecture-style/src/Modules/Identity/tests/Integration.Test/IdentityIntegrationTestBase.cs b/2-modular-monolith-architecture-style/src/Modules/Identity/tests/Integration.Test/IdentityIntegrationTestBase.cs
index d13b068..1eb690c 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Identity/tests/Integration.Test/IdentityIntegrationTestBase.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Identity/tests/Integration.Test/IdentityIntegrationTestBase.cs
@@ -1,5 +1,5 @@
-using BuildingBlocks.TestBase;
 using Api;
+using BuildingBlocks.TestBase;
 using Identity.Data;
 using Xunit;
 
diff --git a/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/Passenger/Features/CompleteRegisterPassengerTests.cs b/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/Passenger/Features/CompleteRegisterPassengerTests.cs
index 817b2db..a183018 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/Passenger/Features/CompleteRegisterPassengerTests.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/Passenger/Features/CompleteRegisterPassengerTests.cs
@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
+using Api;
 using BuildingBlocks.Contracts.EventBus.Messages;
 using BuildingBlocks.TestBase;
 using FluentAssertions;
 using Integration.Test.Fakes;
-using Api;
 using Passenger.Data;
 using Xunit;
 
diff --git a/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/Passenger/Features/GetPassengerByIdTests.cs b/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/Passenger/Features/GetPassengerByIdTests.cs
index be66ab6..f2c35ee 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/Passenger/Features/GetPassengerByIdTests.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/Passenger/Features/GetPassengerByIdTests.cs
@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
+using Api;
 using BuildingBlocks.TestBase;
 using FluentAssertions;
 using Integration.Test.Fakes;
 using Passenger;
-using Api;
 using Passenger.Data;
 using Xunit;
 
diff --git a/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/PassengerIntegrationTestBase.cs b/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/PassengerIntegrationTestBase.cs
index 46cb3ae..a67a2fa 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/PassengerIntegrationTestBase.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Passenger/tests/Integration.Test/PassengerIntegrationTestBase.cs
@@ -1,5 +1,5 @@
-using BuildingBlocks.TestBase;
 using Api;
+using BuildingBlocks.TestBase;
 using Passenger.Data;
 using Xunit;