diff --git a/deployments/docker-compose/docker-compose.yaml b/deployments/docker-compose/docker-compose.yaml
index e2f1632..8d1381e 100644
--- a/deployments/docker-compose/docker-compose.yaml
+++ b/deployments/docker-compose/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
       - "5001:80"
       - "5000:443"
     depends_on:
-      - db
+      - sql
       - rabbitmq
       - jaeger
       - elasticsearch
@@ -47,7 +47,7 @@ services:
       - 5004:80
       - 5003:443
     depends_on:
-      - db
+      - sql
       - rabbitmq
       - jaeger
       - elasticsearch
@@ -79,7 +79,7 @@ services:
       - 6005:80
       - 5005:443
     depends_on:
-      - db
+      - sql
       - rabbitmq
       - jaeger
       - elasticsearch
@@ -110,7 +110,7 @@ services:
       - 6012:80
       - 5012:443
     depends_on:
-      - db
+      - sql
       - rabbitmq
       - jaeger
       - elasticsearch
@@ -142,10 +142,10 @@ services:
       - 6010:80
       - 5010:443
     depends_on:
-      - db
+      - sql
       - rabbitmq
       - jaeger
-      - eventstore.db
+      - eventstore
       - elasticsearch
       - kibana
       - mongo
@@ -163,8 +163,8 @@ services:
     #######################################################
     #  SqlServer
     #######################################################
-  db:
-    container_name: sqldb
+  sql:
+    container_name: sql
     image: mcr.microsoft.com/mssql/server:2022-latest
     restart: unless-stopped
     ports:
@@ -196,8 +196,8 @@ services:
     #  Rabbitmq
     #######################################################
   rabbitmq:
-    image: rabbitmq:3-management
     container_name: rabbitmq
+    image: rabbitmq:3-management
     restart: unless-stopped
     ports:
       - 5672:5672
@@ -228,7 +228,8 @@ services:
     #######################################################
     #  EventStoreDB
     #######################################################
-  eventstore.db:
+  eventstore:
+    container_name: eventstore
     image: eventstore/eventstore:21.2.0-buster-slim
     restart: on-failure
     environment:
@@ -251,7 +252,7 @@ services:
     #  Mongo
     #######################################################
   mongo:
-    image: mongo:4
+    image: mongo:5
     container_name: mongo
     restart: unless-stopped
     # environment:
@@ -261,9 +262,6 @@ services:
       - booking
     ports:
       - 27017:27017
-    volumes:
-      - mongo:/data/db
-
 
     #######################################################
     #  Elastic Search
@@ -310,8 +308,6 @@ networks:
 volumes:
   db-data:
     external: false
-  mongo:
-    driver: local
   elasticsearch-data:
 
 
diff --git a/deployments/docker-compose/infrastracture.yaml b/deployments/docker-compose/infrastracture.yaml
index 2558920..f14c7d0 100644
--- a/deployments/docker-compose/infrastracture.yaml
+++ b/deployments/docker-compose/infrastracture.yaml
@@ -5,8 +5,8 @@ services:
     #  Rabbitmq
     #######################################################
   rabbitmq:
-    image: rabbitmq:3-management
     container_name: rabbitmq
+    image: rabbitmq:3-management
     restart: unless-stopped
     ports:
       - 5672:5672
@@ -18,8 +18,8 @@ services:
     #######################################################
     #  SqlServer
     #######################################################
-  db:
-    container_name: sqldb
+  sql:
+    container_name: sql
     image: mcr.microsoft.com/mssql/server:2022-latest
     restart: unless-stopped
     ports:
@@ -50,8 +50,8 @@ services:
     #  Jaeger
     #######################################################
   jaeger:
-    image: jaegertracing/all-in-one
     container_name: jaeger
+    image: jaegertracing/all-in-one
     restart: unless-stopped
     networks:
       - booking
@@ -68,7 +68,8 @@ services:
     #######################################################
     #  EventStoreDB
     #######################################################
