diff --git a/.env b/.env
index c15e04b3edaa6bb59572efc0d419059f9fc6241a..f3c6ff9e302190a65a627bbe186d24880f7601bb 100644
--- a/.env
+++ b/.env
@@ -4,20 +4,22 @@ MYSQL_IMAGE_TAG=8.0
 
 
 # Database configuration
-#DB_PORT=3307
-#DB_NAME=myDB
-#DB_USER=user
-#DB_PASSWORD=user
-#DB_CHARSET=utf8mb4
-
-DB_PORT=3308
-DB_NAME=AspNetCoreDb
-DB_USER=root
-DB_PASSWORD=
+DB_PORT=3307
+DB_NAME=myDB
+DB_USER=user
+DB_PASSWORD=user
 DB_CHARSET=utf8mb4
 
+# Keeping these for dev perposes, will remove at the end
+#DB_PORT=3308
+#DB_NAME=AspNetCoreDb
+#DB_USER=root
+#DB_PASSWORD=
+#DB_CHARSET=utf8mb4
+
 # Service ports
 USER_MICROSERVICE_PORT=5089
 FLIGHT_MICROSERVICE_PORT=5175
 GATEWAY_API_PORT=5267
-CLIENT_PORT=4200
\ No newline at end of file
+BOOKING_MICROSERVICE_PORT=5207
+CLIENT_PORT=4200
diff --git a/GatewayAPI/appsettings.json b/GatewayAPI/appsettings.json
index f0c8836097302b9aad3a4302088f49f88bc4e46a..a5a7960c6015131a93db0f6f52bdbb4192f56f45 100644
--- a/GatewayAPI/appsettings.json
+++ b/GatewayAPI/appsettings.json
@@ -11,5 +11,8 @@
   },
   "FlightMicroservice": {
     "BaseUrl": "http://localhost:5175"
+  },
+  "BookingMicroservice": {
+    "BaseUrl": "http://localhost:5207"
   }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index ac1f7f9e747fcc7acf4ed65b276c6a5e22279072..1826cc11fca902bbd9de45380c217e0efca0c9be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,6 +28,21 @@ services:
       - Jwt__Issuer=http://usermicroservice:8080
       - Jwt__Audience=http://usermicroservice:8080
 
+  bookingmicroservice:
+    build:
+      context: ./BookingMicroservice
+    image: bookingmicroservice:${IMAGE_TAG}
+    ports:
+      - "${BOOKING_MICROSERVICE_PORT}:8080"
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Production
+      - DOTNET_RUNNING_IN_CONTAINER=true
+      - ConnectionStrings__DefaultConnection=Server=host.docker.internal;Port=${DB_PORT};Database=${DB_NAME};User=${DB_USER};Password=${DB_PASSWORD};CharSet=${DB_CHARSET}
+      - Jwt__Key=0QTrd3jToEYj205k01A2R87Hc5YpqDNeywg7JzQpczs=
+      - Jwt__Issuer=http://usermicroservice:8080
+      - Jwt__Audience=http://usermicroservice:8080
+      - FlightMicroservice__BaseUrl=http://flightmicroservice:8080
+
   gatewayapi:
     build:
       context: ./GatewayAPI
@@ -39,6 +54,7 @@ services:
       - DOTNET_RUNNING_IN_CONTAINER=true
       - UserMicroservice__BaseUrl=http://usermicroservice:8080
       - FlightMicroservice__BaseUrl=http://flightmicroservice:8080
+      - BookingMicroservice__BaseUrl=http://bookingmicroservice:8080
 
   client:
     build:
@@ -47,16 +63,16 @@ services:
     ports:
       - "${CLIENT_PORT}:4200"
 
-  # db:
-  #   image: mysql:${MYSQL_IMAGE_TAG}
-  #   command: --default-authentication-plugin=mysql_native_password
-  #   restart: always
-  #   environment:
-  #     MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
-  #     MYSQL_DATABASE: ${DB_NAME}
-  #     MYSQL_USER: ${DB_USER}
-  #     MYSQL_PASSWORD: ${DB_PASSWORD}
-  #   volumes:
-  #     - ./Database:/docker-entrypoint-initdb.d
-  #   ports:
-  #     - "${DB_PORT}:3306"
+  db:
+    image: mysql:${MYSQL_IMAGE_TAG}
+    command: --default-authentication-plugin=mysql_native_password
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
+      MYSQL_DATABASE: ${DB_NAME}
+      MYSQL_USER: ${DB_USER}
+      MYSQL_PASSWORD: ${DB_PASSWORD}
+    volumes:
+      - ./Database:/docker-entrypoint-initdb.d
+    ports:
+      - "${DB_PORT}:3306"