diff --git a/1-monolith-architecture-style/booking.rest b/1-monolith-architecture-style/booking.rest
index 28fb22e..cc20d76 100644
--- a/1-monolith-architecture-style/booking.rest
+++ b/1-monolith-architecture-style/booking.rest
@@ -1,5 +1,5 @@
 
-@booking-monolith-api=https://localhost:5000  
+@booking-monolith-api=https://localhost:4000  
 
 @contentType = application/json
 @flightid = "3c5c0000-97c6-fc34-2eb9-08db322230c9"
@@ -33,7 +33,7 @@ authorization: bearer {{Authenticate.response.body.access_token}}
   "firstName": "John",
   "lastName": "Do",
   "username": "admin",
-  "passportNumber": "412900000",
+  "passportNumber": "41290000",
   "email": "admin@admin.com",
   "password": "Admin@12345",
   "confirmPassword": "Admin@12345"
@@ -196,7 +196,7 @@ Content-Type: application/json
 authorization: bearer {{Authenticate.response.body.access_token}}
 
 {
-  "passportNumber": "412900000000",
+  "passportNumber": "41290000",
   "passengerType": 1,
   "age": 30
 }
diff --git a/1-monolith-architecture-style/src/Api/src/Properties/launchSettings.json b/1-monolith-architecture-style/src/Api/src/Properties/launchSettings.json
index c1dd2d1..4659237 100644
--- a/1-monolith-architecture-style/src/Api/src/Properties/launchSettings.json
+++ b/1-monolith-architecture-style/src/Api/src/Properties/launchSettings.json
@@ -1,28 +1,12 @@
 {
   "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:17191",
-      "sslPort": 44352
-    }
-  },
   "profiles": {
-    "Api": {
+    "Monolith.Api": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchUrl": "swagger",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5000;http://localhost:5001",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
+      "applicationUrl": "https://localhost:4000;http://localhost:4001",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/1-monolith-architecture-style/src/Api/src/appsettings.json b/1-monolith-architecture-style/src/Api/src/appsettings.json
index 2b0fced..0ea70b1 100644
--- a/1-monolith-architecture-style/src/Api/src/appsettings.json
+++ b/1-monolith-architecture-style/src/Api/src/appsettings.json
@@ -27,7 +27,7 @@
         "ConnectionString": "Server=localhost;Port=5432;Database=persist_message;User Id=postgres;Password=postgres;Include Error Detail=true"
     },
     "Jwt": {
-        "Authority": "https://localhost:5000",
+        "Authority": "https://localhost:4000",
         "Audience": "booking-monolith",
         "RequireHttpsMetadata": false
     },
diff --git a/1-monolith-architecture-style/src/BookingMonolith/src/Identity/Data/Seed/InitialData.cs b/1-monolith-architecture-style/src/BookingMonolith/src/Identity/Data/Seed/InitialData.cs
index db056aa..59dc3df 100644
--- a/1-monolith-architecture-style/src/BookingMonolith/src/Identity/Data/Seed/InitialData.cs
+++ b/1-monolith-architecture-style/src/BookingMonolith/src/Identity/Data/Seed/InitialData.cs
@@ -17,7 +17,7 @@ public static class InitialData
                 FirstName = "Sam",
                 LastName = "H",
                 UserName = "samh",
-                PassPortNumber = "123456789",
+                PassPortNumber = "12345678",
                 Email = "sam@test.com",
                 SecurityStamp = Guid.NewGuid().ToString()
             },
@@ -27,7 +27,7 @@ public static class InitialData
                 FirstName = "Sam2",
                 LastName = "H2",
                 UserName = "samh2",
-                PassPortNumber = "987654321",
+                PassPortNumber = "87654321",
                 Email = "sam2@test.com",
                 SecurityStamp = Guid.NewGuid().ToString()
             }
diff --git a/2-modular-monolith-architecture-style/booking.rest b/2-modular-monolith-architecture-style/booking.rest
index 3de3b6c..cb8531b 100644
--- a/2-modular-monolith-architecture-style/booking.rest
+++ b/2-modular-monolith-architecture-style/booking.rest
@@ -1,5 +1,5 @@
 
-@booking-modular-monolith-api=https://localhost:5000  
+@booking-modular-monolith-api=https://localhost:3000  
 
 @contentType = application/json
 @flightid = "3c5c0000-97c6-fc34-2eb9-08db322230c9"