-  eventstore.db:
+  eventstore:
+      container_name: eventstore
       image: eventstore/eventstore:21.2.0-buster-slim
       restart: on-failure
       environment:
@@ -91,7 +92,7 @@ services:
     #  Mongo
     #######################################################
   mongo:
-    image: mongo:4
+    image: mongo:5
     container_name: mongo
     restart: unless-stopped
     # environment:
@@ -101,8 +102,6 @@ services:
       - booking
     ports:
       - 27017:27017
-    volumes:
-      - mongo:/data/db
 
 
     #######################################################
@@ -162,8 +161,6 @@ networks:
 volumes:
   db-data:
     external: false
-  mongo:
-    driver: local
   elasticsearch-data:
 
 
diff --git a/src/BuildingBlocks/PersistMessageProcessor/Data/DesignTimeDbContextFactory.cs b/src/BuildingBlocks/PersistMessageProcessor/Data/DesignTimeDbContextFactory.cs
index 91a4279..6d0ae2f 100644
--- a/src/BuildingBlocks/PersistMessageProcessor/Data/DesignTimeDbContextFactory.cs
+++ b/src/BuildingBlocks/PersistMessageProcessor/Data/DesignTimeDbContextFactory.cs
@@ -9,8 +9,7 @@ public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<PersistMes
     {
         var builder = new DbContextOptionsBuilder<PersistMessageDbContext>();
 
-        builder.UseSqlServer(
-            "Data Source=.\\sqlexpress;Initial Catalog=PersistMessageDB;Persist Security Info=False;Integrated Security=SSPI;TrustServerCertificate=True");
+        builder.UseSqlServer("Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True");
         return new PersistMessageDbContext(builder.Options);
     }
 }
diff --git a/src/BuildingBlocks/TestBase/TestContainers.cs b/src/BuildingBlocks/TestBase/TestContainers.cs
index 19ef810..72826ed 100644
--- a/src/BuildingBlocks/TestBase/TestContainers.cs
+++ b/src/BuildingBlocks/TestBase/TestContainers.cs
@@ -48,7 +48,7 @@ public static class TestContainers
             Username = Guid.NewGuid().ToString("D"),
             Password = Guid.NewGuid().ToString("D"),
         })
-        .WithImage("mongo:4")
+        .WithImage("mongo:5")
         .WithCleanUp(true)
         .Build();
 
diff --git a/src/Services/Booking/src/Booking.Api/appsettings.docker.json b/src/Services/Booking/src/Booking.Api/appsettings.docker.json
index 06769cf..1c95bd3 100644
--- a/src/Services/Booking/src/Booking.Api/appsettings.docker.json
+++ b/src/Services/Booking/src/Booking.Api/appsettings.docker.json
@@ -9,7 +9,7 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=db;Database=PersistMessageDB;User ID=sa;Password=@Aa123456"
+    "ConnectionString": "Server=sql;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "RabbitMqOptions": {
     "HostName": "rabbitmq",
diff --git a/src/Services/Booking/src/Booking.Api/appsettings.json b/src/Services/Booking/src/Booking.Api/appsettings.json
index f034e8b..da3ee97 100644
--- a/src/Services/Booking/src/Booking.Api/appsettings.json
+++ b/src/Services/Booking/src/Booking.Api/appsettings.json
@@ -49,7 +49,7 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "AllowedHosts": "*"
 }
diff --git a/src/Services/Booking/src/Booking.Api/appsettings.test.json b/src/Services/Booking/src/Booking.Api/appsettings.test.json
index cb72535..088abe0 100644
--- a/src/Services/Booking/src/Booking.Api/appsettings.test.json
+++ b/src/Services/Booking/src/Booking.Api/appsettings.test.json
@@ -24,6 +24,6 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Database=PersistMessageDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   }
 }
