diff --git a/Basic/Services/Hosting/WindowsService/Client/Connected Services/CoreWcf.Samples.WindowsService/ConnectedService.json b/Basic/Services/Hosting/WindowsService/Client/Connected Services/CoreWcf.Samples.WindowsService/ConnectedService.json
index 16f8fb0..00ca0c8 100644
--- a/Basic/Services/Hosting/WindowsService/Client/Connected Services/CoreWcf.Samples.WindowsService/ConnectedService.json	
+++ b/Basic/Services/Hosting/WindowsService/Client/Connected Services/CoreWcf.Samples.WindowsService/ConnectedService.json	
@@ -1,7 +1,7 @@
 {
   "ExtendedData": {
     "inputs": [
-      "http://localhost:5000/CalculatorService/basicService"
+      "http://localhost:5000/CalculatorService"
     ],
     "collectionTypes": [
       "System.Array",
diff --git a/Basic/Services/Hosting/WindowsService/Client/Connected Services/CoreWcf.Samples.WindowsService/Reference.cs b/Basic/Services/Hosting/WindowsService/Client/Connected Services/CoreWcf.Samples.WindowsService/Reference.cs
index bef885b..106ff43 100644
--- a/Basic/Services/Hosting/WindowsService/Client/Connected Services/CoreWcf.Samples.WindowsService/Reference.cs	
+++ b/Basic/Services/Hosting/WindowsService/Client/Connected Services/CoreWcf.Samples.WindowsService/Reference.cs	
@@ -156,7 +156,7 @@ private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointCo
         {
             if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_ICalculatorService))
             {
-                return new System.ServiceModel.EndpointAddress("http://localhost:5000/CalculatorService/basicService/CalculatorService/basicHttp");
+                return new System.ServiceModel.EndpointAddress("http://localhost:5000/CalculatorService/basicHttp");
             }
             if ((endpointConfiguration == EndpointConfiguration.NetTcpBinding_ICalculatorService))
             {
diff --git a/Basic/Services/Hosting/WindowsService/Service/Program.cs b/Basic/Services/Hosting/WindowsService/Service/Program.cs
index 0e795d0..ef08b13 100644
--- a/Basic/Services/Hosting/WindowsService/Service/Program.cs
+++ b/Basic/Services/Hosting/WindowsService/Service/Program.cs
@@ -38,13 +38,15 @@
     // Add the Calculator Service
     builder.AddService<CalculatorService>(serviceOptions =>
     {
+        serviceOptions.BaseAddresses.Clear();
         // Set the default host name:port in generated WSDL and the base path for the address 
-        serviceOptions.BaseAddresses.Add(new Uri($"http://localhost:{HttpPort}/CalculatorService/basicService"));
+        serviceOptions.BaseAddresses.Add(new Uri("http://localhost/CalculatorService"));
+        serviceOptions.BaseAddresses.Add(new Uri($"net.tcp://localhost:{NetTcpPort}/CalculatorService"));
     })
     // Add BasicHttpBinding endpoint
-    .AddServiceEndpoint<CalculatorService, ICalculatorService>(new BasicHttpBinding(), "/CalculatorService/basicHttp")
-    // Add NetTcp endpoint
-    .AddServiceEndpoint<CalculatorService, ICalculatorService>(new NetTcpBinding(), $"net.tcp://localhost:{NetTcpPort}/CalculatorService/netTcp");
+    .AddServiceEndpoint<CalculatorService, ICalculatorService>(new BasicHttpBinding(), "basicHttp")
+    // Add NetTcpBinding endpoint
+    .AddServiceEndpoint<CalculatorService, ICalculatorService>(new NetTcpBinding(), "netTcp");
 
     // Configure WSDL to be available
     var serviceMetadataBehavior = app.Services.GetRequiredService<ServiceMetadataBehavior>();
diff --git a/Basic/Services/Hosting/WindowsService/Service/Properties/launchSettings.json b/Basic/Services/Hosting/WindowsService/Service/Properties/launchSettings.json
index cb7ec9b..9e58d8b 100644
--- a/Basic/Services/Hosting/WindowsService/Service/Properties/launchSettings.json
+++ b/Basic/Services/Hosting/WindowsService/Service/Properties/launchSettings.json
@@ -4,7 +4,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "launchUrl": "http://localhost:5000/CalculatorService/basicService",
+        "launchUrl": "http://localhost:5000/CalculatorService",
         "environmentVariables": {
             "ASPNETCORE_ENVIRONMENT": "Development"
         }