diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index f96a8d177..a8ee546f4 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -56,7 +56,11 @@ services:
       - CatalogUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101
       - OrderingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
       - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
-      - BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103                
+      - BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
+      - CatalogUrlHC=http://catalog.api:5101/hc
+      - OrderingUrlHC=http://ordering.api:5102/hc
+      - IdentityUrlHC=http://identity.api:5105/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
+      - BasketUrlHC=http://basket.api:5103/hc
     ports:
       - "5104:5104"
 
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 58bfe5f82..31b256ff5 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -61,7 +61,11 @@ services:
       - CatalogUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101
       - OrderingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102
       - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your host's firewall at range 5100-5105.  at range 5100-5105. 
-      - BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103                
+      - BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
+      - CatalogUrlHC=http://catalog.api:5101/hc
+      - OrderingUrlHC=http://ordering.api:5102/hc
+      - IdentityUrlHC=http://identity.api:5105/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
+      - BasketUrlHC=http://basket.api:5103/hc
     ports:
       - "5104:5104"
 
diff --git a/src/Web/WebSPA/Startup.cs b/src/Web/WebSPA/Startup.cs
index d9c91e5ee..53476266a 100644
--- a/src/Web/WebSPA/Startup.cs
+++ b/src/Web/WebSPA/Startup.cs
@@ -51,10 +51,10 @@ namespace eShopConContainers.WebSPA
                     minutes = minutesParsed;
                 }
 
-                checks.AddUrlCheck(Configuration["CatalogUrl"] + "/hc", TimeSpan.FromMinutes(minutes));
-                checks.AddUrlCheck(Configuration["OrderingUrl"] + "/hc", TimeSpan.FromMinutes(minutes));
-                checks.AddUrlCheck(Configuration["BasketUrl"] + "/hc", TimeSpan.FromMinutes(minutes));
-                checks.AddUrlCheck(Configuration["IdentityUrl"] + "/hc", TimeSpan.FromMinutes(minutes));
+                checks.AddUrlCheck(Configuration["CatalogUrlHC"], TimeSpan.FromMinutes(minutes));
+                checks.AddUrlCheck(Configuration["OrderingUrlHC"], TimeSpan.FromMinutes(minutes));
+                checks.AddUrlCheck(Configuration["BasketUrlHC"], TimeSpan.FromMinutes(minutes));
+                checks.AddUrlCheck(Configuration["IdentityUrlHC"], TimeSpan.FromMinutes(minutes));
             });
 
             services.Configure<AppSettings>(Configuration);
diff --git a/src/Web/WebStatus/Views/Shared/_Layout.cshtml b/src/Web/WebStatus/Views/Shared/_Layout.cshtml
index b7a4d7698..7429afcaf 100644
--- a/src/Web/WebStatus/Views/Shared/_Layout.cshtml
+++ b/src/Web/WebStatus/Views/Shared/_Layout.cshtml
@@ -48,9 +48,10 @@
     <div class="container body-content">
         @RenderBody()
     </div>
-    <footer class="container footer">
-        <p class="center">&copy; 2017 - WebStatus</p>
-    </footer>
+    <br />
+    <div id="footer">
+        <p>&nbsp;&copy; 2017 - WebStatus</p>
+    </div>
 
 
     <environment names="Development">