diff --git a/src/Services/Flight/src/Flight.Api/appsettings.docker.json b/src/Services/Flight/src/Flight.Api/appsettings.docker.json
index 3e97e65..bfc897b 100644
--- a/src/Services/Flight/src/Flight.Api/appsettings.docker.json
+++ b/src/Services/Flight/src/Flight.Api/appsettings.docker.json
@@ -7,7 +7,7 @@
     }
   },
   "DatabaseOptions": {
-    "DefaultConnection": "Server=db;Database=FlightDB;User ID=sa;Password=@Aa123456"
+    "DefaultConnection": "Server=sql;Database=FlightDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "Jwt": {
     "Authority": "https://localhost:5005",
@@ -23,7 +23,7 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=db;Database=PersistMessageDB;User ID=sa;Password=@Aa123456"
+    "ConnectionString": "Server=sql;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "AllowedHosts": "*"
 }
diff --git a/src/Services/Flight/src/Flight.Api/appsettings.json b/src/Services/Flight/src/Flight.Api/appsettings.json
index e66bb16..43ca496 100644
--- a/src/Services/Flight/src/Flight.Api/appsettings.json
+++ b/src/Services/Flight/src/Flight.Api/appsettings.json
@@ -22,7 +22,7 @@
     }
   },
   "DatabaseOptions": {
-    "DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "DefaultConnection": "Server=localhost;Database=FlightDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "MongoOptions": {
     "ConnectionString": "mongodb://localhost:27017",
@@ -42,7 +42,7 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "HealthOptions": {
     "Enabled": false
diff --git a/src/Services/Flight/src/Flight.Api/appsettings.test.json b/src/Services/Flight/src/Flight.Api/appsettings.test.json
index c78fbb4..d1d3a72 100644
--- a/src/Services/Flight/src/Flight.Api/appsettings.test.json
+++ b/src/Services/Flight/src/Flight.Api/appsettings.test.json
@@ -1,6 +1,6 @@
 {
   "DatabaseOptions": {
-    "DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "DefaultConnection": "Server=localhost;Database=FlightDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "RabbitMqOptions": {
     "HostName": "localhost",
@@ -20,6 +20,6 @@
   "PersistMessageOptions": {
     "Interval": 2,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Database=PersistMessageDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   }
 }
diff --git a/src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs b/src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs
index bc85b4c..3c9559b 100644
--- a/src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs
+++ b/src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs
@@ -9,7 +9,7 @@ namespace Flight.Data
         {
             var builder = new DbContextOptionsBuilder<FlightDbContext>();
 
-            builder.UseSqlServer("Data Source=.\\sqlexpress;Initial Catalog=FlightDB;Persist Security Info=False;Integrated Security=SSPI;TrustServerCertificate=True");
+            builder.UseSqlServer("Server=localhost;Database=FlightDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True");
             return new FlightDbContext(builder.Options, null);
         }
     }
diff --git a/src/Services/Identity/src/Identity.Api/appsettings.docker.json b/src/Services/Identity/src/Identity.Api/appsettings.docker.json
index f05529b..5243321 100644
--- a/src/Services/Identity/src/Identity.Api/appsettings.docker.json
+++ b/src/Services/Identity/src/Identity.Api/appsettings.docker.json
@@ -1,12 +1,12 @@
 {
   "App": "Identity-Service",
   "DatabaseOptions": {
-    "DefaultConnection": "Server=db;Database=IdentityDB;User ID=sa;Password=@Aa123456"
+    "DefaultConnection": "Server=sql;Database=IdentityDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=db;Database=PersistMessageDB;User ID=sa;Password=@Aa123456"
+    "ConnectionString": "Server=sql;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "RabbitMqOptions": {
     "HostName": "rabbitmq",
diff --git a/src/Services/Identity/src/Identity.Api/appsettings.json b/src/Services/Identity/src/Identity.Api/appsettings.json
index da83ed8..894d814 100644
--- a/src/Services/Identity/src/Identity.Api/appsettings.json
+++ b/src/Services/Identity/src/Identity.Api/appsettings.json
@@ -3,7 +3,7 @@
     "Name": "Identity-Service"
   },
   "DatabaseOptions": {
-    "DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "DefaultConnection": "Server=localhost;Database=IdentityDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "RabbitMqOptions": {
     "HostName": "localhost",
@@ -41,7 +41,7 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "AllowedHosts": "*"
 }
diff --git a/src/Services/Identity/src/Identity.Api/appsettings.test.json b/src/Services/Identity/src/Identity.Api/appsettings.test.json
index 08307a2..3d40033 100644
--- a/src/Services/Identity/src/Identity.Api/appsettings.test.json
+++ b/src/Services/Identity/src/Identity.Api/appsettings.test.json
@@ -1,6 +1,6 @@
 {
   "DatabaseOptions": {
-    "DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "DefaultConnection": "Server=localhost;Database=IdentityDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "RabbitMqOptions": {
     "HostName": "localhost",
@@ -20,6 +20,6 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Database=PersistMessageDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   }
 }
diff --git a/src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs b/src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs
index 007590a..f7dc16a 100644
--- a/src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs
+++ b/src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs
@@ -9,7 +9,7 @@ public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<IdentityCo
     {
         var builder = new DbContextOptionsBuilder<IdentityContext>();
 
-        builder.UseSqlServer("Server=.\\sqlexpress;Database=IdentityDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True");
+        builder.UseSqlServer("Server=localhost;Database=IdentityDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True");
         return new IdentityContext(builder.Options, null);
     }
 }
diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json b/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json
index 2af01bc..d76441c 100644
--- a/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json
+++ b/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json
@@ -1,12 +1,13 @@
 {
   "App": "Passenger-Service",
   "DatabaseOptions": {
-    "DefaultConnection": "Server=db;Database=PassengerDB;User ID=sa;Password=@Aa123456"
+
+    "DefaultConnection": "Server=sql;Database=PassengerDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=db;Database=PersistMessageDB;User ID=sa;Password=@Aa123456"
+    "ConnectionString": "Server=sql;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "Jwt": {
     "Authority": "https://localhost:5005",
diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.json b/src/Services/Passenger/src/Passenger.Api/appsettings.json
index bfbb06d..8099f02 100644
--- a/src/Services/Passenger/src/Passenger.Api/appsettings.json
+++ b/src/Services/Passenger/src/Passenger.Api/appsettings.json
@@ -3,7 +3,7 @@
     "Name": "Passenger-Service"
   },
   "DatabaseOptions": {
-    "DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "DefaultConnection": "Server=localhost;Database=PassengerDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "MongoOptions": {
     "ConnectionString": "mongodb://localhost:27017",
@@ -45,7 +45,7 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "AllowedHosts": "*"
 }
diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.test.json b/src/Services/Passenger/src/Passenger.Api/appsettings.test.json
index 194eb82..71ea34c 100644
--- a/src/Services/Passenger/src/Passenger.Api/appsettings.test.json
+++ b/src/Services/Passenger/src/Passenger.Api/appsettings.test.json
@@ -1,6 +1,6 @@
 {
   "DatabaseOptions": {
-    "DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "DefaultConnection": "Server=localhost;Database=PassengerDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   },
   "RabbitMqOptions": {
     "HostName": "localhost",
@@ -20,6 +20,6 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Database=PersistMessageDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
   }
 }
diff --git a/src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs b/src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs
index e875be8..950e3c2 100644
--- a/src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs
+++ b/src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs
@@ -9,8 +9,7 @@ public class DesignTimeDbContextFactory: IDesignTimeDbContextFactory<PassengerDb
     {
         var builder = new DbContextOptionsBuilder<PassengerDbContext>();
 
-        builder.UseSqlServer(
-            "Data Source=.\\sqlexpress;Initial Catalog=PassengerDB;Persist Security Info=False;Integrated Security=SSPI;TrustServerCertificate=True");
+        builder.UseSqlServer("Server=localhost;Database=PassengerDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True");
         return new PassengerDbContext(builder.Options, null);
     }
 }