@@ -33,7 +33,7 @@ authorization: bearer {{Authenticate.response.body.access_token}}
   "firstName": "John",
   "lastName": "Do",
   "username": "admin",
-  "passportNumber": "412900000",
+  "passportNumber": "41290000",
   "email": "admin@admin.com",
   "password": "Admin@12345",
   "confirmPassword": "Admin@12345"
@@ -196,7 +196,7 @@ Content-Type: application/json
 authorization: bearer {{Authenticate.response.body.access_token}}
 
 {
-  "passportNumber": "412900000000",
+  "passportNumber": "41290000",
   "passengerType": 1,
   "age": 30
 }
diff --git a/2-modular-monolith-architecture-style/src/Api/src/Properties/launchSettings.json b/2-modular-monolith-architecture-style/src/Api/src/Properties/launchSettings.json
index c1dd2d1..3e641ce 100644
--- a/2-modular-monolith-architecture-style/src/Api/src/Properties/launchSettings.json
+++ b/2-modular-monolith-architecture-style/src/Api/src/Properties/launchSettings.json
@@ -1,28 +1,12 @@
 {
   "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:17191",
-      "sslPort": 44352
-    }
-  },
   "profiles": {
-    "Api": {
+    "Modular.Monolith.Api": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchUrl": "swagger",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5000;http://localhost:5001",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
+      "applicationUrl": "https://localhost:3000;http://localhost:3001",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/2-modular-monolith-architecture-style/src/Api/src/appsettings.json b/2-modular-monolith-architecture-style/src/Api/src/appsettings.json
index 436a3dc..03f56b5 100644
--- a/2-modular-monolith-architecture-style/src/Api/src/appsettings.json
+++ b/2-modular-monolith-architecture-style/src/Api/src/appsettings.json
@@ -26,7 +26,7 @@
         "ConnectionString": "esdb://localhost:2113?tls=false"
     },
     "Jwt": {
-        "Authority": "https://localhost:5000",
+        "Authority": "https://localhost:3000",
         "Audience": "booking-modular-monolith",
         "RequireHttpsMetadata": false
     },
diff --git a/2-modular-monolith-architecture-style/src/Api/src/keys/is-signing-key-296345BF73910ADD1DAC302B848E47E7.json b/2-modular-monolith-architecture-style/src/Api/src/keys/is-signing-key-296345BF73910ADD1DAC302B848E47E7.json
deleted file mode 100644
index cd34668..0000000
--- a/2-modular-monolith-architecture-style/src/Api/src/keys/is-signing-key-296345BF73910ADD1DAC302B848E47E7.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Version":1,"Id":"296345BF73910ADD1DAC302B848E47E7","Created":"2025-04-06T20:57:25.1670058Z","Algorithm":"RS256","IsX509Certificate":false,"Data":"CfDJ8KNpFTgHKl5Nl-o13RQ8rseNpYdUTB-_FLsIGbeu6jM5x9l_rDfygUsYH6TAnyqXDFeW4U7xf8kJXDDvH1V0jkKcQaHFWYcZnKAirRBnuReu2OcaGWcn0vDccI5liTTRfp_Dknwhf3jgrU-LOBlPDoVGWwTwOQHXa4iHQjfOCG77Ey6CmJZ0w6JMi802tSMbpc2G2376b05GuzpoKwfgG_F8ZJcAtl1cql4KD11CcynPTNqK0fXOcIeGCQKgJDkJp_cHlk-sv4xJTFl5nqRx62v9auoB3AeKxqRqKqserGT-ZFYDeSxOlgmDSreVFezZ4tYd80Iq-ZpQXK5e3uz8gJ1B37_ySzgF_Rkscf67FivIqcpcV-WZzvnKXeQP0Wo7B7Qt8sKwCAW-vh3X5iMdDi-tecOWaRqeNrffbjd4efP1FK5wqmNrZirrcuCZDgPyYUiB1bSUE1HSj5vW4kFy_NF-3k0EVcQf5KqJpJ9QkTQgmTPkFCwwEcyX-P2hA21G64_M_7EjZXnjw29xjnkI7zO3mx3sA5bwPf6sCmxgE6joaI6P7G4u8JB5pbSHynOWWNTWRZm8YHngZCfK1DZa6Y-uAnrNzVQdcbB-uVGwszavP3Ohqtu7NBCaIkIhyT9N783n5-J8KAbSKu2FBF-qwNaUcmSAhbnRLyQwou-F0sxgM9iLwNcCo6jcgqz5g3MBEIcWa5IKdbtYXQQzbj3NlKmYg1l-x0SrxZD9403gNIS-zCEWLPEgpLr-NU06_Y5Vkbvn8jHKAr45nDFvY_osVvCPQ8qFuq_P-z3HMqFrfuPNlLrf_ZoJCpIKYNdXPJwHQXzGpz41QiN2omk52K5N8UCiGnDog66tJZAqGjtWWHpFCF2O4LXA9uEwnlD06N_i1T9umOtLnlGsF5SM0G3YjG_G8APqd6GDnJsM1wBoVXzzldGvS8GEwwxvVRGvLrSljPdR_l-8JifzUzhIOxMdlZUE8D9tQJhqZJovm34kfgx8AA0j4FQxAKPUhz99dapc5rmP1pgkuv7b9ZgtWa9js16GUJUYV3Dd6HC3lWU4zdXnQIsJPBUdgsiKptAXayc1KevAzw7o2PB7_auENui4cj1MuDxbaf9yrq9ZIol_tPw5rdN440vhHPIPzVi-1Wv0YyvyPD0fj2GAU5fL97lVlCprWuM71-rjVtARrn0pbf4ENBYk4ABWWke8ZHppbdFQQbjBv-yKCeiGA7qbRAeb_NMK2wmWUGz9DTVWtb04kmitXvg1-aj6ZwY-uIDSY5uaHPz7b8mxFywlSQ9plQzIkb-EfZk6RWxW1-NqyHMEAryM4QxwdDX9LjSo37CPdHCdOSRsMzH6zGH0_SgeN4W25Lk0RhoBHMMQk_gF5FCXjDteFlAdPFw9K5qmVVohHfEnAMDUZ4xYYgDx0Z254jsbSIFOuqEmUvmb5WvbKFtlcLrpFAuoqcNLfI61JM0LLxZNjpktGOMX5q1E_tYm5Y-bxd6W_2r-UUkCTKWJMp7_wr2CJPyegVshEBuUaO4_GyndCTY9_jh4OEYgyFQliEg66g3CUVy7ZBERrfz1CiHmpTqoKbs3toPsHMrB6yaQe9UtcYzLBRP3OVku3WmE1IylfUsZ64YA2DBU399JjYckXlWU3PxH9GAxcnIW8cU_29XZZ0ueGLFeSRP0mBb8TqVIcqd3xoAUbZGPnleme-D44yco8ZSGFVhQqt5qstzIA2DQALjVf2E5vg-yL8Gj9s5q-xjPjBgZgyW23gbBEO6PynDK3jfnucHXcLsHMpvZwyV1yaU3314mNLUpu241_7ukMuWC5FmxaVWqe4n9h-W479YlK5WmI5TDmWcc12DQI92eIAYCSYA60SOJhnuGsyFHwedfxIjVjouZeAWWHj1QOM3uZ1rwYOB0DZSlqI6C2kecv4D2CFq7gYosBxQX9fSnJ2MyUiGOxbdlRtwGB_dtRtlqWpt-acu-l9i5jNwdM6QnNejoPthvWPCcvfaaqFjWjnZQQKSBBfWV9Coe7mnaJYhyqWFUQ4AKcDuboQ3k3jj2p-5LTnbFlTQ3SzLfsgjLjpD5hqIY1ND5NWOT3D0pQumfh5tJxgSa0g-HhW7XBSGs2783OFdgAMuxCkZUgisdu0MRyQzdqWEY30trlpnpsAGOO3E8MMxQ2COy7Y-WrUykioag1qkJTbT-1FgHgw9Qj4dnQ136_tC3BvVrmO6pId26PzdPDpV_4T5vNLoyuiyyUqnHcKOETFrHpbj2cXmi-sYuqrwfNZKfcPIsAkekmcWlLd9s4glvD3xJ0SB0s6gJURjvupdD96l2kfdHw8qieB0ovlGISrpjnAKGn6F81_32rYULB-NDN8H4aTdiVmhvwf6KkpXHA9Euuyyir4BqHmIknr8WWuugIMxRw3ysCS4OIV5ocsjzIfQ9r_15bNWsoyWPDkVnKcS1ffbURzYPNIqTO6Ik5iC7rk705WAxaojy","DataProtected":true}
\ No newline at end of file
diff --git a/2-modular-monolith-architecture-style/src/Api/src/keys/is-signing-key-73D9025BDA857BF270C99C6594EE4246.json b/2-modular-monolith-architecture-style/src/Api/src/keys/is-signing-key-73D9025BDA857BF270C99C6594EE4246.json
deleted file mode 100644
index 5ca82b6..0000000
--- a/2-modular-monolith-architecture-style/src/Api/src/keys/is-signing-key-73D9025BDA857BF270C99C6594EE4246.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Version":1,"Id":"73D9025BDA857BF270C99C6594EE4246","Created":"2024-09-02T18:34:53.8631045Z","Algorithm":"RS256","IsX509Certificate":false,"Data":"CfDJ8MEQ06y_es9CrKY4Ou9Uc7Hf97ujXcMcuawi9V5VrBvxWbAqbdjBlk5zKK_NzrDURTwaFvgOfLUQ__0r-sMvtTXBZLhWhNWJnLn1-KWhtnpvPt5jFTAf2f5mvrjVTTN8E-NTGMGk2yLOYm2TVE3QL7DuLRrazydXLJvIB71O2d_OrAfB7Pq62xrnwLgp4BErb_HphYUExsAEp7jn6uL34QJ5HI6zsb_ct2SHvOl0CzUH2yIjjrY_u-5GAgmqqpUyysGwUh8RpR_CDPCd8ZxgSOiKAlBkp3kQXxf86MF0C-kfBKU-iflrJRSJ1-5R8F5nNPK8FL29I4i7SYCugIkLvqez3wTewPUFv00bTpcfs3V_tmfqBFLyNWm4sppzpU9HGB3elZ0z5bBa_IGbtIrlHC_o4SDSxKKdD4OUZHGLE5X--xWBw5uV9GSgrSH6bcnHZ6rLd3qrt7b82BMr-rVIGyFzGIE6OTLVGkXSL6FdpJ9Lezp06qnZ6DtLFI86lVJGsYIuXR_AIVrz9U8uqCrK6jLwGCk9nR0adPtAUJfgcXGVVTQlvt_YgZv5k5_rYcVl0yLNdgd-BoidXeoqLPJxIJOCohwumVcqTPkf-gB_hjgNk6IEqXZxm0Tzl0d2jpyERDHdHxIvS5o1h4YUfkiMcliRfQMNkLoDxf0H2hFNXRYQKkQ1y6cwS9juq66Uj_-v-vN1etE-hK45ULFCfyppBvb2aTYfTuce5S0ps1t0ZIjvpm7Kvjg3doHEi97N-IqxYaf8r6n8gBcaUwlrfcHaYNPLRyWywX_varEmLm9qGK5KJj2itGNfw0wU0EygIeoV6V_PzqyAkf0JcVTC7lcog37TPdNU2AGzH0S8oXiAQEd49wPs2ZApjiOaiz26efr03I-hD5N91-R2_9ACGjENGPVHMyUtMVV5RPs3-pQMv9f_zweOuLQo7ZfhScqu4HmxGW70amuV4anMxGCQzbi3JWnkTmspptzClJyvE_MJVSTQ6SX04DaS4buSG3wZEc9Qy9SqTj-9CJ7XFGFs8XYmKUj_cIoQF1XuoSnWblsnnEC7EbNRF7y9fG8ZG-Sk3TEEYnalxRrcS-i26wVNdnuUBEmidz_HfsxFxCDKKmx7GHTvHxy72kI84ucMeQeVFjJI3ZDynGn--cL9xBiUbUKM8WDhJ-AgZ76wwh0qAPw5xJ6yHi-15moxySUkvFLjlNkP2Ad5j3_3ab_r6VIunM6zhsq7pSBWIg5povuV5ZwNVZQX0IeLqV9bHug443LaK5a57dTK8wy346AFftV-wc71i4Nt5MIFcOs3lxRPqYij1enbrPYvIV4-N8Sy6aaYj25Qn7VHrGeW72aZPAYY5W-czoPw_Oo6xYGjaPYFFsUSZVg6IQwCzwwAxUoc2gAL33FJQTNvNSnrYBJ5HN-Tqan23Pw_bEus7HHZu2N1daFjqtrl4-oOco46phsppUjH3LGhOPJnFSChr-W8tlk80coJ8IK_AsGludKB09WzId9JBtI5cp3Yu1J7N6nSL7nVTrT6Gw_0hitSoeu5ZLPSS9ooAynAXrvB_s0l0L9aFTRuc5IEhgt4bLzbeqimfQemRlBsNz09JGe04gmOOCmjWD52JHWUiVJQNMavrSGtW9Dy1-Z5h0D_BHzhpTia1S7wx7dSdItJ0-Pm1Au_TNkQGm4ffNFsVDQmNkCYyc8yFnYmZMYYEaPmbw7DvQTs1MHoe7aUzMM0DKcaqboSaxqQK9sxymgElvdoYqOMRWzS7s39UQ1O4TfPngfrWdtN2DogGUtyS-vPfNJpdS6jZvJAj8czgl7PU8buwWyPApE1-FVL32wC6a8dkHvJi4p7fbBjmTfFCnuW8G1KBX3VuToctJvidSjzoSUTX3vgKVni2QW-55Sh7DUYy91FGXGB_ui1yuxEnLmymtbWokcWYkIwcAsl8im70V4oK63ypNSYWea_gaDWMFXT_vANB1iAkr-_zE_ECocOXo93QqSR5UdLmfQFvLiDwjUeovkjFS5C2Z8AjEvHvFkedGWOIK5Bpam-0IEFip3Fvg6RgxwTinFXXa8PiRkcLSlt0J81b85ybrKsDj5WtUA-MFuK2Silyofn9BgD_lh9RU4HPFhVoqey7AuEJjHtGvqz4EnE_05y4A_mKgvJBAs4QiYjCopWtheeOGeeoUa636Ewmu30P66C5mimdAIx36-55xlyJBIM7DFFM6RAGvfAmpyNphjwT0y84B4pOhFEZeOQ2me2sfG-xRJbjjgDhP2SwBBEQ-hCLGeqOD-Xo74FZC4lCTvtn2Sbu1kIw0kz2P_vrq6d6SZwEIrhWYhfRVKTrT8nXj8i48Jdc1d1fyKdRL15USgLhAT-QSNcgVYHRLsVlQx5-b51tGg6Atx6vGCxtXBRSaTwZ3IxbdJs0T62H14K5U81EFu-2Vvf-cMwCm4gCQATxvvAsqToxElou9ZjIVMPt_FQUyAMtJke","DataProtected":true}
\ No newline at end of file
diff --git a/2-modular-monolith-architecture-style/src/Modules/Identity/src/Data/Seed/InitialData.cs b/2-modular-monolith-architecture-style/src/Modules/Identity/src/Data/Seed/InitialData.cs
index e380c82..1ab362b 100644
--- a/2-modular-monolith-architecture-style/src/Modules/Identity/src/Data/Seed/InitialData.cs
+++ b/2-modular-monolith-architecture-style/src/Modules/Identity/src/Data/Seed/InitialData.cs
@@ -19,7 +19,7 @@ public static class InitialData
                 FirstName = "Sam",
                 LastName = "H",
                 UserName = "samh",
-                PassPortNumber = "123456789",
+                PassPortNumber = "12345678",
                 Email = "sam@test.com",
                 SecurityStamp = Guid.NewGuid().ToString()
             },
