diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index 0cd12dcd..4cf7347a 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -18,15 +18,21 @@
             <Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label>
         </td>
         <td>
-            <input id="runtime" class="form-control" @bind="@_runtime" readonly />
+            <select id="runtime" class="form-control" @bind="@_runtime">
+                <option value="Server">@Localizer["Server"]</option>
+                <option value="WebAssembly">@Localizer["WebAssembly"]</option>
+            </select>
         </td>
     </tr>
     <tr>
         <td>
-            <Label For="rendermode" HelpText="Blazor Render Mode" ResourceKey="RenderMode">Render Mode: </Label>
+            <Label For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label>
         </td>
         <td>
-            <input id="rendermode" class="form-control" @bind="@_rendermode" readonly />
+            <select id="rendermode" class="form-control" @bind="@_rendermode">
+                <option value="Server">@Localizer["Server"]</option>
+                <option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option>
+            </select>
         </td>
     </tr>
     <tr>
@@ -62,6 +68,7 @@
         </td>
     </tr>
 </table>
+<button type="button" class="btn btn-success" @onclick="SaveConfig">@Localizer["Save"]</button>&nbsp;
 <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access Framework API"]</a>&nbsp;
 <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
 
@@ -92,6 +99,23 @@
         }
     }
 
+    private async Task SaveConfig()
+    {
+        try
+        {
+            var settings = new Dictionary<string, string>();
+            settings.Add("runtime", _runtime);
+            settings.Add("rendermode", _rendermode);
+            await SystemService.UpdateSystemInfoAsync(settings);
+            AddModuleMessage(Localizer["Configuration Updated. Please Select Restart Application For These Changes To Be Activated."], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving Configuration");
+            AddModuleMessage(Localizer["An Error Occurred Updating The Configuration"], MessageType.Error);
+        }
+    }
+
     private async Task RestartApplication()
     {
         try
diff --git a/Oqtane.Client/Services/Interfaces/ISystemService.cs b/Oqtane.Client/Services/Interfaces/ISystemService.cs
index c450cdc7..f710b524 100644
--- a/Oqtane.Client/Services/Interfaces/ISystemService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISystemService.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Oqtane.Services
@@ -6,5 +6,7 @@ namespace Oqtane.Services
     public interface ISystemService
     {
         Task<Dictionary<string, string>> GetSystemInfoAsync();
+
+        Task UpdateSystemInfoAsync(Dictionary<string, string> settings);
     }
 }
diff --git a/Oqtane.Client/Services/SystemService.cs b/Oqtane.Client/Services/SystemService.cs
index 97112ca1..ba0f54d0 100644
--- a/Oqtane.Client/Services/SystemService.cs
+++ b/Oqtane.Client/Services/SystemService.cs
@@ -22,5 +22,10 @@ namespace Oqtane.Services
         {
             return await GetJsonAsync<Dictionary<string, string>>(Apiurl);
         }
+
+        public async Task UpdateSystemInfoAsync(Dictionary<string, string> settings)
+        {
+            await PostJsonAsync(Apiurl, settings);
+        }
     }
 }
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
index 0adeaacd..19dae995 100644
--- a/Oqtane.Server/Controllers/SystemController.cs
+++ b/Oqtane.Server/Controllers/SystemController.cs
@@ -37,5 +37,23 @@ namespace Oqtane.Controllers
             return systeminfo;
         }
 
+        [HttpPost]
+        [Authorize(Roles = RoleNames.Host)]
+        public void Post([FromBody] Dictionary<string, string> settings)
+        {
+            foreach(KeyValuePair<string, string> kvp in settings)
+            {
+                switch (kvp.Key)
+                {
+                    case "runtime":
+                        _configManager.AddOrUpdateSetting("Runtime", kvp.Value, false);
+                        break;
+                    case "rendermode":
+                        _configManager.AddOrUpdateSetting("RenderMode", kvp.Value, false);
+                        break;
+                }
+            }
+        }
+
     }
 }