diff --git a/docker/nginx/devstore.conf b/docker/nginx/devstore.conf
index dff369e..5dd7131 100644
--- a/docker/nginx/devstore.conf
+++ b/docker/nginx/devstore.conf
@@ -11,7 +11,7 @@ server {
     server_name $hostname;
 
     location /status {
-        rewrite ^/status(.*)$ http://localhost:7510/status$1 redirect;
+        rewrite ^/status(.*)$ http://localhost:7510/$1 redirect;
     }
     location / {
         proxy_pass http://web-mvc;
@@ -40,7 +40,7 @@ server {
     ssl_certificate /etc/nginx/nerdstore-certificate.pem;
     ssl_certificate_key /etc/nginx/nerdstore-certificate.key;
     location /status {
-        rewrite ^/status(.*)$ https://localhost:7511/status$1 redirect;
+        rewrite ^/status(.*)$ https://localhost:7511/$1 redirect;
     }
     location / {
         proxy_pass http://web-mvc;
diff --git a/src/api-gateways/DevStore.Bff.Checkout/appsettings.Production.json b/src/api-gateways/DevStore.Bff.Checkout/appsettings.Production.json
index 03fb20e..65b85d4 100644
--- a/src/api-gateways/DevStore.Bff.Checkout/appsettings.Production.json
+++ b/src/api-gateways/DevStore.Bff.Checkout/appsettings.Production.json
@@ -23,17 +23,17 @@
     }
   },
   
-  "ShoppingCartUrl": "https://devstore-api-cart",
-  "CatalogUrl": "https://devstore-api-catalog",
-  "CustomerUrl": "https://devstore-api-customers",
-  "PaymentUrl": "https://devstore-api-billing",
-  "OrderUrl": "https://devstore-api-order",
+  "ShoppingCartUrl": "https://api-cart",
+  "CatalogUrl": "https://api-catalog",
+  "CustomerUrl": "https://api-customers",
+  "PaymentUrl": "https://api-billing",
+  "OrderUrl": "https://api-order",
 
   "MessageQueueConnection": {
     "MessageBus": "host=devstore-rabbit:5672;publisherConfirms=true;timeout=30;username=devstore;password=devstore"
   },
   "AppSettings": {
-    "JwksUri": "https://devstore-api-identity/jwks",
+    "JwksUri": "https://api-identity/jwks",
     "Issuer": "https://devstore.academy",
     "Audience": "DevStore"
   }
diff --git a/src/building-blocks/DevStore.WebAPI.Core/Configuration/GenericHealthCheck.cs b/src/building-blocks/DevStore.WebAPI.Core/Configuration/GenericHealthCheck.cs
index f565b6d..cd905ad 100644
--- a/src/building-blocks/DevStore.WebAPI.Core/Configuration/GenericHealthCheck.cs
+++ b/src/building-blocks/DevStore.WebAPI.Core/Configuration/GenericHealthCheck.cs
@@ -1,8 +1,6 @@
 using DevStore.Core.Utils;
 using DevStore.WebAPI.Core.DatabaseFlavor;
 using EasyNetQ;
-using EasyNetQ.ConnectionString;
-using HealthChecks.RabbitMQ;
 using HealthChecks.UI.Client;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
diff --git a/src/web/DevStore.WebApp.Status/Program.cs b/src/web/DevStore.WebApp.Status/Program.cs
index 1c24e67..0bc4634 100644
--- a/src/web/DevStore.WebApp.Status/Program.cs
+++ b/src/web/DevStore.WebApp.Status/Program.cs
@@ -62,6 +62,7 @@
 app.MapHealthChecksUI(setup =>
 {
     setup.AddCustomStylesheet("devstore.css");
-    setup.UIPath = "/status";
+    setup.UIPath = "/";
+    setup.PageTitle = "DevStore - Status";
 });
 app.Run();
diff --git a/src/web/DevStore.WebApp.Status/appsettings.Production.json b/src/web/DevStore.WebApp.Status/appsettings.Production.json
index 32d4cf0..14c27bf 100644
--- a/src/web/DevStore.WebApp.Status/appsettings.Production.json
+++ b/src/web/DevStore.WebApp.Status/appsettings.Production.json
@@ -20,7 +20,7 @@
     "DefaultConnection": "Server=database-status;Database=DSStatus;MultipleActiveResultSets=true;User Id=sa;Password=MyDB@123"
   },
   "ENDPOINTS": [
-    "Frontend Web;https://web-devstore-ecommerce/healthz-infra",
+    "Frontend Web;https://web-devstore-ecommerce/healthz",
     "Identity API;https://api-identity/healthz-infra",
     "BFF Checkout;https://api-bff-checkout/healthz-infra",
     "Shopping Cart API;https://api-cart/healthz-infra",