@@ -29,7 +29,7 @@ public static class InitialData
                 FirstName = "Sam2",
                 LastName = "H2",
                 UserName = "samh2",
-                PassPortNumber = "987654321",
+                PassPortNumber = "87654321",
                 Email = "sam2@test.com",
                 SecurityStamp = Guid.NewGuid().ToString()
             }
diff --git a/3-microservices-architecture-style/booking.rest b/3-microservices-architecture-style/booking.rest
index bac041a..770b283 100644
--- a/3-microservices-architecture-style/booking.rest
+++ b/3-microservices-architecture-style/booking.rest
@@ -30,6 +30,8 @@ grant_type=password
 &username=samh
 &password=Admin@123456
 &scope=flight-api
+
+### change scope base on microservices scope (eg. passenger-api, ...)
 ###
 
 
@@ -45,7 +47,7 @@ authorization: bearer {{Authenticate.response.body.access_token}}
   "firstName": "John",
   "lastName": "Do",
   "username": "admin",
-  "passportNumber": "412900000",
+  "passportNumber": "41290000",
   "email": "admin@admin.com",
   "password": "Admin@12345",
   "confirmPassword": "Admin@12345"
@@ -218,7 +220,7 @@ Content-Type: application/json
 authorization: bearer {{Authenticate.response.body.access_token}}
 
 {
-  "passportNumber": "412900000000",
+  "passportNumber": "41290000",
   "passengerType": 1,
   "age": 30
 }
