diff --git a/FeatureFlags/FeatureFlags.Web/Controllers/HomeController.cs b/FeatureFlags/FeatureFlags.Web/Controllers/HomeController.cs
index 145505bf..f6e8ecb9 100644
--- a/FeatureFlags/FeatureFlags.Web/Controllers/HomeController.cs
+++ b/FeatureFlags/FeatureFlags.Web/Controllers/HomeController.cs
@@ -1,6 +1,7 @@
 using FeatureFlags.Models;
 using FeatureFlags.Web.Models;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -11,15 +12,21 @@ namespace FeatureFlags.Web.Controllers
     public class HomeController : Controller
     {
         private readonly IServiceAPIClient _ServiceApiClient;
+        private readonly IConfiguration _configuration;
 
-        public HomeController(IServiceAPIClient ServiceApiClient)
+        public HomeController(IServiceAPIClient ServiceApiClient, IConfiguration configuration)
         {
             _ServiceApiClient = ServiceApiClient;
+            _configuration = configuration;
         }
 
         public async Task<IActionResult> Index()
         {
             Payload<List<FeatureFlag>> featureFlags = await _ServiceApiClient.GetFeatureFlags();
+            if (featureFlags != null)
+            {
+                featureFlags.ServiceURL = _configuration["AppSettings:WebServiceURL"];
+            }
 
             return View(featureFlags);
         }
@@ -29,7 +36,6 @@ public IActionResult AddFeatureFlag()
             return View();
         }
 
-
         [HttpPost]
         public async Task<IActionResult> AddFeatureFlagPost(string newName, string newDescription)
         {
diff --git a/FeatureFlags/FeatureFlags.Web/Models/Payload.cs b/FeatureFlags/FeatureFlags.Web/Models/Payload.cs
index 33461087..79cd34f8 100644
--- a/FeatureFlags/FeatureFlags.Web/Models/Payload.cs
+++ b/FeatureFlags/FeatureFlags.Web/Models/Payload.cs
@@ -9,6 +9,7 @@ public Payload()
         }
 
         public T Data { get; set; }
+        public string ServiceURL { get; set; }
         public string ServiceMessage { get; set; }
         public string ServiceError { get; set; }
     }
diff --git a/FeatureFlags/FeatureFlags.Web/Views/Home/Index.cshtml b/FeatureFlags/FeatureFlags.Web/Views/Home/Index.cshtml
index 4eb48ed3..a6a2ba64 100644
--- a/FeatureFlags/FeatureFlags.Web/Views/Home/Index.cshtml
+++ b/FeatureFlags/FeatureFlags.Web/Views/Home/Index.cshtml
@@ -3,6 +3,9 @@
     ViewData["Title"] = "Home Page";
 }
 @model Payload<List<FeatureFlag>>
+@{
+    var ServiceURL = Model.ServiceURL;
+}
 
 <div class="text-center">
     <h1 class="display-4">Sams Feature Flags management</h1>
@@ -134,8 +137,9 @@ else
         var name = featureDetails[0];
         var environment = featureDetails[1]
         var isEnabled = item.checked;
+        //console.log("@ServiceURL/api/FeatureFlags/SaveFeatureFlagState?name=" + name + "&environment=" + environment + "&isEnabled=" + isEnabled);
         $.ajax({
-            url: "https://featureflags-prod-eu-service.azurewebsites.net/api/FeatureFlags/SaveFeatureFlagState?name=" + name + "&environment=" + environment + "&isEnabled=" + isEnabled,
+            url: "@ServiceURL/api/FeatureFlags/SaveFeatureFlagState?name=" + name + "&environment=" + environment + "&isEnabled=" + isEnabled,
             success: function (resultData) {
                 location.reload();
             }