diff --git a/3-microservices-architecture-style/src/ApiGateway/src/Properties/launchSettings.json b/3-microservices-architecture-style/src/ApiGateway/src/Properties/launchSettings.json
index 1d3fb54..9ac3bd0 100644
--- a/3-microservices-architecture-style/src/ApiGateway/src/Properties/launchSettings.json
+++ b/3-microservices-architecture-style/src/ApiGateway/src/Properties/launchSettings.json
@@ -1,13 +1,5 @@
 {
   "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:17191",
-      "sslPort": 44352
-    }
-  },
   "profiles": {
     "ApiGateway": {
       "commandName": "Project",
@@ -17,14 +9,6 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
     }
   }
 }
diff --git a/3-microservices-architecture-style/src/Services/Booking/src/Booking.Api/Properties/launchSettings.json b/3-microservices-architecture-style/src/Services/Booking/src/Booking.Api/Properties/launchSettings.json
index e0b6c04..78f3fac 100644
--- a/3-microservices-architecture-style/src/Services/Booking/src/Booking.Api/Properties/launchSettings.json
+++ b/3-microservices-architecture-style/src/Services/Booking/src/Booking.Api/Properties/launchSettings.json
@@ -1,25 +1,15 @@
 {
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:6010",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:5010",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+    "$schema": "https://json.schemastore.org/launchsettings.json",
+    "profiles": {
+        "Booking.Api": {
+            "commandName": "Project",
+            "dotnetRunMessages": true,
+            "launchUrl": "swagger",
+            "launchBrowser": true,
+            "applicationUrl": "http://localhost:6010;https://localhost:5010",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            }
+        }
     }
-  }
 }
diff --git a/3-microservices-architecture-style/src/Services/Flight/src/Flight.Api/Properties/launchSettings.json b/3-microservices-architecture-style/src/Services/Flight/src/Flight.Api/Properties/launchSettings.json
index d73af91..d227a8b 100644
--- a/3-microservices-architecture-style/src/Services/Flight/src/Flight.Api/Properties/launchSettings.json
+++ b/3-microservices-architecture-style/src/Services/Flight/src/Flight.Api/Properties/launchSettings.json
@@ -1,27 +1,15 @@
 {
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5004",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:5003",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+    "$schema": "https://json.schemastore.org/launchsettings.json",
+    "profiles": {
+        "Flight.Api": {
+            "commandName": "Project",
+            "dotnetRunMessages": true,
+            "launchUrl": "swagger",
+            "launchBrowser": true,
+            "applicationUrl": "http://localhost:5004;https://localhost:5003",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            }
+        }
     }
-  }
 }
-
-
diff --git a/3-microservices-architecture-style/src/Services/Identity/src/Identity.Api/Properties/launchSettings.json b/3-microservices-architecture-style/src/Services/Identity/src/Identity.Api/Properties/launchSettings.json
index d3906bc..36f5b8f 100644
--- a/3-microservices-architecture-style/src/Services/Identity/src/Identity.Api/Properties/launchSettings.json
+++ b/3-microservices-architecture-style/src/Services/Identity/src/Identity.Api/Properties/launchSettings.json
@@ -1,33 +1,15 @@
 {
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:42478",
-      "sslPort": 44342
+    "$schema": "https://json.schemastore.org/launchsettings.json",
+    "profiles": {
+        "Identity.Api": {
+            "commandName": "Project",
+            "dotnetRunMessages": true,
+            "launchUrl": "swagger",
+            "launchBrowser": true,
+            "applicationUrl": "http://localhost:6005;https://localhost:5005",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            }
+        }
     }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:6005",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:5005",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
 }
diff --git a/3-microservices-architecture-style/src/Services/Identity/src/Identity.Api/keys/is-signing-key-B3C31EEE2718D3C5004C6E85AD74F26C.json b/3-microservices-architecture-style/src/Services/Identity/src/Identity.Api/keys/is-signing-key-B3C31EEE2718D3C5004C6E85AD74F26C.json
new file mode 100644
index 0000000..0616cdf
--- /dev/null
+++ b/3-microservices-architecture-style/src/Services/Identity/src/Identity.Api/keys/is-signing-key-B3C31EEE2718D3C5004C6E85AD74F26C.json
@@ -0,0 +1 @@
+{"Version":1,"Id":"B3C31EEE2718D3C5004C6E85AD74F26C","Created":"2025-04-08T16:45:11.9802139Z","Algorithm":"RS256","IsX509Certificate":false,"Data":"CfDJ8KNpFTgHKl5Nl-o13RQ8rse7iqNX7fzIuFQawPXYLwTCbj1HOrmv2WHbV51cOwFkSjECACMh5ad32vYQMXHgU7-l9gMNU0QwhV5gdoDScJLFzFf-_gBCqNPsUWJxNebIFDHwSn12y9Kg56DzaRq9o4XO_wGEc3KsQjDjHuh0p-3n8qiliIxl_sBXTs8UCXhWMBqU5srioHUKwFu6nyAlhkDlsA9J6Syb9w6_WESzli6DpR9UphBKbjoV85ajrkuZzjd9GItRJ6C-OICEKUUoFXh5meVGuV-JmWhE1_nzASToml0vI6GZt8kxrJQkICt1MI7K2ZIQtHcoKhC09rWu7RpuOvKY8sLm0b8gbJQ1dVMNuZEnOczi-E3b6kKrYFwV_I3TFK4UZP7I90-cojBGpaWwX3IzkB8-Uwf-5qU2KXUZanO0tXEqw187ZVPDuvKkAUeAtphWFbV2ZNH12DGcXTvnvJfRxV5lRAuzH3N-Dhgz10F3VOQZtgoQyQ4wJE-B-04j3pqN_76NIh4Yx7GvArlWYMQTNBePMaLW33ycLlCrjov1nKK2BIhk4wykUeFT_rorXcf01PHJd3uqbtBDrP7ZoUqz8qWdY9-on3dvNi6cruyJ5rbmmE4hLAsWHLOqYLcceBF7LaZUthglcMtLlufU5C3wpXjoqpJZb1KiC7QR5sQE_KPfEiQsCO_hyXnFUvavOaGIiWWAhqADfGdD3wNma3qCAMwmV5T-_4_yW3wvYbrM8YFrHmQty6ks4W6qKJow1uwfAziDoobdV7bSLSxddWiO5zOuCeFNxIzsmMkk8PfxUyb-JySYFh_tA8D3Tn5kvTbFIRibfiBJXtB8Kk4ouvQxd6ydHCHOAHzuPgxs_nP6s3u0Xa12fmPpiCLaUjeNFHNP_wzh4l5Tn7GN4S07nOiFE1PyQUjT7xnYxcUuzySpiqLl2k9Bu98MMagGg6gqWnl5zV_Adxkq_aIvuvZF25JlE9SzAJkuJFBNqnXJ_ep-BCFogdHPgtjL_Y250A5DsiFnKrlJLuBIz88V_oLEj54iSi4hiJ66YT0H8lagPUIrL4h6cPCVWFeMiCf8yNeQVHCnRkIyXtID4CrSOr8KN5Qv_nKeAUxw_5BOgs5yEGxj4OGLLYViAobOCFOA1uCurA3OqyoI65CCyoPERAXm7dyKcIN8l0ChIHhCX2VBtwEoSG2QXlEjKLxmmMmHQrTuMMRNkd2_GlY6XNRw6MELf7W4SrxyZ-eWNY9nfye7z9Q-hv_dDkf5FGmd8qGpVUenIjH0GUz4JqWOQ6GmHb7b_9u5g5vNIqi5YHf59SuNGAUbE3PFpDGpIeh5YVrCV-msoaUEkYxXvsBcUsOIiC32kQy-u-fDPxYSg-aNCgBrKDnTK4IFFBNYjT1IIApIiz-Xq8mjTsJvgaYKOLsVfqPlWX_Fr63Fnnygt9zO1tNZjW6JSj34nZJ_6120mGZcNueXtUy66QJeF8DqVdt4DbXMWYk-rQcHvqk3lQ_r7u7r88hIwzXgE3YtFFlesUK_7DVcblSuTxNxDXO5M7U_2EO4KIJbDfQ6BYxovJrWwtPcSXb_Nq25St_X3wSMk3eSGO7GNHL89t_muN5tE97As0s89h8OM5cISROR72zLWyvki2aB4L5WFWpBg1xylymZBzWGF-VKbDpoIb09PsyuuWy502OONDxmsheeadUZCNZYlxiSkmGLXrjSgsAhQHmLr7BwZ2FmVJGHtWD-nUPMj32NljxYQ1Bzv0aYXmJhHT8lcmTcWxb8yQKhOk-S6oP7m3ftq-gzsmE4lATEAHFGtO9a_xJlNYivB0zMsOYfY7YJzRSYEgLCSxS4HiUysv3WYXYjAQaGJNoSJX1YMMvCDu1rt29oV17Td58wHWvnnsCFlckVah6y_DCfez9ucTpQPHsQMsW1Hwl-3xgndEyTuynTHZNgqCcxQWBFlo1Ay9HHl68ppFpxm7FvSScyTdjtMPD89qZ84P_V38Qlz9ye0J2LXWoH1np7jAnaRiEzc-_Dcra3Yv792ks_ZlLS3Tu9-m-iZiGILHxIaccR53BSbjjgKS7LXMPsWZ_kf4pBNspcIbnn1dm_L47sEKCeA_2J0BVQeG_x7ZXG38M100wreTadW_PE5WysYyFIbHy5_wvfVVIEPZ3cMFt66LjoFfAmn52kQUG2w65Nnr95bavMBNdKk9oo22QpRy3YJsrABp9DtUqh4CwCqZCu7KvD2yx5u6UKAOK-XWlU1UJ-dPxxcuoPsjeuG1ER8ySYexec7iXzg-tbKjeGGSnyj2z1fnTihIiQIw_CAiZwXuyD4e0zowAmjEF2RWRsWvacoU7n_TCFwx4dX5bEG41-J2KHGJVX1X9D2tBX7R963ICgP8xeoE5wxWEiQLrsED68PKsnMasLGW2oOtLR8DwERbydMYHRH2f63mexVE5gbdf_4UXpaYMC8bNUc3HWY3-Sb_Fbc46r","DataProtected":true}
\ No newline at end of file
diff --git a/3-microservices-architecture-style/src/Services/Identity/src/Identity/Data/Seed/InitialData.cs b/3-microservices-architecture-style/src/Services/Identity/src/Identity/Data/Seed/InitialData.cs
index e380c82..1ab362b 100644
--- a/3-microservices-architecture-style/src/Services/Identity/src/Identity/Data/Seed/InitialData.cs
+++ b/3-microservices-architecture-style/src/Services/Identity/src/Identity/Data/Seed/InitialData.cs
@@ -19,7 +19,7 @@ public static class InitialData
                 FirstName = "Sam",
                 LastName = "H",
                 UserName = "samh",
-                PassPortNumber = "123456789",
+                PassPortNumber = "12345678",
                 Email = "sam@test.com",
                 SecurityStamp = Guid.NewGuid().ToString()
             },
@@ -29,7 +29,7 @@ public static class InitialData
                 FirstName = "Sam2",
                 LastName = "H2",
                 UserName = "samh2",
-                PassPortNumber = "987654321",
+                PassPortNumber = "87654321",
                 Email = "sam2@test.com",
                 SecurityStamp = Guid.NewGuid().ToString()
             }
diff --git a/3-microservices-architecture-style/src/Services/Passenger/src/Passenger.Api/Properties/launchSettings.json b/3-microservices-architecture-style/src/Services/Passenger/src/Passenger.Api/Properties/launchSettings.json
index 3093a24..0b36576 100644
--- a/3-microservices-architecture-style/src/Services/Passenger/src/Passenger.Api/Properties/launchSettings.json
+++ b/3-microservices-architecture-style/src/Services/Passenger/src/Passenger.Api/Properties/launchSettings.json
@@ -1,25 +1,16 @@
 {
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:6012",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:5012",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+    "$schema": "https://json.schemastore.org/launchsettings.json",
+    "profiles": {
+        "Passenger.Api": {
+            "commandName": "Project",
+            "dotnetRunMessages": true,
+            "launchUrl": "swagger",
+            "launchBrowser": true,
+            "applicationUrl": "http://localhost:6012;https://localhost:5012",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            }
+        }
     }
-  }
 }
+