diff --git a/Moonlight.Api/Configuration/ContainerHelperOptions.cs b/Moonlight.Api/Configuration/ContainerHelperOptions.cs
new file mode 100644
index 00000000..42f89bd7
--- /dev/null
+++ b/Moonlight.Api/Configuration/ContainerHelperOptions.cs
@@ -0,0 +1,7 @@
+namespace Moonlight.Api.Configuration;
+
+public class ContainerHelperOptions
+{
+    public bool IsEnabled { get; set; }
+    public string Url { get; set; } = "http://helper:8080";
+}
\ No newline at end of file
diff --git a/Moonlight.Api/Http/Controllers/Admin/ApiKeyController.cs b/Moonlight.Api/Http/Controllers/Admin/ApiKeyController.cs
index e1c27afd..23c47e95 100644
--- a/Moonlight.Api/Http/Controllers/Admin/ApiKeyController.cs
+++ b/Moonlight.Api/Http/Controllers/Admin/ApiKeyController.cs
@@ -6,9 +6,9 @@ using Moonlight.Api.Database.Entities;
 using Moonlight.Api.Mappers;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Requests.ApiKeys;
+using Moonlight.Shared.Http.Requests.Admin.ApiKeys;
 using Moonlight.Shared.Http.Responses;
-using Moonlight.Shared.Http.Responses.ApiKeys;
+using Moonlight.Shared.Http.Responses.Admin.ApiKeys;
 
 namespace Moonlight.Api.Http.Controllers.Admin;
 
diff --git a/Moonlight.Api/Http/Controllers/Admin/ContainerHelperController.cs b/Moonlight.Api/Http/Controllers/Admin/ContainerHelperController.cs
new file mode 100644
index 00000000..7fed23c7
--- /dev/null
+++ b/Moonlight.Api/Http/Controllers/Admin/ContainerHelperController.cs
@@ -0,0 +1,54 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Moonlight.Api.Configuration;
+using Moonlight.Api.Mappers;
+using Moonlight.Api.Services;
+using Moonlight.Shared.Http.Events;
+using Moonlight.Shared.Http.Requests.Admin.ContainerHelper;
+using Moonlight.Shared.Http.Responses.Admin;
+
+namespace Moonlight.Api.Http.Controllers.Admin;
+
+[ApiController]
+[Route("api/admin/ch")]
+public class ContainerHelperController : Controller
+{
+    private readonly ContainerHelperService ContainerHelperService;
+    private readonly IOptions<ContainerHelperOptions> Options;
+
+    public ContainerHelperController(ContainerHelperService containerHelperService, IOptions<ContainerHelperOptions> options)
+    {
+        ContainerHelperService = containerHelperService;
+        Options = options;
+    }
+
+    [HttpGet("status")]
+    public async Task<ActionResult<ContainerHelperStatusDto>> GetStatusAsync()
+    {
+        if (!Options.Value.IsEnabled)
+            return new ContainerHelperStatusDto(false, false);
+
+        var status = await ContainerHelperService.CheckConnectionAsync();
+
+        return new ContainerHelperStatusDto(true, status);
+    }
+
+    [HttpPost("rebuild")]
+    public Task<IResult> RebuildAsync([FromBody] RequestRebuildDto request)
+    {
+        var result = ContainerHelperService.RebuildAsync(request.NoBuildCache);
+        var mappedResult = result.Select(ContainerHelperMapper.ToDto);
+
+        return Task.FromResult<IResult>(
+            TypedResults.ServerSentEvents(mappedResult)
+        );
+    }
+
+    [HttpPost("version")]
+    public async Task<ActionResult> SetVersionAsync([FromBody] SetVersionDto request)
+    {
+        await ContainerHelperService.SetVersionAsync(request.Version);
+        return NoContent();
+    }
+}
\ No newline at end of file
diff --git a/Moonlight.Api/Http/Controllers/Admin/RoleMembersController.cs b/Moonlight.Api/Http/Controllers/Admin/RoleMembersController.cs
index 662516a4..ea2619c0 100644
--- a/Moonlight.Api/Http/Controllers/Admin/RoleMembersController.cs
+++ b/Moonlight.Api/Http/Controllers/Admin/RoleMembersController.cs
@@ -6,7 +6,7 @@ using Moonlight.Api.Database.Entities;
 using Moonlight.Api.Mappers;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Responses;
-using Moonlight.Shared.Http.Responses.Users;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 
 namespace Moonlight.Api.Http.Controllers.Admin;
 
diff --git a/Moonlight.Api/Http/Controllers/Admin/RolesController.cs b/Moonlight.Api/Http/Controllers/Admin/RolesController.cs
index 9e828f9b..af1bdbff 100644
--- a/Moonlight.Api/Http/Controllers/Admin/RolesController.cs
+++ b/Moonlight.Api/Http/Controllers/Admin/RolesController.cs
@@ -6,7 +6,7 @@ using Moonlight.Api.Database.Entities;
 using Moonlight.Api.Mappers;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Requests.Roles;
+using Moonlight.Shared.Http.Requests.Admin.Roles;
 using Moonlight.Shared.Http.Responses;
 using Moonlight.Shared.Http.Responses.Admin;
 
diff --git a/Moonlight.Api/Http/Controllers/Admin/ThemesController.cs b/Moonlight.Api/Http/Controllers/Admin/ThemesController.cs
index 0c46ae39..8c9b08e9 100644
--- a/Moonlight.Api/Http/Controllers/Admin/ThemesController.cs
+++ b/Moonlight.Api/Http/Controllers/Admin/ThemesController.cs
@@ -7,9 +7,9 @@ using Moonlight.Api.Mappers;
 using Moonlight.Api.Services;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Requests.Themes;
+using Moonlight.Shared.Http.Requests.Admin.Themes;
 using Moonlight.Shared.Http.Responses;
-using Moonlight.Shared.Http.Responses.Themes;
+using Moonlight.Shared.Http.Responses.Admin.Themes;
 
 namespace Moonlight.Api.Http.Controllers.Admin;
 
diff --git a/Moonlight.Api/Http/Controllers/Admin/UsersController.cs b/Moonlight.Api/Http/Controllers/Admin/UsersController.cs
index 79110804..f4500f3d 100644
--- a/Moonlight.Api/Http/Controllers/Admin/UsersController.cs
+++ b/Moonlight.Api/Http/Controllers/Admin/UsersController.cs
@@ -6,9 +6,9 @@ using Moonlight.Api.Database.Entities;
 using Moonlight.Api.Mappers;
 using Moonlight.Shared;
 using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Requests.Users;
+using Moonlight.Shared.Http.Requests.Admin.Users;
 using Moonlight.Shared.Http.Responses;
-using Moonlight.Shared.Http.Responses.Users;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 
 namespace Moonlight.Api.Http.Controllers.Admin;
 
diff --git a/Moonlight.Api/Http/Controllers/AuthController.cs b/Moonlight.Api/Http/Controllers/AuthController.cs
index a5ff547a..34dc18e7 100644
--- a/Moonlight.Api/Http/Controllers/AuthController.cs
+++ b/Moonlight.Api/Http/Controllers/AuthController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Moonlight.Shared.Http.Responses.Auth;
+using Moonlight.Shared.Http.Responses.Admin.Auth;
 
 namespace Moonlight.Api.Http.Controllers;
 
diff --git a/Moonlight.Api/Http/Controllers/FrontendController.cs b/Moonlight.Api/Http/Controllers/FrontendController.cs
index cdf201ee..6fffb0aa 100644
--- a/Moonlight.Api/Http/Controllers/FrontendController.cs
+++ b/Moonlight.Api/Http/Controllers/FrontendController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Moonlight.Api.Mappers;
 using Moonlight.Api.Services;
-using Moonlight.Shared.Http.Responses.Frontend;
+using Moonlight.Shared.Http.Responses.Admin.Frontend;
 
 namespace Moonlight.Api.Http.Controllers;
 
diff --git a/Moonlight.Api/Http/Controllers/PingController.cs b/Moonlight.Api/Http/Controllers/PingController.cs
new file mode 100644
index 00000000..8de46960
--- /dev/null
+++ b/Moonlight.Api/Http/Controllers/PingController.cs
@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Moonlight.Api.Http.Controllers;
+
+[ApiController]
+[Route("api/ping")]
+public class PingController : Controller
+{
+    [HttpGet]
+    [AllowAnonymous]
+    public IActionResult Get() => Ok("Pong");
+}
\ No newline at end of file
diff --git a/Moonlight.Api/Http/Services/ContainerHelper/Events/RebuildEventDto.cs b/Moonlight.Api/Http/Services/ContainerHelper/Events/RebuildEventDto.cs
new file mode 100644
index 00000000..1742b643
--- /dev/null
+++ b/Moonlight.Api/Http/Services/ContainerHelper/Events/RebuildEventDto.cs
@@ -0,0 +1,20 @@
+using System.Text.Json.Serialization;
+
+namespace Moonlight.Api.Http.Services.ContainerHelper.Events;
+
+public struct RebuildEventDto
+{
+    [JsonPropertyName("type")]
+    public RebuildEventType Type { get; set; }
+    
+    [JsonPropertyName("data")]
+    public string Data { get; set; }
+}
+
+public enum RebuildEventType
+{
+    Log = 0,
+    Failed = 1,
+    Succeeded = 2,
+    Step = 3
+}
\ No newline at end of file
diff --git a/Moonlight.Api/Http/Services/ContainerHelper/ProblemDetails.cs b/Moonlight.Api/Http/Services/ContainerHelper/ProblemDetails.cs
new file mode 100644
index 00000000..925672c6
--- /dev/null
+++ b/Moonlight.Api/Http/Services/ContainerHelper/ProblemDetails.cs
@@ -0,0 +1,10 @@
+namespace Moonlight.Api.Http.Services.ContainerHelper;
+
+public class ProblemDetails
+{
+    public string Type { get; set; }
+    public string Title { get; set; }
+    public int Status { get; set; }
+    public string? Detail { get; set; }
+    public Dictionary<string, string[]>? Errors { get; set; }
+}
\ No newline at end of file
diff --git a/Moonlight.Api/Http/Services/ContainerHelper/Requests/RequestRebuildDto.cs b/Moonlight.Api/Http/Services/ContainerHelper/Requests/RequestRebuildDto.cs
new file mode 100644
index 00000000..c7dda283
--- /dev/null
+++ b/Moonlight.Api/Http/Services/ContainerHelper/Requests/RequestRebuildDto.cs
@@ -0,0 +1,3 @@
+namespace Moonlight.Api.Http.Services.ContainerHelper.Requests;
+
+public record RequestRebuildDto(bool NoBuildCache);
\ No newline at end of file
diff --git a/Moonlight.Api/Http/Services/ContainerHelper/Requests/SetVersionDto.cs b/Moonlight.Api/Http/Services/ContainerHelper/Requests/SetVersionDto.cs
new file mode 100644
index 00000000..4c462fbc
--- /dev/null
+++ b/Moonlight.Api/Http/Services/ContainerHelper/Requests/SetVersionDto.cs
@@ -0,0 +1,3 @@
+namespace Moonlight.Api.Http.Services.ContainerHelper.Requests;
+
+public record SetVersionDto(string Version);
\ No newline at end of file
diff --git a/Moonlight.Api/Http/Services/ContainerHelper/SerializationContext.cs b/Moonlight.Api/Http/Services/ContainerHelper/SerializationContext.cs
new file mode 100644
index 00000000..371fb761
--- /dev/null
+++ b/Moonlight.Api/Http/Services/ContainerHelper/SerializationContext.cs
@@ -0,0 +1,29 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Moonlight.Api.Http.Services.ContainerHelper.Events;
+using Moonlight.Api.Http.Services.ContainerHelper.Requests;
+
+namespace Moonlight.Api.Http.Services.ContainerHelper;
+
+[JsonSerializable(typeof(SetVersionDto))]
+[JsonSerializable(typeof(ProblemDetails))]
+[JsonSerializable(typeof(RebuildEventDto))]
+[JsonSerializable(typeof(RequestRebuildDto))]
+public partial class SerializationContext : JsonSerializerContext
+{
+    private static JsonSerializerOptions? InternalTunedOptions;
+
+    public static JsonSerializerOptions TunedOptions
+    {
+        get
+        {
+            if (InternalTunedOptions != null)
+                return InternalTunedOptions;
+
+            InternalTunedOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web);
+            InternalTunedOptions.TypeInfoResolverChain.Add(Default);
+
+            return InternalTunedOptions;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Moonlight.Api/Mappers/ApiKeyMapper.cs b/Moonlight.Api/Mappers/ApiKeyMapper.cs
index f4f694ad..55dd62e1 100644
--- a/Moonlight.Api/Mappers/ApiKeyMapper.cs
+++ b/Moonlight.Api/Mappers/ApiKeyMapper.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Moonlight.Api.Database.Entities;
-using Moonlight.Shared.Http.Requests.ApiKeys;
-using Moonlight.Shared.Http.Responses.ApiKeys;
+using Moonlight.Shared.Http.Requests.Admin.ApiKeys;
+using Moonlight.Shared.Http.Responses.Admin.ApiKeys;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Api.Mappers;
diff --git a/Moonlight.Api/Mappers/ContainerHelperMapper.cs b/Moonlight.Api/Mappers/ContainerHelperMapper.cs
new file mode 100644
index 00000000..26cc39b4
--- /dev/null
+++ b/Moonlight.Api/Mappers/ContainerHelperMapper.cs
@@ -0,0 +1,13 @@
+using System.Diagnostics.CodeAnalysis;
+using Moonlight.Shared.Http.Events;
+using Riok.Mapperly.Abstractions;
+
+namespace Moonlight.Api.Mappers;
+
+[Mapper]
+[SuppressMessage("Mapper", "RMG020:No members are mapped in an object mapping")]
+[SuppressMessage("Mapper", "RMG012:No members are mapped in an object mapping")]
+public static partial class ContainerHelperMapper
+{
+    public static partial RebuildEventDto ToDto(Http.Services.ContainerHelper.Events.RebuildEventDto rebuildEventDto);
+}
\ No newline at end of file
diff --git a/Moonlight.Api/Mappers/FrontendConfigMapper.cs b/Moonlight.Api/Mappers/FrontendConfigMapper.cs
index 85118685..e731d714 100644
--- a/Moonlight.Api/Mappers/FrontendConfigMapper.cs
+++ b/Moonlight.Api/Mappers/FrontendConfigMapper.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Moonlight.Api.Models;
-using Moonlight.Shared.Http.Responses.Frontend;
+using Moonlight.Shared.Http.Responses.Admin.Frontend;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Api.Mappers;
diff --git a/Moonlight.Api/Mappers/RoleMapper.cs b/Moonlight.Api/Mappers/RoleMapper.cs
index 7ac52dad..b4a4e0ad 100644
--- a/Moonlight.Api/Mappers/RoleMapper.cs
+++ b/Moonlight.Api/Mappers/RoleMapper.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Moonlight.Api.Database.Entities;
-using Moonlight.Shared.Http.Requests.Roles;
+using Moonlight.Shared.Http.Requests.Admin.Roles;
 using Moonlight.Shared.Http.Responses.Admin;
 using Riok.Mapperly.Abstractions;
 
diff --git a/Moonlight.Api/Mappers/ThemeMapper.cs b/Moonlight.Api/Mappers/ThemeMapper.cs
index ad266092..4496a329 100644
--- a/Moonlight.Api/Mappers/ThemeMapper.cs
+++ b/Moonlight.Api/Mappers/ThemeMapper.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Moonlight.Api.Database.Entities;
-using Moonlight.Shared.Http.Requests.Themes;
-using Moonlight.Shared.Http.Responses.Themes;
+using Moonlight.Shared.Http.Requests.Admin.Themes;
+using Moonlight.Shared.Http.Responses.Admin.Themes;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Api.Mappers;
diff --git a/Moonlight.Api/Mappers/UserMapper.cs b/Moonlight.Api/Mappers/UserMapper.cs
index 2d150bc5..ef9673d3 100644
--- a/Moonlight.Api/Mappers/UserMapper.cs
+++ b/Moonlight.Api/Mappers/UserMapper.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using Riok.Mapperly.Abstractions;
-using Moonlight.Shared.Http.Requests.Users;
-using Moonlight.Shared.Http.Responses.Users;
 using Moonlight.Api.Database.Entities;
+using Moonlight.Shared.Http.Requests.Admin.Users;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 
 namespace Moonlight.Api.Mappers;
 
diff --git a/Moonlight.Api/Moonlight.Api.csproj b/Moonlight.Api/Moonlight.Api.csproj
index dcf0ef3e..10a62a6c 100644
--- a/Moonlight.Api/Moonlight.Api.csproj
+++ b/Moonlight.Api/Moonlight.Api.csproj
@@ -35,4 +35,8 @@
             <Visible Condition="'%(NuGetItemType)' == 'Content'">false</Visible>
         </Content>
     </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Http\Services\ContainerHelper\Responses\" />
+    </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Moonlight.Api/Services/ContainerHelperService.cs b/Moonlight.Api/Services/ContainerHelperService.cs
new file mode 100644
index 00000000..434857bd
--- /dev/null
+++ b/Moonlight.Api/Services/ContainerHelperService.cs
@@ -0,0 +1,117 @@
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Text.Json;
+using Moonlight.Api.Http.Services.ContainerHelper;
+using Moonlight.Api.Http.Services.ContainerHelper.Requests;
+using Moonlight.Api.Http.Services.ContainerHelper.Events;
+
+namespace Moonlight.Api.Services;
+
+public class ContainerHelperService
+{
+    private readonly IHttpClientFactory HttpClientFactory;
+
+    public ContainerHelperService(IHttpClientFactory httpClientFactory)
+    {
+        HttpClientFactory = httpClientFactory;
+    }
+
+    public async Task<bool> CheckConnectionAsync()
+    {
+        var client = HttpClientFactory.CreateClient("ContainerHelper");
+
+        try
+        {
+            var response = await client.GetAsync("api/ping");
+            response.EnsureSuccessStatusCode();
+
+            return true;
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+    }
+
+    public async IAsyncEnumerable<RebuildEventDto> RebuildAsync(bool noBuildCache)
+    {
+        var client = HttpClientFactory.CreateClient("ContainerHelper");
+
+        var request = new HttpRequestMessage(HttpMethod.Post, "api/rebuild");
+
+        request.Content = JsonContent.Create(
+            new RequestRebuildDto(noBuildCache),
+            null,
+            SerializationContext.TunedOptions
+        );
+
+        var response = await client.SendAsync(
+            request,
+            HttpCompletionOption.ResponseHeadersRead
+        );
+
+        if (!response.IsSuccessStatusCode)
+        {
+            var responseText = await response.Content.ReadAsStringAsync();
+
+            yield return new RebuildEventDto()
+            {
+                Type = RebuildEventType.Failed,
+                Data = responseText
+            };
+
+            yield break;
+        }
+
+        await using var responseStream = await response.Content.ReadAsStreamAsync();
+        using var streamReader = new StreamReader(responseStream);
+
+        do
+        {
+            var line = await streamReader.ReadLineAsync();
+
+            if (line == null)
+                break;
+
+            if (string.IsNullOrWhiteSpace(line))
+                continue;
+
+            var data = line.Trim("data: ");
+            var deserializedData = JsonSerializer.Deserialize<RebuildEventDto>(data, SerializationContext.TunedOptions);
+
+            yield return deserializedData;
+
+            // Exit if service will go down for a clean exit
+            if (deserializedData is { Type: RebuildEventType.Step, Data: "ServiceDown" })
+                yield break;
+        } while (true);
+
+        yield return new RebuildEventDto()
+        {
+            Type = RebuildEventType.Succeeded,
+            Data = string.Empty
+        };
+    }
+
+    public async Task SetVersionAsync(string version)
+    {
+        var client = HttpClientFactory.CreateClient("ContainerHelper");
+
+        var response = await client.PostAsJsonAsync(
+            "api/configuration/version",
+            new SetVersionDto(version),
+            SerializationContext.TunedOptions
+        );
+
+        if (response.IsSuccessStatusCode)
+            return;
+
+        var problemDetails =
+            await response.Content.ReadFromJsonAsync<ProblemDetails>(SerializationContext.TunedOptions);
+
+        if (problemDetails == null)
+            throw new HttpRequestException($"Failed to set version: {response.ReasonPhrase}");
+
+        throw new HttpRequestException($"Failed to set version: {problemDetails.Detail ?? problemDetails.Title}");
+    }
+}
\ No newline at end of file
diff --git a/Moonlight.Api/Startup/Startup.Base.cs b/Moonlight.Api/Startup/Startup.Base.cs
index ebb3c95f..f21aa407 100644
--- a/Moonlight.Api/Startup/Startup.Base.cs
+++ b/Moonlight.Api/Startup/Startup.Base.cs
@@ -9,7 +9,7 @@ using Moonlight.Api.Helpers;
 using Moonlight.Api.Implementations;
 using Moonlight.Api.Interfaces;
 using Moonlight.Api.Services;
-using SessionOptions = Moonlight.Api.Configuration.SessionOptions;
+using SessionOptions = Microsoft.AspNetCore.Builder.SessionOptions;
 
 namespace Moonlight.Api.Startup;
 
@@ -38,11 +38,20 @@ public partial class Startup
 
         builder.Services.AddOptions<FrontendOptions>().BindConfiguration("Moonlight:Frontend");
         builder.Services.AddScoped<FrontendService>();
-
+        
         builder.Services.AddHttpClient();
         
         builder.Services.AddOptions<VersionOptions>().BindConfiguration("Moonlight:Version");
         builder.Services.AddSingleton<VersionService>();
+        
+        builder.Services.AddOptions<ContainerHelperOptions>().BindConfiguration("Moonlight:ContainerHelper");
+        builder.Services.AddSingleton<ContainerHelperService>();
+
+        builder.Services.AddHttpClient("ContainerHelper", (provider, client) =>
+        {
+            var options =  provider.GetRequiredService<IOptions<ContainerHelperOptions>>();
+            client.BaseAddress = new Uri(options.Value.IsEnabled ? options.Value.Url : "http://you-should-fail.invalid");
+        });
     }
 
     private static void UseBase(WebApplication application)
diff --git a/Moonlight.Frontend/Helpers/ProblemDetailsHelper.cs b/Moonlight.Frontend/Helpers/ProblemDetailsHelper.cs
new file mode 100644
index 00000000..0f04d8ba
--- /dev/null
+++ b/Moonlight.Frontend/Helpers/ProblemDetailsHelper.cs
@@ -0,0 +1,30 @@
+using System.Net.Http.Json;
+using Microsoft.AspNetCore.Components.Forms;
+using Moonlight.Shared.Http.Responses;
+
+namespace Moonlight.Frontend.Helpers;
+
+public static class ProblemDetailsHelper
+{
+    public static async Task HandleProblemDetailsAsync(HttpResponseMessage response, object model, ValidationMessageStore validationMessageStore)
+    {
+        var problemDetails = await response.Content.ReadFromJsonAsync<ProblemDetails>();
+
+        if (problemDetails == null)
+            response.EnsureSuccessStatusCode(); // Trigger exception when unable to parse
+        else
+        {
+            if(!string.IsNullOrEmpty(problemDetails.Detail))
+                validationMessageStore.Add(new FieldIdentifier(model, string.Empty), problemDetails.Detail);
+
+            if (problemDetails.Errors != null)
+            {
+                foreach (var error in problemDetails.Errors)
+                {
+                    foreach (var message in error.Value)
+                        validationMessageStore.Add(new FieldIdentifier(model, error.Key), message);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Moonlight.Frontend/Mappers/ApiKeyMapper.cs b/Moonlight.Frontend/Mappers/ApiKeyMapper.cs
index 77dde21e..b1bb2ad6 100644
--- a/Moonlight.Frontend/Mappers/ApiKeyMapper.cs
+++ b/Moonlight.Frontend/Mappers/ApiKeyMapper.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
-using Moonlight.Shared.Http.Requests.ApiKeys;
-using Moonlight.Shared.Http.Responses.ApiKeys;
+using Moonlight.Shared.Http.Requests.Admin.ApiKeys;
+using Moonlight.Shared.Http.Responses.Admin.ApiKeys;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Frontend.Mappers;
diff --git a/Moonlight.Frontend/Mappers/RoleMapper.cs b/Moonlight.Frontend/Mappers/RoleMapper.cs
index 3495f872..4c4861f1 100644
--- a/Moonlight.Frontend/Mappers/RoleMapper.cs
+++ b/Moonlight.Frontend/Mappers/RoleMapper.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Moonlight.Shared.Http.Requests.Roles;
+using Moonlight.Shared.Http.Requests.Admin.Roles;
 using Moonlight.Shared.Http.Responses.Admin;
 using Riok.Mapperly.Abstractions;
 
diff --git a/Moonlight.Frontend/Mappers/ThemeMapper.cs b/Moonlight.Frontend/Mappers/ThemeMapper.cs
index 8ddff698..2e1747e7 100644
--- a/Moonlight.Frontend/Mappers/ThemeMapper.cs
+++ b/Moonlight.Frontend/Mappers/ThemeMapper.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
-using Moonlight.Shared.Http.Requests.Themes;
-using Moonlight.Shared.Http.Responses.Themes;
+using Moonlight.Shared.Http.Requests.Admin.Themes;
+using Moonlight.Shared.Http.Responses.Admin.Themes;
 using Riok.Mapperly.Abstractions;
 
 namespace Moonlight.Frontend.Mappers;
diff --git a/Moonlight.Frontend/Mappers/UserMapper.cs b/Moonlight.Frontend/Mappers/UserMapper.cs
index 0762ba58..c20a8c8f 100644
--- a/Moonlight.Frontend/Mappers/UserMapper.cs
+++ b/Moonlight.Frontend/Mappers/UserMapper.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
+using Moonlight.Shared.Http.Requests.Admin.Users;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 using Riok.Mapperly.Abstractions;
-using Moonlight.Shared.Http.Requests.Users;
-using Moonlight.Shared.Http.Responses.Users;
 
 namespace Moonlight.Frontend.Mappers;
 
diff --git a/Moonlight.Frontend/Moonlight.Frontend.csproj b/Moonlight.Frontend/Moonlight.Frontend.csproj
index 73eb2f4e..2cfb72cf 100644
--- a/Moonlight.Frontend/Moonlight.Frontend.csproj
+++ b/Moonlight.Frontend/Moonlight.Frontend.csproj
@@ -24,8 +24,8 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.1"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1"/>
         <PackageReference Include="Riok.Mapperly" Version="4.3.1-next.0"/>
-        <PackageReference Include="ShadcnBlazor" Version="1.0.9" />
-        <PackageReference Include="ShadcnBlazor.Extras" Version="1.0.9" />
+        <PackageReference Include="ShadcnBlazor" Version="1.0.11" />
+        <PackageReference Include="ShadcnBlazor.Extras" Version="1.0.11" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Moonlight.Frontend/Services/RemoteAuthProvider.cs b/Moonlight.Frontend/Services/RemoteAuthProvider.cs
index 22cdee35..8e17d6e4 100644
--- a/Moonlight.Frontend/Services/RemoteAuthProvider.cs
+++ b/Moonlight.Frontend/Services/RemoteAuthProvider.cs
@@ -3,7 +3,7 @@ using System.Net.Http.Json;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.Logging;
-using Moonlight.Shared.Http.Responses.Auth;
+using Moonlight.Shared.Http.Responses.Admin.Auth;
 
 namespace Moonlight.Frontend.Services;
 
diff --git a/Moonlight.Frontend/UI/Admin/Modals/CreateApiKeyDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/CreateApiKeyDialog.razor
index 24a3b735..459164c5 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/CreateApiKeyDialog.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/CreateApiKeyDialog.razor
@@ -1,13 +1,18 @@
-@using Moonlight.Frontend.UI.Admin.Components
-@using Moonlight.Shared.Http.Requests.ApiKeys
+@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.UI.Admin.Components
+@using Moonlight.Shared.Http.Requests.Admin.ApiKeys
+@using Moonlight.Shared.Http.Responses
 @using ShadcnBlazor.Dialogs
-@using ShadcnBlazor.Extras.Common
-@using ShadcnBlazor.Extras.FormHandlers
+@using ShadcnBlazor.Extras.Forms
+@using ShadcnBlazor.Extras.Toasts
+@using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
-@using ShadcnBlazor.Labels
 
 @inherits ShadcnBlazor.Extras.Dialogs.DialogBase
 
+@inject HttpClient HttpClient
+@inject ToastService ToastService
+
 <DialogHeader>
     <DialogTitle>Create new API key</DialogTitle>
     <DialogDescription>
@@ -15,56 +20,74 @@
     </DialogDescription>
 </DialogHeader>
 
-<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="SubmitAsync">
-    <div class="flex flex-col gap-6">
-        <FormValidationSummary />
+<EnhancedEditForm Model="Request" OnValidSubmit="OnSubmitAsync">
 
-        <div class="grid gap-2">
-            <Label for="keyName">Name</Label>
-            <InputField @bind-Value="Request.Name" id="keyName" placeholder="My API key" />
-        </div>
-
-        <div class="grid gap-2">
-            <Label for="keyDescription">Description</Label>
-            <textarea
-                @bind="Request.Description"
-                id="keyDescription"
-                maxlength="100"
-                class="border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm"
-                placeholder="What this key is for">
-            
-            </textarea>
-        </div>
-
-        <div class="grid gap-2">
-            <Label>Permissions</Label>
-            <PermissionSelector Permissions="Permissions" />
-        </div>
-    </div>
-</FormHandler>
-
-<DialogFooter ClassName="justify-end gap-x-1">
-    <WButtom OnClick="() => FormHandler.SubmitAsync()">Save changes</WButtom>
-</DialogFooter>
+    <FieldGroup>
+        <DataAnnotationsValidator/>
+        <FormValidationSummary/>
+        
+        <FieldSet>
+            <Field>
+                <FieldLabel for="keyName">Name</FieldLabel>
+                <TextInputField @bind-Value="Request.Name" id="keyName" placeholder="My API key"/>
+            </Field>
+            <Field>
+                <FieldLabel for="keyDescription">Description</FieldLabel>
+                <TextareaInputField @bind-Value="Request.Description" id="keyDescription" placeholder="What this key is for"/>
+            </Field>
+            <Field>
+                <FieldLabel>Permissions</FieldLabel>
+                <FieldContent>
+                    <PermissionSelector Permissions="Permissions"/>
+                </FieldContent>
+            </Field>
+        </FieldSet>
+        <Field Orientation="FieldOrientation.Horizontal" ClassName="justify-end">
+            <SubmitButton>Save changes</SubmitButton>
+        </Field>
+    </FieldGroup>
+</EnhancedEditForm>
 
 @code
 {
-    [Parameter] public Func<CreateApiKeyDto, Task> OnSubmit { get; set; }
+    [Parameter] public Func<Task> OnSubmit { get; set; }
 
     private CreateApiKeyDto Request;
-    private FormHandler FormHandler;
 
-    private List<string> Permissions = new(); 
+    private List<string> Permissions = new();
 
     protected override void OnInitialized()
     {
-        Request = new();
+        Request = new()
+        {
+            Permissions = []
+        };
     }
 
-    private async Task SubmitAsync()
+    private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore)
     {
         Request.Permissions = Permissions.ToArray();
-        await OnSubmit.Invoke(Request);
+        
+        var response = await HttpClient.PostAsJsonAsync(
+            "/api/admin/apiKeys",
+            Request,
+            Constants.SerializerOptions
+        );
+        
+        if (!response.IsSuccessStatusCode)
+        {
+            await ProblemDetailsHelper.HandleProblemDetailsAsync(response, Request, validationMessageStore);
+            return false;
+        }
+
+        await ToastService.SuccessAsync(
+            "API Key creation",
+            $"Successfully created API key {Request.Name}"
+        );
+
+        await OnSubmit.Invoke();
+
         await CloseAsync();
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor
index 7d1d1248..942e79b8 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor
@@ -1,14 +1,17 @@
+@using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.UI.Admin.Components
-@using Moonlight.Shared.Http.Requests.Roles
-@using ShadcnBlazor.Buttons
+@using Moonlight.Shared.Http.Requests.Admin.Roles
 @using ShadcnBlazor.Dialogs
-@using ShadcnBlazor.Extras.Common
-@using ShadcnBlazor.Extras.FormHandlers
+@using ShadcnBlazor.Extras.Forms
+@using ShadcnBlazor.Extras.Toasts
+@using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
-@using ShadcnBlazor.Labels
 
 @inherits ShadcnBlazor.Extras.Dialogs.DialogBase
 
+@inject HttpClient HttpClient
+@inject ToastService ToastService
+
 <DialogHeader>
     <DialogTitle>
         Create new role
@@ -18,49 +21,43 @@
     </DialogDescription>
 </DialogHeader>
 
-<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="OnSubmitAsync">
-    <div class="flex flex-col gap-6">
-
+<EnhancedEditForm Model="Request" OnValidSubmit="OnSubmitAsync">
+    <FieldGroup>
         <FormValidationSummary/>
+        <DataAnnotationsValidator/>
 
-        <div class="grid gap-2">
-            <Label for="roleName">Name</Label>
-            <InputField
-                @bind-Value="Request.Name"
-                id="roleName"
-                placeholder="My fancy role"/>
-        </div>
-
-        <div class="grid gap-2">
-            <Label for="roleDescription">Description</Label>
-            <textarea
-                @bind="Request.Description"
-                id="roleDescription"
-                maxlength="100"
-                class="border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm"
-                placeholder="Describe what the role should be used for">
-                
-            </textarea>
-        </div>
-        
-        <div class="grid gap-2">
-            <Label>Permissions</Label>
-            <PermissionSelector Permissions="Permissions" />
-        </div>
-    </div>
-</FormHandler>
-
-<DialogFooter ClassName="justify-end gap-x-1">
-    <WButtom OnClick="SubmitAsync">Save changes</WButtom>
-</DialogFooter>
+        <FieldSet>
+            <Field>
+                <FieldLabel for="roleName">Name</FieldLabel>
+                <TextInputField
+                    @bind-Value="Request.Name"
+                    id="roleName"
+                    placeholder="My fancy role"/>
+            </Field>
+            <Field>
+                <FieldLabel for="keyDescription">Description</FieldLabel>
+                <TextareaInputField @bind-Value="Request.Description" id="keyDescription"
+                                    placeholder="Describe what the role should be used for"/>
+            </Field>
+            <Field>
+                <FieldLabel>Permissions</FieldLabel>
+                <FieldContent>
+                    <PermissionSelector Permissions="Permissions"/>
+                </FieldContent>
+            </Field>
+        </FieldSet>
+        <Field Orientation="FieldOrientation.Horizontal" ClassName="justify-end">
+            <SubmitButton>Save changes</SubmitButton>
+        </Field>
+    </FieldGroup>
+</EnhancedEditForm>
 
 @code
 {
-    [Parameter] public Func<CreateRoleDto, Task> OnSubmit { get; set; }
+    [Parameter] public Func<Task> OnSubmit { get; set; }
 
     private CreateRoleDto Request;
     private List<string> Permissions;
-    private FormHandler FormHandler;
 
     protected override void OnInitialized()
     {
@@ -68,19 +65,31 @@
         {
             Permissions = []
         };
-        
+
         Permissions = new();
     }
 
-    private async Task SubmitAsync()
+    private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore)
     {
         Request.Permissions = Permissions.ToArray();
-        await FormHandler.SubmitAsync();
-    }
+        
+        var response = await HttpClient.PostAsJsonAsync(
+            "api/admin/roles",
+            Request,
+            Constants.SerializerOptions
+        );
+        
+        if (!response.IsSuccessStatusCode)
+        {
+            await ProblemDetailsHelper.HandleProblemDetailsAsync(response, Request, validationMessageStore);
+            return false;
+        }
 
-    private async Task OnSubmitAsync()
-    {
-        await OnSubmit.Invoke(Request);
+        await ToastService.SuccessAsync("Role creation", $"Role {Request.Name} has been successfully created");
+
+        await OnSubmit.Invoke();
         await CloseAsync();
+
+        return true;
     }
 }
diff --git a/Moonlight.Frontend/UI/Admin/Modals/CreateUserDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/CreateUserDialog.razor
index 55597eb5..ff9113de 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/CreateUserDialog.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/CreateUserDialog.razor
@@ -1,12 +1,17 @@
-@using Moonlight.Shared.Http.Requests.Users
+@using Moonlight.Frontend.Helpers
+@using Moonlight.Shared.Http.Requests.Admin.Users
+@using Moonlight.Shared.Http.Responses
 @using ShadcnBlazor.Dialogs
-@using ShadcnBlazor.Extras.Common
-@using ShadcnBlazor.Extras.FormHandlers
+@using ShadcnBlazor.Extras.Forms
+@using ShadcnBlazor.Extras.Toasts
+@using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
-@using ShadcnBlazor.Labels
 
 @inherits ShadcnBlazor.Extras.Dialogs.DialogBase
 
+@inject HttpClient HttpClient
+@inject ToastService ToastService
+
 <DialogHeader>
     <DialogTitle>
         Create new user
@@ -16,50 +21,67 @@
     </DialogDescription>
 </DialogHeader>
 
-<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="SubmitAsync">
-    <div class="flex flex-col gap-6">
+<EnhancedEditForm Model="Request" OnValidSubmit="OnSubmitAsync">
 
+    <FieldGroup>
         <FormValidationSummary/>
+        <DataAnnotationsValidator />
 
-        <div class="grid gap-2">
-            <Label for="username">Username</Label>
-            <InputField
-                @bind-Value="Request.Username"
-                id="username"
-                placeholder="Name of the user"/>
-        </div>
-
-        <div class="grid gap-2">
-            <Label for="emailAddress">Email Address</Label>
-            <InputField
-                @bind-Value="Request.Email"
-                id="emailAddress"
-                Type="email"
-                placeholder="email@of.user"/>
-        </div>
-    </div>
-</FormHandler>
-
-<DialogFooter ClassName="justify-end gap-x-1">
-    <WButtom OnClick="_ => FormHandler.SubmitAsync()">Save changes</WButtom>
-</DialogFooter>
+        <FieldSet>
+            <Field>
+                <FieldLabel for="username">Username</FieldLabel>
+                <TextInputField
+                    @bind-Value="Request.Username"
+                    id="username"
+                    placeholder="Name of the user"/>
+            </Field>
+            <Field>
+                <FieldLabel for="emailAddress">Email Address</FieldLabel>
+                <TextInputField
+                    @bind-Value="Request.Email"
+                    id="emailAddress"
+                    placeholder="email@of.user"/>
+            </Field>
+        </FieldSet>
+        <Field Orientation="FieldOrientation.Horizontal" ClassName="justify-end">
+            <SubmitButton>Save changes</SubmitButton>
+        </Field>
+    </FieldGroup>
+</EnhancedEditForm>
 
 @code
 {
-    [Parameter] public Func<CreateUserDto, Task> OnSubmit { get; set; }
+    [Parameter] public Func<Task> OnCompleted { get; set; }
 
     private CreateUserDto Request;
-    private FormHandler FormHandler;
 
     protected override void OnInitialized()
     {
         Request = new();
     }
 
-    private async Task SubmitAsync()
+    private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore)
     {
-        await OnSubmit.Invoke(Request);
+        var response = await HttpClient.PostAsJsonAsync(
+            "/api/admin/users",
+            Request,
+            Constants.SerializerOptions
+        );
 
+        if (!response.IsSuccessStatusCode)
+        {
+            await ProblemDetailsHelper.HandleProblemDetailsAsync(response, Request, validationMessageStore);
+            return false;
+        }
+
+        await ToastService.SuccessAsync(
+            "User creation",
+            $"Successfully created user {Request.Username}"
+        );
+
+        await OnCompleted.Invoke();
         await CloseAsync();
+
+        return true;
     }
 }
diff --git a/Moonlight.Frontend/UI/Admin/Modals/ManageRoleMembersDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/ManageRoleMembersDialog.razor
index 6abb099a..403d9c3f 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/ManageRoleMembersDialog.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/ManageRoleMembersDialog.razor
@@ -1,7 +1,7 @@
 @using LucideBlazor
 @using Moonlight.Shared.Http.Responses
 @using Moonlight.Shared.Http.Responses.Admin
-@using Moonlight.Shared.Http.Responses.Users
+@using Moonlight.Shared.Http.Responses.Admin.Users
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.DataGrids
 @using ShadcnBlazor.Dialogs
@@ -32,9 +32,9 @@
                   SearchPlaceholder="Search user"
                   ValueSelector="dto => dto.Username"
                   Source="LoadUsersAsync"/>
-        <WButtom OnClick="AddAsync" Variant="ButtonVariant.Outline" Size="ButtonSize.Icon">
+        <WButton OnClick="AddAsync" Variant="ButtonVariant.Outline" Size="ButtonSize.Icon">
             <PlusIcon/>
-        </WButtom>
+        </WButton>
     </div>
 </div>
 <div class="mt-3">
@@ -50,9 +50,9 @@
             <CellTemplate>
                 <TableCell>
                     <div class="flex justify-end me-1.5">
-                        <WButtom OnClick="_ => RemoveAsync(context)" Variant="ButtonVariant.Destructive" Size="ButtonSize.Icon">
+                        <WButton OnClick="_ => RemoveAsync(context)" Variant="ButtonVariant.Destructive" Size="ButtonSize.Icon">
                             <TrashIcon/>
-                        </WButtom>
+                        </WButton>
                     </div>
                 </TableCell>
             </CellTemplate>
diff --git a/Moonlight.Frontend/UI/Admin/Modals/UpdateApiKeyDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/UpdateApiKeyDialog.razor
index 10696f83..f9e4aef9 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/UpdateApiKeyDialog.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/UpdateApiKeyDialog.razor
@@ -1,15 +1,19 @@
-@using Moonlight.Frontend.Mappers
+@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Mappers
 @using Moonlight.Frontend.UI.Admin.Components
-@using Moonlight.Shared.Http.Requests.ApiKeys
-@using Moonlight.Shared.Http.Responses.ApiKeys
+@using Moonlight.Shared.Http.Requests.Admin.ApiKeys
+@using Moonlight.Shared.Http.Responses.Admin.ApiKeys
 @using ShadcnBlazor.Dialogs
-@using ShadcnBlazor.Extras.Common
-@using ShadcnBlazor.Extras.FormHandlers
+@using ShadcnBlazor.Extras.Forms
+@using ShadcnBlazor.Extras.Toasts
+@using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
-@using ShadcnBlazor.Labels
 
 @inherits ShadcnBlazor.Extras.Dialogs.DialogBase
 
+@inject HttpClient HttpClient
+@inject ToastService ToastService
+
 <DialogHeader>
     <DialogTitle>Update API key</DialogTitle>
     <DialogDescription>
@@ -17,45 +21,39 @@
     </DialogDescription>
 </DialogHeader>
 
-<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="SubmitAsync">
-    <div class="flex flex-col gap-6">
-        <FormValidationSummary />
+<EnhancedEditForm Model="Request" OnValidSubmit="OnSubmitAsync">
+    <FieldGroup>
+        <FormValidationSummary/>
+        <DataAnnotationsValidator/>
 
-        <div class="grid gap-2">
-            <Label for="keyName">Name</Label>
-            <InputField @bind-Value="Request.Name" id="keyName" placeholder="My API key" />
-        </div>
-
-        <div class="grid gap-2">
-            <Label for="keyDescription">Description</Label>
-            <textarea
-                @bind="Request.Description"
-                id="keyDescription"
-                maxlength="100"
-                class="border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm"
-                placeholder="What this key is for">
-            
-            </textarea>
-        </div>
-
-        <div class="grid gap-2">
-            <Label>Permissions</Label>
-            <PermissionSelector Permissions="Permissions" />
-        </div>
-    </div>
-</FormHandler>
-
-<DialogFooter ClassName="justify-end gap-x-1">
-    <WButtom OnClick="_ => FormHandler.SubmitAsync()">Save changes</WButtom>
-</DialogFooter>
+        <FieldSet>
+            <Field>
+                <FieldLabel for="keyName">Name</FieldLabel>
+                <TextInputField @bind-Value="Request.Name" id="keyName" placeholder="My API key"/>
+            </Field>
+            <Field>
+                <FieldLabel for="keyDescription">Description</FieldLabel>
+                <TextareaInputField @bind-Value="Request.Description" id="keyDescription" placeholder="What this key is for"/>
+            </Field>
+            <Field>
+                <FieldLabel>Permissions</FieldLabel>
+                <FieldContent>
+                    <PermissionSelector Permissions="Permissions"/>
+                </FieldContent>
+            </Field>
+        </FieldSet>
+        <Field Orientation="FieldOrientation.Horizontal" ClassName="justify-end">
+            <SubmitButton>Save changes</SubmitButton>
+        </Field>
+    </FieldGroup>
+</EnhancedEditForm>
 
 @code
 {
-    [Parameter] public Func<UpdateApiKeyDto, Task> OnSubmit { get; set; }
+    [Parameter] public Func<Task> OnSubmit { get; set; }
     [Parameter] public ApiKeyDto Key { get; set; }
 
     private UpdateApiKeyDto Request;
-    private FormHandler FormHandler;
     private List<string> Permissions = new();
 
     protected override void OnInitialized()
@@ -64,10 +62,30 @@
         Permissions = Key.Permissions.ToList();
     }
 
-    private async Task SubmitAsync()
+    private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore)
     {
         Request.Permissions = Permissions.ToArray();
-        await OnSubmit.Invoke(Request);
+        
+        var response = await HttpClient.PatchAsJsonAsync(
+            $"/api/admin/apiKeys/{Key.Id}",
+            Request,
+            Constants.SerializerOptions
+        );
+        
+        if (!response.IsSuccessStatusCode)
+        {
+            await ProblemDetailsHelper.HandleProblemDetailsAsync(response, Request, validationMessageStore);
+            return false;
+        }
+
+        await ToastService.SuccessAsync(
+            "API Key update",
+            $"Successfully updated API key {Request.Name}"
+        );
+        
+        await OnSubmit.Invoke();
         await CloseAsync();
+
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Moonlight.Frontend/UI/Admin/Modals/UpdateInstanceModal.razor b/Moonlight.Frontend/UI/Admin/Modals/UpdateInstanceModal.razor
index ba8e6dab..8a79aa15 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/UpdateInstanceModal.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/UpdateInstanceModal.razor
@@ -1,37 +1,38 @@
 @inherits ShadcnBlazor.Extras.Dialogs.DialogBase
 
+@using System.Text.Json
 @using LucideBlazor
+@using Moonlight.Shared.Http
+@using Moonlight.Shared.Http.Events
+@using Moonlight.Shared.Http.Requests.Admin.ContainerHelper
+@using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Dialogs
-@using ShadcnBlazor.Extras.AlertDialogs
 @using ShadcnBlazor.Progresses
 @using ShadcnBlazor.Spinners
 
-@inject AlertDialogService AlertService
+@inject HttpClient HttpClient
 
 <DialogHeader>
     <DialogTitle>
-        Updating...
+        Updating instance to @Version...
     </DialogTitle>
 </DialogHeader>
 
-<div class="text-base flex flex-col p-2 gap-y-0.5">
-    @for (var i = 0; i < Steps.Length; i++)
-    {
-        if (CurrentStep == i)
+<div class="grid grid-cols-1 xl:grid-cols-2 w-full gap-5">
+    <div class="text-base flex flex-col p-2 gap-y-1">
+        @for (var i = 0; i < Steps.Length; i++)
         {
-            <div class="flex flex-row items-center gap-x-2">
-                <Spinner ClassName="size-4" />
-                <span>
-                    @Steps[i]
-                </span>
-            </div>
-        }
-        else
-        {
-            if (i < CurrentStep)
+            if (CurrentStep == i)
             {
-                <div class="flex flex-row items-center gap-x-2">
-                    <CheckIcon ClassName="text-green-500 size-4" />
+                <div class="flex flex-row items-center gap-x-1">
+                    @if (IsFailed)
+                    {
+                        <CircleXIcon ClassName="text-red-500 size-5"/>
+                    }
+                    else
+                    {
+                        <Spinner ClassName="size-5"/>
+                    }
                     <span>
                         @Steps[i]
                     </span>
@@ -39,81 +40,205 @@
             }
             else
             {
-                <div class="text-muted-foreground flex flex-row items-center gap-x-2">
-                    <span class="size-4"></span>
-                    @Steps[i]
-                </div>
+                if (i < CurrentStep)
+                {
+                    <div class="flex flex-row items-center gap-x-1 text-muted-foreground">
+                        <CircleCheckIcon ClassName="text-green-500 size-5"/>
+                        <span>
+                            @Steps[i]
+                        </span>
+                    </div>
+                }
+                else
+                {
+                    <div class="text-muted-foreground flex flex-row items-center gap-x-1">
+                        <span class="size-5"></span>
+                        @Steps[i]
+                    </div>
+                }
             }
         }
-    }
+    </div>
+    <div class="bg-black text-white rounded-lg font-mono h-96 flex flex-col-reverse overflow-auto p-3 scrollbar-thin">
+        @for (var i = LogLines.Count - 1; i >= 0; i--)
+        {
+            <div>
+                @LogLines[i]
+            </div>
+        }
+    </div>
 </div>
 
-<DialogFooter>
-    <Progress Value="@Progress"></Progress>
-</DialogFooter>
+@if (CurrentStep == Steps.Length || IsFailed)
+{
+    <DialogFooter ClassName="justify-end">
+        <Button Variant="ButtonVariant.Outline" @onclick="CloseAsync">Close</Button>
+    </DialogFooter>
+}
+else
+{
+    <DialogFooter>
+        <Progress ClassName="my-1" Value="@Progress"></Progress>
+    </DialogFooter>
+}
 
 @code
 {
-    private int Progress = 0;
+    [Parameter] public string Version { get; set; }
+    [Parameter] public bool NoBuildCache { get; set; }
 
+    private bool IsFailed;
+    private int Progress;
     private int CurrentStep;
 
-    private string[] Steps =
+    private readonly string[] Steps =
     [
-        "Preparing",
-        "Updating configuration files",
-        "Building docker image",
-        "Redeploying container instance",
-        "Waiting for container instance to start up",
-        "Update complete"
+        "Checking", // 0
+        "Updating configuration files", // 1
+        "Starting rebuild task", // 2
+        "Building docker image", // 3
+        "Redeploying container instance", // 4
+        "Waiting for container instance to start up", // 5
+        "Update complete" // 6
     ];
 
+    private readonly List<string?> LogLines = new();
+
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (!firstRender)
             return;
 
+        // Checking
         CurrentStep = 0;
         Progress = 0;
         await InvokeAsync(StateHasChanged);
 
         await Task.Delay(2000);
 
+        // Update configuration
         CurrentStep = 1;
         Progress = 20;
         await InvokeAsync(StateHasChanged);
 
-        await Task.Delay(6000);
+        await HttpClient.PostAsJsonAsync("api/admin/ch/version", new SetVersionDto()
+        {
+            Version = Version
+        }, SerializationContext.TunedOptions);
 
+        // Starting rebuild task
         CurrentStep = 2;
-        Progress = 40;
+        Progress = 30;
         await InvokeAsync(StateHasChanged);
 
-        await Task.Delay(2000);
+        var request = new HttpRequestMessage(HttpMethod.Post, "api/admin/ch/rebuild");
 
-        CurrentStep = 3;
-        Progress = 60;
-        await InvokeAsync(StateHasChanged);
-
-        await Task.Delay(4000);
-
-        CurrentStep = 4;
-        Progress = 80;
-        await InvokeAsync(StateHasChanged);
-
-        await Task.Delay(4000);
-        
-        CurrentStep = 5;
-        Progress = 100;
-        await InvokeAsync(StateHasChanged);
-        
-        await Task.Delay(1000);
-
-        await AlertService.SuccessAsync(
-            "Update completed",
-            "Update successfully completed. Please refresh the page to load new frontend changes"
+        request.Content = JsonContent.Create(
+            new RequestRebuildDto(NoBuildCache),
+            null,
+            SerializationContext.TunedOptions
         );
 
-        await CloseAsync();
+        var response = await HttpClient.SendAsync(
+            request,
+            HttpCompletionOption.ResponseHeadersRead
+        );
+
+        await using var responseStream = await response.Content.ReadAsStreamAsync();
+        using var streamReader = new StreamReader(responseStream);
+
+        do
+        {
+            try
+            {
+                var line = await streamReader.ReadLineAsync();
+
+                if (line == null)
+                    break;
+
+                if (string.IsNullOrWhiteSpace(line))
+                    continue;
+
+                var data = line.Trim("data: ");
+                var deserializedData = JsonSerializer.Deserialize<RebuildEventDto>(data, Constants.SerializerOptions);
+
+                switch (deserializedData.Type)
+                {
+                    case RebuildEventType.Log:
+                        LogLines.Add(deserializedData.Data);
+                        break;
+
+                    case RebuildEventType.Step:
+
+                        switch (deserializedData.Data)
+                        {
+                            case "BuildImage":
+
+                                // Building docker image
+
+                                CurrentStep = 3;
+                                Progress = 40;
+
+                                await InvokeAsync(StateHasChanged);
+                                break;
+
+                            case "ServiceDown":
+
+                                // Redeploying container instance
+
+                                CurrentStep = 4;
+                                Progress = 60;
+
+                                await InvokeAsync(StateHasChanged);
+                                break;
+                        }
+
+                        break;
+
+                    case RebuildEventType.Failed:
+
+                        IsFailed = true;
+                        await InvokeAsync(StateHasChanged);
+
+                        return;
+                }
+
+                await InvokeAsync(StateHasChanged);
+            }
+            catch (Exception)
+            {
+                break;
+            }
+        } while (true);
+
+        // Waiting for container instance to start up
+
+        CurrentStep = 5;
+        Progress = 90;
+        await InvokeAsync(StateHasChanged);
+
+        // Wait some time for instance to shut down
+        await Task.Delay(TimeSpan.FromSeconds(5));
+
+        // Ping instance until its reachable again
+        while (true)
+        {
+            try
+            {
+                await HttpClient.GetStringAsync("api/ping");
+                break;
+            }
+            catch (Exception)
+            {
+                // Ignored
+            }
+
+            await Task.Delay(3000);
+        }
+
+        // Update complete
+        CurrentStep = 7;
+        Progress = 100;
+        await InvokeAsync(StateHasChanged);
     }
 }
diff --git a/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor
index 8878320f..288d8a71 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor
@@ -1,16 +1,19 @@
+@using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.Mappers
 @using Moonlight.Frontend.UI.Admin.Components
-@using Moonlight.Shared.Http.Requests.Roles
+@using Moonlight.Shared.Http.Requests.Admin.Roles
 @using Moonlight.Shared.Http.Responses.Admin
-@using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Dialogs
-@using ShadcnBlazor.Extras.Common
-@using ShadcnBlazor.Extras.FormHandlers
+@using ShadcnBlazor.Extras.Forms
+@using ShadcnBlazor.Extras.Toasts
+@using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
-@using ShadcnBlazor.Labels
 
 @inherits ShadcnBlazor.Extras.Dialogs.DialogBase
 
+@inject HttpClient HttpClient
+@inject ToastService ToastService
+
 <DialogHeader>
     <DialogTitle>
         Update @Role.Name
@@ -20,50 +23,44 @@
     </DialogDescription>
 </DialogHeader>
 
-<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="OnSubmitAsync">
-    <div class="flex flex-col gap-6">
-
+<EnhancedEditForm Model="Request" OnValidSubmit="OnSubmitAsync">
+    <FieldGroup>
         <FormValidationSummary/>
+        <DataAnnotationsValidator/>
 
-        <div class="grid gap-2">
-            <Label for="roleName">Name</Label>
-            <InputField
-                @bind-Value="Request.Name"
-                id="roleName"
-                placeholder="My fancy role"/>
-        </div>
-
-        <div class="grid gap-2">
-            <Label for="roleDescription">Description</Label>
-            <textarea
-                @bind="Request.Description"
-                id="roleDescription"
-                maxlength="100"
-                class="border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm"
-                placeholder="Describe what the role should be used for">
-                
-            </textarea>
-        </div>
-        
-        <div class="grid gap-2">
-            <Label>Permissions</Label>
-            <PermissionSelector Permissions="Permissions" />
-        </div>
-    </div>
-</FormHandler>
-
-<DialogFooter ClassName="justify-end gap-x-1">
-    <WButtom OnClick="SubmitAsync">Save changes</WButtom>
-</DialogFooter>
+        <FieldSet>
+            <Field>
+                <FieldLabel for="roleName">Name</FieldLabel>
+                <TextInputField
+                    @bind-Value="Request.Name"
+                    id="roleName"
+                    placeholder="My fancy role"/>
+            </Field>
+            <Field>
+                <FieldLabel for="keyDescription">Description</FieldLabel>
+                <TextareaInputField @bind-Value="Request.Description" id="keyDescription"
+                                    placeholder="Describe what the role should be used for"/>
+            </Field>
+            <Field>
+                <FieldLabel>Permissions</FieldLabel>
+                <FieldContent>
+                    <PermissionSelector Permissions="Permissions"/>
+                </FieldContent>
+            </Field>
+        </FieldSet>
+        <Field Orientation="FieldOrientation.Horizontal" ClassName="justify-end">
+            <SubmitButton>Save changes</SubmitButton>
+        </Field>
+    </FieldGroup>
+</EnhancedEditForm>
 
 @code
 {
-    [Parameter] public Func<UpdateRoleDto, Task> OnSubmit { get; set; }
+    [Parameter] public Func<Task> OnSubmit { get; set; }
     [Parameter] public RoleDto Role { get; set; }
-    
+
     private UpdateRoleDto Request;
     private List<string> Permissions;
-    private FormHandler FormHandler;
 
     protected override void OnInitialized()
     {
@@ -71,15 +68,27 @@
         Permissions = Role.Permissions.ToList();
     }
 
-    private async Task SubmitAsync()
+    private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore)
     {
         Request.Permissions = Permissions.ToArray();
-        await FormHandler.SubmitAsync();
-    }
+        
+        var response = await HttpClient.PatchAsJsonAsync(
+            $"api/admin/roles/{Role.Id}",
+            Request,
+            Constants.SerializerOptions
+        );
+        
+        if (!response.IsSuccessStatusCode)
+        {
+            await ProblemDetailsHelper.HandleProblemDetailsAsync(response, Request, validationMessageStore);
+            return false;
+        }
 
-    private async Task OnSubmitAsync()
-    {
-        await OnSubmit.Invoke(Request);
+        await ToastService.SuccessAsync("Role update", $"Role {Request.Name} has been successfully updated");
+        
+        await OnSubmit.Invoke();
         await CloseAsync();
+
+        return true;
     }
 }
diff --git a/Moonlight.Frontend/UI/Admin/Modals/UpdateUserDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/UpdateUserDialog.razor
index fd2e77a8..f23a2ec7 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/UpdateUserDialog.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/UpdateUserDialog.razor
@@ -1,14 +1,19 @@
-@using Moonlight.Frontend.Mappers
-@using Moonlight.Shared.Http.Requests.Users
-@using Moonlight.Shared.Http.Responses.Users
+@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Mappers
+@using Moonlight.Shared.Http.Requests.Admin.Users
+@using Moonlight.Shared.Http.Responses
+@using Moonlight.Shared.Http.Responses.Admin.Users
 @using ShadcnBlazor.Dialogs
-@using ShadcnBlazor.Extras.Common
-@using ShadcnBlazor.Extras.FormHandlers
+@using ShadcnBlazor.Extras.Forms
+@using ShadcnBlazor.Extras.Toasts
+@using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
-@using ShadcnBlazor.Labels
 
 @inherits ShadcnBlazor.Extras.Dialogs.DialogBase
 
+@inject HttpClient HttpClient
+@inject ToastService ToastService
+
 <DialogHeader>
     <DialogTitle>
         Update @User.Username
@@ -18,51 +23,66 @@
     </DialogDescription>
 </DialogHeader>
 
-<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="SubmitAsync">
-    <div class="flex flex-col gap-6">
-
+<EnhancedEditForm Model="Request" OnValidSubmit="OnSubmitAsync">
+    <FieldGroup>
         <FormValidationSummary/>
+        <DataAnnotationsValidator/>
 
-        <div class="grid gap-2">
-            <Label for="username">Username</Label>
-            <InputField
-                @bind-Value="Request.Username"
-                id="username"
-                placeholder="Name of the user"/>
-        </div>
-
-        <div class="grid gap-2">
-            <Label for="emailAddress">Email Address</Label>
-            <InputField
-                @bind-Value="Request.Email"
-                id="emailAddress"
-                Type="email"
-                placeholder="email@of.user"/>
-        </div>
-    </div>
-</FormHandler>
-
-<DialogFooter ClassName="justify-end gap-x-1">
-    <WButtom OnClick="_ => FormHandler.SubmitAsync()">Save changes</WButtom>
-</DialogFooter>
+        <FieldSet>
+            <Field>
+                <FieldLabel for="username">Username</FieldLabel>
+                <TextInputField
+                    @bind-Value="Request.Username"
+                    id="username"
+                    placeholder="Name of the user"/>
+            </Field>
+            <Field>
+                <FieldLabel for="emailAddress">Email Address</FieldLabel>
+                <TextInputField
+                    @bind-Value="Request.Email"
+                    id="emailAddress"
+                    placeholder="email@of.user"/>
+            </Field>
+        </FieldSet>
+        <Field Orientation="FieldOrientation.Horizontal" ClassName="justify-end">
+            <SubmitButton>Save changes</SubmitButton>
+        </Field>
+    </FieldGroup>
+</EnhancedEditForm>
 
 @code
 {
-    [Parameter] public Func<UpdateUserDto, Task> OnSubmit { get; set; }
+    [Parameter] public Func<Task> OnCompleted { get; set; }
     [Parameter] public UserDto User { get; set; }
-    
+
     private UpdateUserDto Request;
-    private FormHandler FormHandler;
 
     protected override void OnInitialized()
     {
         Request = UserMapper.ToUpdate(User);
     }
 
-    private async Task SubmitAsync()
+    private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore)
     {
-        await OnSubmit.Invoke(Request);
+        var response = await HttpClient.PatchAsJsonAsync(
+            $"/api/admin/users/{User.Id}",
+            Request
+        );
+        
+        if (!response.IsSuccessStatusCode)
+        {
+            await ProblemDetailsHelper.HandleProblemDetailsAsync(response, Request, validationMessageStore);
+            return false;
+        }
 
+        await ToastService.SuccessAsync(
+            "User update",
+            $"Successfully updated user {Request.Username}"
+        );
+        
+        await OnCompleted.Invoke();
         await CloseAsync();
+
+        return true;
     }
 }
diff --git a/Moonlight.Frontend/UI/Admin/Views/Overview.razor b/Moonlight.Frontend/UI/Admin/Views/Overview.razor
index ddea7a73..f8e03c48 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Overview.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Overview.razor
@@ -133,7 +133,11 @@
                 {
                     <CardTitle ClassName="text-lg text-primary">Update available</CardTitle>
                     <CardAction ClassName="self-center">
-                        <Button @onclick="LaunchUpdateModalAsync">Update</Button>
+                        <Button>
+                            <Slot>
+                                <a href="/admin/system?tab=instance" @attributes="context">Update</a>
+                            </Slot>
+                        </Button>
                     </CardAction>
                 }
             </CardHeader>
@@ -156,9 +160,4 @@
 
         await InvokeAsync(StateHasChanged);
     }
-
-    private async Task LaunchUpdateModalAsync() => await DialogService.LaunchAsync<UpdateInstanceModal>(onConfigure: model =>
-    {
-        model.ShowCloseButton = false;
-    });
 }
diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/ApiKeys.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/ApiKeys.razor
index db99b5b2..9b76f917 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Sys/ApiKeys.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/ApiKeys.razor
@@ -1,12 +1,11 @@
-@using Moonlight.Shared.Http.Requests.ApiKeys
-@using Moonlight.Shared.Http.Responses.ApiKeys
-@using LucideBlazor
+@using LucideBlazor
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Moonlight.Frontend.UI.Admin.Modals
 @using Moonlight.Shared
 @using Moonlight.Shared.Http.Requests
 @using Moonlight.Shared.Http.Responses
+@using Moonlight.Shared.Http.Responses.Admin.ApiKeys
 @using ShadcnBlazor.DataGrids
 @using ShadcnBlazor.Dropdowns
 @using ShadcnBlazor.Extras.AlertDialogs
@@ -123,19 +122,8 @@
     {
         await DialogService.LaunchAsync<CreateApiKeyDialog>(parameters =>
         {
-            parameters[nameof(CreateApiKeyDialog.OnSubmit)] = async (CreateApiKeyDto dto) =>
+            parameters[nameof(CreateApiKeyDialog.OnSubmit)] = async () =>
             {
-                await HttpClient.PostAsJsonAsync(
-                    "/api/admin/apiKeys",
-                    dto,
-                    Constants.SerializerOptions
-                );
-
-                await ToastService.SuccessAsync(
-                    "API Key creation",
-                    $"Successfully created API key {dto.Name}"
-                );
-
                 await Grid.RefreshAsync();
             };
         });
@@ -146,19 +134,8 @@
         await DialogService.LaunchAsync<UpdateApiKeyDialog>(parameters =>
         {
             parameters[nameof(UpdateApiKeyDialog.Key)] = key;
-            parameters[nameof(UpdateApiKeyDialog.OnSubmit)] = async (UpdateApiKeyDto dto) =>
+            parameters[nameof(UpdateApiKeyDialog.OnSubmit)] = async () =>
             {
-                await HttpClient.PatchAsJsonAsync(
-                    $"/api/admin/apiKeys/{key.Id}",
-                    dto,
-                    Constants.SerializerOptions
-                );
-
-                await ToastService.SuccessAsync(
-                    "API Key update",
-                    $"Successfully updated API key {dto.Name}"
-                );
-
                 await Grid.RefreshAsync();
             };
         });
diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Diagnose.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Diagnose.razor
index 0cac7f81..f6433df8 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Sys/Diagnose.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Diagnose.razor
@@ -44,10 +44,10 @@
                 </Alert>
             </CardContent>
             <CardFooter ClassName="justify-end">
-                <WButtom OnClick="DiagnoseAsync" disabled="@(!AccessResult.Succeeded)">
+                <WButton OnClick="DiagnoseAsync" disabled="@(!AccessResult.Succeeded)">
                     <StethoscopeIcon/>
                     Start diagnostics
-                </WButtom>
+                </WButton>
             </CardFooter>
         </Card>
     </div>
diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Index.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Index.razor
index 6bc70e12..7d764378 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Sys/Index.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Index.razor
@@ -31,17 +31,13 @@
             <HeartPulseIcon/>
             Diagnose
         </TabsTrigger>
+        <TabsTrigger Value="instance">
+            <ContainerIcon/>
+            Instance
+        </TabsTrigger>
     </TabsList>
     <TabsContent Value="settings">
         <Card ClassName="mt-5">
-            <CardContent>
-                <div class="grid grid-cols-1 lg:grid-cols-3 gap-5">
-                    <div class="col-span-1 grid gap-3">
-                        <Label for="instance-name">Instance Name</Label>
-                        <InputField id="instance-name" />
-                    </div>
-                </div>
-            </CardContent>
             <CardFooter ClassName="justify-end">
                 <Button>
                     <SaveIcon />
@@ -65,6 +61,9 @@
             <Moonlight.Frontend.UI.Admin.Views.Sys.Themes.Index />
         </TabsContent>
     }
+    <TabsContent Value="instance">
+        <Instance />
+    </TabsContent>
 </Tabs>
 
 @code
diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Instance.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Instance.razor
new file mode 100644
index 00000000..6f0bd3cc
--- /dev/null
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Instance.razor
@@ -0,0 +1,201 @@
+@using System.Text.RegularExpressions
+@using LucideBlazor
+@using Moonlight.Frontend.UI.Admin.Modals
+@using Moonlight.Shared.Http.Responses.Admin
+@using ShadcnBlazor.Cards
+@using ShadcnBlazor.Emptys
+@using ShadcnBlazor.Buttons
+@using ShadcnBlazor.Extras.AlertDialogs
+@using ShadcnBlazor.Extras.Common
+@using ShadcnBlazor.Extras.Dialogs
+@using ShadcnBlazor.Fields
+@using ShadcnBlazor.Selects
+@using ShadcnBlazor.Switches
+
+@inject HttpClient HttpClient
+@inject DialogService DialogService
+@inject AlertDialogService AlertDialogService
+
+<div class="mt-5">
+    <LazyLoader Load="LoadAsync">
+        @if (StatusDto.IsEnabled)
+        {
+            if (StatusDto.IsReachable)
+            {
+                <div class="grid grid-cols-1 lg:grid-cols-2 gap-5">
+                    <Card ClassName="col-span-1">
+                        <CardHeader>
+                            <CardTitle>Version</CardTitle>
+                        </CardHeader>
+                        <CardContent>
+                            <FieldGroup>
+                                <FieldSet>
+                                    <Field>
+                                        <FieldLabel>Version / Branch</FieldLabel>
+                                        <FieldContent>
+                                            <Select DefaultValue="@SelectedVersion" @bind-Value="SelectedVersion">
+                                                <SelectTrigger ClassName="w-64">
+                                                    <SelectValue/>
+                                                </SelectTrigger>
+                                                <SelectContent ClassName="w-64">
+                                                    <SelectItem Value="v2.1">v2.1</SelectItem>
+                                                    <SelectItem Value="v2.1.1">v2.1.1</SelectItem>
+                                                    <SelectItem Value="feat/ContainerHelper">feat/ContainerHelper
+                                                    </SelectItem>
+                                                </SelectContent>
+                                            </Select>
+                                        </FieldContent>
+                                    </Field>
+                                    <Field>
+                                        <FieldLabel>Bypass Build Cache</FieldLabel>
+                                        <FieldContent>
+                                            <Switch @bind-Value="NoBuildCache" />
+                                        </FieldContent>
+                                    </Field>
+                                </FieldSet>
+                                <Field Orientation="FieldOrientation.Horizontal">
+                                    <Button @onclick="AskApplyAsync">Apply</Button>
+                                </Field>
+                            </FieldGroup>
+                        </CardContent>
+                    </Card>
+                    <Card ClassName="col-span-1">
+                        <CardHeader>
+                            <CardTitle>Plugins</CardTitle>
+                        </CardHeader>
+                        <CardContent>
+                            <Empty>
+                                <EmptyHeader>
+                                    <EmptyMedia Variant="EmptyMediaVariant.Icon">
+                                        <SearchIcon/>
+                                    </EmptyMedia>
+                                    <EmptyTitle>No Plugins found</EmptyTitle>
+                                    <EmptyDescription>
+                                        No plugins found in instance configuration
+                                    </EmptyDescription>
+                                </EmptyHeader>
+                            </Empty>
+                        </CardContent>
+                    </Card>
+                </div>
+            }
+            else
+            {
+                <Empty>
+                    <EmptyHeader>
+                        <EmptyMedia Variant="EmptyMediaVariant.Icon">
+                            <CircleAlertIcon ClassName="text-red-500"/>
+                        </EmptyMedia>
+                        <EmptyTitle>Container Helper unreachable</EmptyTitle>
+                        <EmptyDescription>
+                            The container helper is unreachable. No management actions are available
+                        </EmptyDescription>
+                    </EmptyHeader>
+                </Empty>
+            }
+        }
+        else
+        {
+            <Empty>
+                <EmptyHeader>
+                    <EmptyMedia Variant="EmptyMediaVariant.Icon">
+                        <ToggleLeftIcon/>
+                    </EmptyMedia>
+                    <EmptyTitle>Container Helper is disabled</EmptyTitle>
+                    <EmptyDescription>
+                        The container helper is disabled on this instance.
+                        This might be due to running a multiple container moonlight setup
+                    </EmptyDescription>
+                </EmptyHeader>
+            </Empty>
+        }
+    </LazyLoader>
+</div>
+
+@code
+{
+    private ContainerHelperStatusDto StatusDto;
+    private string SelectedVersion = "v2.1";
+    private bool NoBuildCache;
+
+    private async Task LoadAsync(LazyLoader _)
+    {
+        StatusDto = (await HttpClient.GetFromJsonAsync<ContainerHelperStatusDto>("api/admin/ch/status"))!;
+    }
+
+    private async Task ApplyAsync()
+    {
+        await DialogService.LaunchAsync<UpdateInstanceModal>(
+            parameters =>
+            {
+                parameters[nameof(UpdateInstanceModal.Version)] = SelectedVersion;
+                parameters[nameof(UpdateInstanceModal.NoBuildCache)] = NoBuildCache;
+            },
+            onConfigure: model =>
+            {
+                model.ShowCloseButton = false;
+                model.ClassName = "sm:max-w-4xl!";
+            }
+        );
+    }
+
+    private async Task AskApplyAsync()
+    {
+        if (string.IsNullOrWhiteSpace(SelectedVersion))
+            return;
+
+        var shouldContinue = await ConfirmRiskyVersionAsync(
+            "Moonlight Rebuild",
+            "If you continue the moonlight instance will become unavailable during the rebuild process. This will impact users on this instance"
+        );
+
+        if (!shouldContinue)
+            return;
+
+        if (!Regex.IsMatch(SelectedVersion, @"^v\d+(\.\d+)*b?$"))
+        {
+            shouldContinue = await ConfirmRiskyVersionAsync(
+                "Development Version",
+                "You are about to install development a version. This can break your instance. Continue at your own risk"
+            );
+        }
+        else
+        {
+            if (SelectedVersion.EndsWith('b'))
+            {
+                shouldContinue = await ConfirmRiskyVersionAsync(
+                    "Beta / Pre-Release Version",
+                    "You are about to install a version marked as pre-release / beta. This can break your instance. Continue at your own risk"
+                );
+            }
+            else
+                shouldContinue = true;
+        }
+
+        if (!shouldContinue)
+            return;
+
+        await ApplyAsync();
+    }
+
+    private async Task<bool> ConfirmRiskyVersionAsync(string title, string message)
+    {
+        var tcs = new TaskCompletionSource();
+        var confirmed = false;
+
+        await AlertDialogService.ConfirmDangerAsync(
+            title,
+            message,
+            () =>
+            {
+                confirmed = true;
+                tcs.SetResult();
+                return Task.CompletedTask;
+            }
+        );
+
+        await tcs.Task;
+
+        return confirmed;
+    }
+}
diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor
index 9f12a2e5..be2711df 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor
@@ -3,14 +3,15 @@
 @using Microsoft.AspNetCore.Authorization
 @using Moonlight.Shared
 @using LucideBlazor
+@using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.Services
-@using Moonlight.Shared.Http.Requests.Themes
+@using Moonlight.Shared.Http.Requests.Admin.Themes
 @using ShadcnBlazor.Buttons
-@using ShadcnBlazor.Labels
 @using ShadcnBlazor.Cards
 @using ShadcnBlazor.Extras.Editors
-@using ShadcnBlazor.Extras.FormHandlers
+@using ShadcnBlazor.Extras.Forms
 @using ShadcnBlazor.Extras.Toasts
+@using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
 @using ShadcnBlazor.Switches
 
@@ -21,86 +22,89 @@
 @inject ToastService ToastService
 @inject FrontendService FrontendService
 
-<div class="flex flex-row justify-between">
-    <div class="flex flex-col">
-        <h1 class="text-xl font-semibold">Create theme</h1>
-        <div class="text-muted-foreground">
-            Create a new theme
+<EnhancedEditForm Model="Request" OnValidSubmit="OnSubmitAsync" Context="editFormContext">
+    <div class="flex flex-row justify-between">
+        <div class="flex flex-col">
+            <h1 class="text-xl font-semibold">Create theme</h1>
+            <div class="text-muted-foreground">
+                Create a new theme
+            </div>
+        </div>
+        <div class="flex flex-row gap-x-1.5">
+            <Button Variant="ButtonVariant.Secondary">
+                <Slot>
+                    <a href="/admin/system?tab=themes" @attributes="context">
+                        <ChevronLeftIcon/>
+                        Back
+                    </a>
+                </Slot>
+            </Button>
+            <SubmitButton>
+                <CheckIcon/>
+                Continue
+            </SubmitButton>
         </div>
     </div>
-    <div class="flex flex-row gap-x-1.5">
-        <Button Variant="ButtonVariant.Secondary">
-            <Slot>
-                <a href="/admin/system?tab=themes" @attributes="context">
-                    <ChevronLeftIcon/>
-                    Back
-                </a>
-            </Slot>
-        </Button>
-        <Button @onclick="SubmitAsync">
-            <CheckIcon/>
-            Continue
-        </Button>
-    </div>
-</div>
 
-<div class="mt-8">
-    <Card>
-        <CardContent>
-            <FormHandler @ref="Form" OnValidSubmit="OnSubmitAsync" Model="Request">
-                <div class="flex flex-col gap-6">
-                    
-                    <FormValidationSummary />
-                    
-                    <div class="grid grid-cols-1 lg:grid-cols-2 gap-5">
-                        <div class="col-span-1 grid gap-2">
-                            <Label for="themeName">Name</Label>
-                            <InputField
+    <div class="mt-8">
+        <Card>
+            <CardContent>
+                <FieldGroup>
+                    <FormValidationSummary/>
+                    <DataAnnotationsValidator/>
+
+                    <FieldSet ClassName="grid grid-cols-1 lg:grid-cols-2">
+                        <Field>
+                            <FieldLabel for="themeName">Name</FieldLabel>
+                            <TextInputField
                                 @bind-Value="Request.Name"
                                 id="themeName"
                                 placeholder="My cool theme"/>
-                        </div>
+                        </Field>
 
-                        <div class="col-span-1 grid gap-2">
-                            <Label for="themeVersion">Version</Label>
-                            <InputField
+                        <Field>
+                            <FieldLabel for="themeVersion">Version</FieldLabel>
+                            <TextInputField
                                 @bind-Value="Request.Version"
                                 id="themeVersion"
                                 Type="text"
                                 placeholder="1.0.0"/>
-                        </div>
-                        
-                        <div class="col-span-1 grid gap-2">
-                            <Label for="themeAuthor">Author</Label>
-                            <InputField
+                        </Field>
+
+                        <Field>
+                            <FieldLabel for="themeAuthor">Author</FieldLabel>
+                            <TextInputField
                                 @bind-Value="Request.Author"
                                 id="themeAuthor"
                                 Type="text"
                                 placeholder="Your name"/>
-                        </div>
-                        
-                        <div class="col-span-1 grid gap-2">
-                            <Label for="themeAuthor">Is Enabled</Label>
-                            <Switch @bind-Value="Request.IsEnabled" />
-                        </div>
-                    </div>
-                    
-                    <style>
-                        .cm-editor {
-                            max-height: 400px;
-                            min-height: 400px;
-                        }
-                    </style>
-                    
-                    <div class="grid gap-2">
-                        <Label for="themeAuthor">CSS Content</Label>
-                        <Editor @ref="Editor" Language="EditorLanguage.Css" InitialValue="@Request.CssContent"/>
-                    </div>
-                </div>
-            </FormHandler>
-        </CardContent>
-    </Card>
-</div>
+                        </Field>
+
+                        <Field>
+                            <FieldLabel for="themeAuthor">Is Enabled</FieldLabel>
+                            <FieldContent>
+                                <Switch @bind-Value="Request.IsEnabled"/>
+                            </FieldContent>
+                        </Field>
+                    </FieldSet>
+                    <Field>
+                        <style>
+                            .cm-editor {
+                                max-height: 400px;
+                                min-height: 400px;
+                            }
+                        </style>
+
+                        <FieldLabel for="themeAuthor">CSS Content</FieldLabel>
+                        <FieldContent>
+                            <Editor @ref="Editor" Language="EditorLanguage.Css" InitialValue="@Request.CssContent"/>
+                        </FieldContent>
+                    </Field>
+                </FieldGroup>
+            </CardContent>
+        </Card>
+    </div>
+</EnhancedEditForm>
 
 @code
 {
@@ -109,22 +113,23 @@
         CssContent = "/* Define your css here */"
     };
 
-    private FormHandler Form;
     private Editor Editor;
 
-    private async Task SubmitAsync()
+    private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore)
     {
         Request.CssContent = await Editor.GetValueAsync();
-        await Form.SubmitAsync();
-    }
 
-    private async Task OnSubmitAsync()
-    {
-        await HttpClient.PostAsJsonAsync(
+        var response = await HttpClient.PostAsJsonAsync(
             "/api/admin/themes",
             Request,
             Constants.SerializerOptions
         );
+        
+        if (!response.IsSuccessStatusCode)
+        {
+            await ProblemDetailsHelper.HandleProblemDetailsAsync(response, Request, validationMessageStore);
+            return false;
+        }
 
         await ToastService.SuccessAsync(
             "Theme creation",
@@ -134,5 +139,7 @@
         await FrontendService.ReloadAsync();
 
         Navigation.NavigateTo("/admin/system?tab=themes");
+
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Index.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Index.razor
index 17208173..c90c0dfd 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Index.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Index.razor
@@ -4,7 +4,7 @@
 @using Moonlight.Shared
 @using Moonlight.Shared.Http.Requests
 @using Moonlight.Shared.Http.Responses
-@using Moonlight.Shared.Http.Responses.Themes
+@using Moonlight.Shared.Http.Responses.Admin.Themes
 @using ShadcnBlazor.DataGrids
 @using ShadcnBlazor.Dropdowns
 @using ShadcnBlazor.Extras.AlertDialogs
diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor
index 2de60d7e..4c19541f 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor
@@ -3,17 +3,18 @@
 @using Microsoft.AspNetCore.Authorization
 @using Moonlight.Shared
 @using LucideBlazor
+@using Moonlight.Frontend.Helpers
 @using Moonlight.Frontend.Mappers
 @using Moonlight.Frontend.Services
-@using Moonlight.Shared.Http.Requests.Themes
-@using Moonlight.Shared.Http.Responses.Themes
+@using Moonlight.Shared.Http.Requests.Admin.Themes
+@using Moonlight.Shared.Http.Responses.Admin.Themes
 @using ShadcnBlazor.Buttons
-@using ShadcnBlazor.Labels
 @using ShadcnBlazor.Cards
 @using ShadcnBlazor.Extras.Common
 @using ShadcnBlazor.Extras.Editors
-@using ShadcnBlazor.Extras.FormHandlers
+@using ShadcnBlazor.Extras.Forms
 @using ShadcnBlazor.Extras.Toasts
+@using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
 @using ShadcnBlazor.Switches
 
@@ -24,99 +25,102 @@
 @inject ToastService ToastService
 @inject FrontendService FrontendService
 
-<div class="flex flex-row justify-between">
-    <div class="flex flex-col">
-        <h1 class="text-xl font-semibold">Update theme</h1>
-        <div class="text-muted-foreground">
-            Update the theme
+<LazyLoader Load="LoadAsync">
+    <EnhancedEditForm Model="Request" OnValidSubmit="OnSubmitAsync" Context="editFormContext">
+        <div class="flex flex-row justify-between">
+            <div class="flex flex-col">
+                <h1 class="text-xl font-semibold">Update theme</h1>
+                <div class="text-muted-foreground">
+                    Update the theme
+                </div>
+            </div>
+            <div class="flex flex-row gap-x-1.5">
+                <Button Variant="ButtonVariant.Secondary">
+                    <Slot>
+                        <a href="/admin/system?tab=themes" @attributes="context">
+                            <ChevronLeftIcon/>
+                            Back
+                        </a>
+                    </Slot>
+                </Button>
+                <SubmitButton>
+                    <CheckIcon/>
+                    Continue
+                </SubmitButton>
+            </div>
         </div>
-    </div>
-    <div class="flex flex-row gap-x-1.5">
-        <Button Variant="ButtonVariant.Secondary">
-            <Slot>
-                <a href="/admin/system?tab=themes" @attributes="context">
-                    <ChevronLeftIcon/>
-                    Back
-                </a>
-            </Slot>
-        </Button>
-        <Button @onclick="SubmitAsync">
-            <CheckIcon/>
-            Continue
-        </Button>
-    </div>
-</div>
-
-<div class="mt-8">
-    <Card>
-        <CardContent>
-            <LazyLoader Load="LoadAsync">
-                <FormHandler @ref="Form" OnValidSubmit="OnSubmitAsync" Model="Request">
-                    <div class="flex flex-col gap-6">
 
+        <div class="mt-8">
+            <Card>
+                <CardContent>
+                    <FieldGroup>
                         <FormValidationSummary/>
+                        <DataAnnotationsValidator/>
 
-                        <div class="grid grid-cols-1 lg:grid-cols-2 gap-5">
-                            <div class="col-span-1 grid gap-2">
-                                <Label for="themeName">Name</Label>
-                                <InputField
+                        <FieldSet ClassName="grid grid-cols-1 lg:grid-cols-2">
+                            <Field>
+                                <FieldLabel for="themeName">Name</FieldLabel>
+                                <TextInputField
                                     @bind-Value="Request.Name"
                                     id="themeName"
                                     placeholder="My cool theme"/>
-                            </div>
+                            </Field>
 
-                            <div class="col-span-1 grid gap-2">
-                                <Label for="themeVersion">Version</Label>
-                                <InputField
+                            <Field>
+                                <FieldLabel for="themeVersion">Version</FieldLabel>
+                                <TextInputField
                                     @bind-Value="Request.Version"
                                     id="themeVersion"
                                     Type="text"
                                     placeholder="1.0.0"/>
-                            </div>
+                            </Field>
 
-                            <div class="col-span-1 grid gap-2">
-                                <Label for="themeAuthor">Author</Label>
-                                <InputField
+                            <Field>
+                                <FieldLabel for="themeAuthor">Author</FieldLabel>
+                                <TextInputField
                                     @bind-Value="Request.Author"
                                     id="themeAuthor"
                                     Type="text"
                                     placeholder="Your name"/>
-                            </div>
+                            </Field>
 
-                            <div class="col-span-1 grid gap-2">
-                                <Label for="themeAuthor">Is Enabled</Label>
-                                <Switch @bind-Value="Request.IsEnabled" />
-                            </div>
-                        </div>
+                            <Field>
+                                <FieldLabel for="themeAuthor">Is Enabled</FieldLabel>
+                                <FieldContent>
+                                    <Switch @bind-Value="Request.IsEnabled"/>
+                                </FieldContent>
+                            </Field>
+                        </FieldSet>
+                        <Field>
+                            <style>
+                                .cm-editor {
+                                    max-height: 400px;
+                                    min-height: 400px;
+                                }
+                            </style>
 
-                        <style>
-                            .cm-editor {
-                                max-height: 400px;
-                                min-height: 400px;
-                            }
-                        </style>
-
-                        <div class="grid gap-2">
-                            <Label for="themeAuthor">CSS Content</Label>
-                            <Editor @ref="Editor" Language="EditorLanguage.Css" InitialValue="@Request.CssContent"/>
-                        </div>
-                    </div>
-                </FormHandler>
-            </LazyLoader>
-        </CardContent>
-    </Card>
-</div>
+                            <FieldLabel for="themeAuthor">CSS Content</FieldLabel>
+                            <FieldContent>
+                                <Editor @ref="Editor" Language="EditorLanguage.Css"
+                                        InitialValue="@Request.CssContent"/>
+                            </FieldContent>
+                        </Field>
+                    </FieldGroup>
+                </CardContent>
+            </Card>
+        </div>
+    </EnhancedEditForm>
+</LazyLoader>
 
 @code
 {
     [Parameter] public int Id { get; set; }
-    
+
     private UpdateThemeDto Request;
     private ThemeDto Theme;
-    
-    private FormHandler Form;
+
     private Editor Editor;
-    
+
     private async Task LoadAsync(LazyLoader _)
     {
         var theme = await HttpClient.GetFromJsonAsync<ThemeDto>($"api/admin/themes/{Id}");
@@ -125,19 +129,21 @@
         Request = ThemeMapper.ToUpdate(Theme);
     }
 
-    private async Task SubmitAsync()
+    private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore)
     {
         Request.CssContent = await Editor.GetValueAsync();
-        await Form.SubmitAsync();
-    }
 
-    private async Task OnSubmitAsync()
-    {
-        await HttpClient.PatchAsJsonAsync(
+        var response = await HttpClient.PatchAsJsonAsync(
             $"/api/admin/themes/{Theme.Id}",
             Request,
             Constants.SerializerOptions
         );
+        
+        if (!response.IsSuccessStatusCode)
+        {
+            await ProblemDetailsHelper.HandleProblemDetailsAsync(response, Request, validationMessageStore);
+            return false;
+        }
 
         await ToastService.SuccessAsync(
             "Theme update",
@@ -147,5 +153,7 @@
         await FrontendService.ReloadAsync();
 
         Navigation.NavigateTo("/admin/system?tab=themes");
+
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Moonlight.Frontend/UI/Admin/Views/Users/Roles.razor b/Moonlight.Frontend/UI/Admin/Views/Users/Roles.razor
index 7d7753ce..a84bf8ba 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Users/Roles.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Users/Roles.razor
@@ -4,7 +4,6 @@
 @using Moonlight.Frontend.UI.Admin.Modals
 @using Moonlight.Shared
 @using Moonlight.Shared.Http.Requests
-@using Moonlight.Shared.Http.Requests.Roles
 @using Moonlight.Shared.Http.Responses
 @using Moonlight.Shared.Http.Responses.Admin
 @using ShadcnBlazor.DataGrids
@@ -134,15 +133,8 @@
     {
         await DialogService.LaunchAsync<CreateRoleDialog>(parameters =>
         {
-            parameters[nameof(CreateRoleDialog.OnSubmit)] = async Task (CreateRoleDto request) =>
+            parameters[nameof(CreateRoleDialog.OnSubmit)] = async Task () =>
             {
-                await HttpClient.PostAsJsonAsync(
-                    "api/admin/roles",
-                    request,
-                    Constants.SerializerOptions
-                );
-
-                await ToastService.SuccessAsync("Role creation", $"Role {request.Name} has been successfully created");
                 await Grid.RefreshAsync();
             };
         });
@@ -153,15 +145,8 @@
         await DialogService.LaunchAsync<UpdateRoleDialog>(parameters =>
         {
             parameters[nameof(UpdateRoleDialog.Role)] = role;
-            parameters[nameof(UpdateRoleDialog.OnSubmit)] = async Task (UpdateRoleDto request) =>
+            parameters[nameof(UpdateRoleDialog.OnSubmit)] = async Task () =>
             {
-                await HttpClient.PatchAsJsonAsync(
-                    $"api/admin/roles/{role.Id}",
-                    request,
-                    Constants.SerializerOptions
-                );
-
-                await ToastService.SuccessAsync("Role update", $"Role {request.Name} has been successfully updated");
                 await Grid.RefreshAsync();
             };
         });
diff --git a/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor b/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor
index 55f49383..c6a4e752 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor
@@ -10,9 +10,8 @@
 @using ShadcnBlazor.Extras.Toasts
 @using ShadcnBlazor.Tabels
 @using Moonlight.Shared.Http.Requests
-@using Moonlight.Shared.Http.Requests.Users
 @using Moonlight.Shared.Http.Responses
-@using Moonlight.Shared.Http.Responses.Users
+@using Moonlight.Shared.Http.Responses.Admin.Users
 @using ShadcnBlazor.Extras.Dialogs
 
 @inject HttpClient HttpClient
@@ -124,19 +123,8 @@
     {
         await DialogService.LaunchAsync<CreateUserDialog>(parameters =>
         {
-            parameters[nameof(CreateUserDialog.OnSubmit)] = async (CreateUserDto dto) =>
+            parameters[nameof(CreateUserDialog.OnCompleted)] = async () =>
             {
-                await HttpClient.PostAsJsonAsync(
-                    "/api/admin/users",
-                    dto,
-                    Constants.SerializerOptions
-                );
-
-                await ToastService.SuccessAsync(
-                    "User creation",
-                    $"Successfully created user {dto.Username}"
-                );
-
                 await Grid.RefreshAsync();
             };
         });
@@ -147,18 +135,8 @@
         await DialogService.LaunchAsync<UpdateUserDialog>(parameters =>
         {
             parameters[nameof(UpdateUserDialog.User)] = user;
-            parameters[nameof(CreateUserDialog.OnSubmit)] = async (UpdateUserDto dto) =>
+            parameters[nameof(UpdateUserDialog.OnCompleted)] = async () =>
             {
-                await HttpClient.PatchAsJsonAsync(
-                    $"/api/admin/users/{user.Id}",
-                    dto
-                );
-
-                await ToastService.SuccessAsync(
-                    "User update",
-                    $"Successfully updated user {dto.Username}"
-                );
-
                 await Grid.RefreshAsync();
             };
         });
diff --git a/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor b/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor
index 1278c182..22a2f7eb 100644
--- a/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor
+++ b/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor
@@ -1,7 +1,7 @@
-@using ShadcnBlazor.Cards
+@using Moonlight.Shared.Http.Responses.Admin.Auth
+@using ShadcnBlazor.Cards
 @using ShadcnBlazor.Spinners
 @using ShadcnBlazor.Buttons
-@using Moonlight.Shared.Http.Responses.Auth
 
 @inject HttpClient HttpClient
 @inject NavigationManager Navigation
diff --git a/Moonlight.Shared/Http/Events/RebuildEventDto.cs b/Moonlight.Shared/Http/Events/RebuildEventDto.cs
new file mode 100644
index 00000000..ecfdefb8
--- /dev/null
+++ b/Moonlight.Shared/Http/Events/RebuildEventDto.cs
@@ -0,0 +1,20 @@
+using System.Text.Json.Serialization;
+
+namespace Moonlight.Shared.Http.Events;
+
+public struct RebuildEventDto
+{
+    [JsonPropertyName("type")]
+    public RebuildEventType Type { get; set; }
+    
+    [JsonPropertyName("data")]
+    public string Data { get; set; }
+}
+
+public enum RebuildEventType
+{
+    Log = 0,
+    Failed = 1,
+    Succeeded = 2,
+    Step = 3
+}
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Requests/ApiKeys/CreateApiKeyDto.cs b/Moonlight.Shared/Http/Requests/Admin/ApiKeys/CreateApiKeyDto.cs
similarity index 72%
rename from Moonlight.Shared/Http/Requests/ApiKeys/CreateApiKeyDto.cs
rename to Moonlight.Shared/Http/Requests/Admin/ApiKeys/CreateApiKeyDto.cs
index 12b28620..2b60a525 100644
--- a/Moonlight.Shared/Http/Requests/ApiKeys/CreateApiKeyDto.cs
+++ b/Moonlight.Shared/Http/Requests/Admin/ApiKeys/CreateApiKeyDto.cs
@@ -1,13 +1,16 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.ApiKeys;
+namespace Moonlight.Shared.Http.Requests.Admin.ApiKeys;
 
 public class CreateApiKeyDto
 {
+    [Required]
     [MaxLength(30)]
     public string Name { get; set; }
-
+    
     [MaxLength(300)] public string Description { get; set; } = "";
     
+    
+    [Required]
     public string[] Permissions { get; set; }
 }
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Requests/ApiKeys/UpdateApiKeyDto.cs b/Moonlight.Shared/Http/Requests/Admin/ApiKeys/UpdateApiKeyDto.cs
similarity index 73%
rename from Moonlight.Shared/Http/Requests/ApiKeys/UpdateApiKeyDto.cs
rename to Moonlight.Shared/Http/Requests/Admin/ApiKeys/UpdateApiKeyDto.cs
index 20f64b56..3c154ec7 100644
--- a/Moonlight.Shared/Http/Requests/ApiKeys/UpdateApiKeyDto.cs
+++ b/Moonlight.Shared/Http/Requests/Admin/ApiKeys/UpdateApiKeyDto.cs
@@ -1,13 +1,15 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.ApiKeys;
+namespace Moonlight.Shared.Http.Requests.Admin.ApiKeys;
 
 public class UpdateApiKeyDto
 {
+    [Required]
     [MaxLength(30)]
     public string Name { get; set; }
-
+    
     [MaxLength(300)] public string Description { get; set; } = "";
     
+    [Required]
     public string[] Permissions { get; set; }
 }
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Requests/Admin/ContainerHelper/RequestRebuildDto.cs b/Moonlight.Shared/Http/Requests/Admin/ContainerHelper/RequestRebuildDto.cs
new file mode 100644
index 00000000..335f7be5
--- /dev/null
+++ b/Moonlight.Shared/Http/Requests/Admin/ContainerHelper/RequestRebuildDto.cs
@@ -0,0 +1,15 @@
+namespace Moonlight.Shared.Http.Requests.Admin.ContainerHelper;
+
+public class RequestRebuildDto
+{
+    public bool NoBuildCache { get; set; }
+
+    public RequestRebuildDto()
+    {
+    }
+
+    public RequestRebuildDto(bool noBuildCache)
+    {
+        NoBuildCache = noBuildCache;
+    }
+}
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Requests/Admin/ContainerHelper/SetVersionDto.cs b/Moonlight.Shared/Http/Requests/Admin/ContainerHelper/SetVersionDto.cs
new file mode 100644
index 00000000..fab46fd1
--- /dev/null
+++ b/Moonlight.Shared/Http/Requests/Admin/ContainerHelper/SetVersionDto.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Moonlight.Shared.Http.Requests.Admin.ContainerHelper;
+
+public class SetVersionDto
+{
+    [Required]
+    [RegularExpression(@"^(?!\/|.*\/\/|.*\.\.|.*\/$)[A-Za-z0-9._/-]+$", ErrorMessage = "Invalid version format")]
+    public string Version { get; set; }
+}
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Requests/Roles/CreateRoleDto.cs b/Moonlight.Shared/Http/Requests/Admin/Roles/CreateRoleDto.cs
similarity index 83%
rename from Moonlight.Shared/Http/Requests/Roles/CreateRoleDto.cs
rename to Moonlight.Shared/Http/Requests/Admin/Roles/CreateRoleDto.cs
index 638673fd..6573aedd 100644
--- a/Moonlight.Shared/Http/Requests/Roles/CreateRoleDto.cs
+++ b/Moonlight.Shared/Http/Requests/Admin/Roles/CreateRoleDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Roles;
+namespace Moonlight.Shared.Http.Requests.Admin.Roles;
 
 public class CreateRoleDto
 {
diff --git a/Moonlight.Shared/Http/Requests/Roles/UpdateRoleDto.cs b/Moonlight.Shared/Http/Requests/Admin/Roles/UpdateRoleDto.cs
similarity index 83%
rename from Moonlight.Shared/Http/Requests/Roles/UpdateRoleDto.cs
rename to Moonlight.Shared/Http/Requests/Admin/Roles/UpdateRoleDto.cs
index d7a03ee6..57538cc2 100644
--- a/Moonlight.Shared/Http/Requests/Roles/UpdateRoleDto.cs
+++ b/Moonlight.Shared/Http/Requests/Admin/Roles/UpdateRoleDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Roles;
+namespace Moonlight.Shared.Http.Requests.Admin.Roles;
 
 public class UpdateRoleDto
 {
diff --git a/Moonlight.Shared/Http/Requests/Themes/CreateThemeDto.cs b/Moonlight.Shared/Http/Requests/Admin/Themes/CreateThemeDto.cs
similarity index 88%
rename from Moonlight.Shared/Http/Requests/Themes/CreateThemeDto.cs
rename to Moonlight.Shared/Http/Requests/Admin/Themes/CreateThemeDto.cs
index 01ebf5b0..36374de0 100644
--- a/Moonlight.Shared/Http/Requests/Themes/CreateThemeDto.cs
+++ b/Moonlight.Shared/Http/Requests/Admin/Themes/CreateThemeDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Themes;
+namespace Moonlight.Shared.Http.Requests.Admin.Themes;
 
 public class CreateThemeDto
 {
diff --git a/Moonlight.Shared/Http/Requests/Themes/UpdateThemeDto.cs b/Moonlight.Shared/Http/Requests/Admin/Themes/UpdateThemeDto.cs
similarity index 88%
rename from Moonlight.Shared/Http/Requests/Themes/UpdateThemeDto.cs
rename to Moonlight.Shared/Http/Requests/Admin/Themes/UpdateThemeDto.cs
index 0d22d223..ead52a32 100644
--- a/Moonlight.Shared/Http/Requests/Themes/UpdateThemeDto.cs
+++ b/Moonlight.Shared/Http/Requests/Admin/Themes/UpdateThemeDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Themes;
+namespace Moonlight.Shared.Http.Requests.Admin.Themes;
 
 public class UpdateThemeDto
 {
diff --git a/Moonlight.Shared/Http/Requests/Users/CreateUserDto.cs b/Moonlight.Shared/Http/Requests/Admin/Users/CreateUserDto.cs
similarity index 81%
rename from Moonlight.Shared/Http/Requests/Users/CreateUserDto.cs
rename to Moonlight.Shared/Http/Requests/Admin/Users/CreateUserDto.cs
index 826b7129..0c3b9d1b 100644
--- a/Moonlight.Shared/Http/Requests/Users/CreateUserDto.cs
+++ b/Moonlight.Shared/Http/Requests/Admin/Users/CreateUserDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Users;
+namespace Moonlight.Shared.Http.Requests.Admin.Users;
 
 public class CreateUserDto
 {
diff --git a/Moonlight.Shared/Http/Requests/Users/UpdateUserDto.cs b/Moonlight.Shared/Http/Requests/Admin/Users/UpdateUserDto.cs
similarity index 81%
rename from Moonlight.Shared/Http/Requests/Users/UpdateUserDto.cs
rename to Moonlight.Shared/Http/Requests/Admin/Users/UpdateUserDto.cs
index c2182bc1..96b33e87 100644
--- a/Moonlight.Shared/Http/Requests/Users/UpdateUserDto.cs
+++ b/Moonlight.Shared/Http/Requests/Admin/Users/UpdateUserDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Shared.Http.Requests.Users;
+namespace Moonlight.Shared.Http.Requests.Admin.Users;
 
 public class UpdateUserDto
 {
diff --git a/Moonlight.Shared/Http/Responses/ApiKeys/ApiKeyDto.cs b/Moonlight.Shared/Http/Responses/Admin/ApiKeys/ApiKeyDto.cs
similarity index 71%
rename from Moonlight.Shared/Http/Responses/ApiKeys/ApiKeyDto.cs
rename to Moonlight.Shared/Http/Responses/Admin/ApiKeys/ApiKeyDto.cs
index 8561d083..85158f42 100644
--- a/Moonlight.Shared/Http/Responses/ApiKeys/ApiKeyDto.cs
+++ b/Moonlight.Shared/Http/Responses/Admin/ApiKeys/ApiKeyDto.cs
@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.ApiKeys;
+namespace Moonlight.Shared.Http.Responses.Admin.ApiKeys;
 
 public record ApiKeyDto(int Id, string Name, string Description, string[] Permissions, string Key, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt);
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Responses/Admin/Auth/ClaimDto.cs b/Moonlight.Shared/Http/Responses/Admin/Auth/ClaimDto.cs
new file mode 100644
index 00000000..7d9ee7c1
--- /dev/null
+++ b/Moonlight.Shared/Http/Responses/Admin/Auth/ClaimDto.cs
@@ -0,0 +1,3 @@
+namespace Moonlight.Shared.Http.Responses.Admin.Auth;
+
+public record ClaimDto(string Type, string Value);
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Responses/Auth/SchemeDto.cs b/Moonlight.Shared/Http/Responses/Admin/Auth/SchemeDto.cs
similarity index 50%
rename from Moonlight.Shared/Http/Responses/Auth/SchemeDto.cs
rename to Moonlight.Shared/Http/Responses/Admin/Auth/SchemeDto.cs
index bd9fa7ce..4c2218bf 100644
--- a/Moonlight.Shared/Http/Responses/Auth/SchemeDto.cs
+++ b/Moonlight.Shared/Http/Responses/Admin/Auth/SchemeDto.cs
@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.Auth;
+namespace Moonlight.Shared.Http.Responses.Admin.Auth;
 
 public record SchemeDto(string Name, string DisplayName);
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Responses/Admin/ContainerHelperStatusDto.cs b/Moonlight.Shared/Http/Responses/Admin/ContainerHelperStatusDto.cs
new file mode 100644
index 00000000..16bc5866
--- /dev/null
+++ b/Moonlight.Shared/Http/Responses/Admin/ContainerHelperStatusDto.cs
@@ -0,0 +1,3 @@
+namespace Moonlight.Shared.Http.Responses.Admin;
+
+public record ContainerHelperStatusDto(bool IsEnabled, bool IsReachable);
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Responses/Frontend/FrontendConfigDto.cs b/Moonlight.Shared/Http/Responses/Admin/Frontend/FrontendConfigDto.cs
similarity index 52%
rename from Moonlight.Shared/Http/Responses/Frontend/FrontendConfigDto.cs
rename to Moonlight.Shared/Http/Responses/Admin/Frontend/FrontendConfigDto.cs
index 747e5d39..f1c7dd5a 100644
--- a/Moonlight.Shared/Http/Responses/Frontend/FrontendConfigDto.cs
+++ b/Moonlight.Shared/Http/Responses/Admin/Frontend/FrontendConfigDto.cs
@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.Frontend;
+namespace Moonlight.Shared.Http.Responses.Admin.Frontend;
 
 public record FrontendConfigDto(string Name, string? ThemeCss);
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Responses/Themes/ThemeDto.cs b/Moonlight.Shared/Http/Responses/Admin/Themes/ThemeDto.cs
similarity index 66%
rename from Moonlight.Shared/Http/Responses/Themes/ThemeDto.cs
rename to Moonlight.Shared/Http/Responses/Admin/Themes/ThemeDto.cs
index adc167dd..854bfd6e 100644
--- a/Moonlight.Shared/Http/Responses/Themes/ThemeDto.cs
+++ b/Moonlight.Shared/Http/Responses/Admin/Themes/ThemeDto.cs
@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.Themes;
+namespace Moonlight.Shared.Http.Responses.Admin.Themes;
 
 public record ThemeDto(int Id, string Name, string Author, string Version, string CssContent, bool IsEnabled);
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Responses/Users/UserDto.cs b/Moonlight.Shared/Http/Responses/Admin/Users/UserDto.cs
similarity index 66%
rename from Moonlight.Shared/Http/Responses/Users/UserDto.cs
rename to Moonlight.Shared/Http/Responses/Admin/Users/UserDto.cs
index 80a824ab..1060b50c 100644
--- a/Moonlight.Shared/Http/Responses/Users/UserDto.cs
+++ b/Moonlight.Shared/Http/Responses/Admin/Users/UserDto.cs
@@ -1,3 +1,3 @@
-namespace Moonlight.Shared.Http.Responses.Users;
+namespace Moonlight.Shared.Http.Responses.Admin.Users;
 
 public record UserDto(int Id, string Username, string Email, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt);
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs b/Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs
deleted file mode 100644
index 0b3c73a1..00000000
--- a/Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Moonlight.Shared.Http.Responses.Auth;
-
-public record ClaimDto(string Type, string Value);
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/Responses/ProblemDetails.cs b/Moonlight.Shared/Http/Responses/ProblemDetails.cs
new file mode 100644
index 00000000..0af3bc50
--- /dev/null
+++ b/Moonlight.Shared/Http/Responses/ProblemDetails.cs
@@ -0,0 +1,10 @@
+namespace Moonlight.Shared.Http.Responses;
+
+public class ProblemDetails
+{
+    public string Type { get; set; }
+    public string Title { get; set; }
+    public int Status { get; set; }
+    public string? Detail { get; set; }
+    public Dictionary<string, string[]>? Errors { get; set; }
+}
\ No newline at end of file
diff --git a/Moonlight.Shared/Http/SerializationContext.cs b/Moonlight.Shared/Http/SerializationContext.cs
index e306c219..a77737f8 100644
--- a/Moonlight.Shared/Http/SerializationContext.cs
+++ b/Moonlight.Shared/Http/SerializationContext.cs
@@ -1,14 +1,17 @@
-using System.Text.Json.Serialization;
-using Moonlight.Shared.Http.Requests.ApiKeys;
-using Moonlight.Shared.Http.Requests.Roles;
-using Moonlight.Shared.Http.Requests.Themes;
-using Moonlight.Shared.Http.Requests.Users;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Moonlight.Shared.Http.Events;
+using Moonlight.Shared.Http.Requests.Admin.ApiKeys;
+using Moonlight.Shared.Http.Requests.Admin.ContainerHelper;
+using Moonlight.Shared.Http.Requests.Admin.Roles;
+using Moonlight.Shared.Http.Requests.Admin.Themes;
+using Moonlight.Shared.Http.Requests.Admin.Users;
 using Moonlight.Shared.Http.Responses;
 using Moonlight.Shared.Http.Responses.Admin;
-using Moonlight.Shared.Http.Responses.ApiKeys;
-using Moonlight.Shared.Http.Responses.Auth;
-using Moonlight.Shared.Http.Responses.Themes;
-using Moonlight.Shared.Http.Responses.Users;
+using Moonlight.Shared.Http.Responses.Admin.ApiKeys;
+using Moonlight.Shared.Http.Responses.Admin.Auth;
+using Moonlight.Shared.Http.Responses.Admin.Themes;
+using Moonlight.Shared.Http.Responses.Admin.Users;
 
 namespace Moonlight.Shared.Http;
 
@@ -44,8 +47,32 @@ namespace Moonlight.Shared.Http;
 [JsonSerializable(typeof(PagedData<ThemeDto>))]
 [JsonSerializable(typeof(ThemeDto))]
 
+// Events
+[JsonSerializable(typeof(RebuildEventDto))]
+
+// Container Helper
+[JsonSerializable(typeof(ContainerHelperStatusDto))]
+[JsonSerializable(typeof(RequestRebuildDto))]
+[JsonSerializable(typeof(SetVersionDto))]
+
 //Misc
 [JsonSerializable(typeof(VersionDto))]
+[JsonSerializable(typeof(ProblemDetails))]
 public partial class SerializationContext : JsonSerializerContext
 {
+    private static JsonSerializerOptions? InternalTunedOptions;
+
+    public static JsonSerializerOptions TunedOptions
+    {
+        get
+        {
+            if (InternalTunedOptions != null)
+                return InternalTunedOptions;
+
+            InternalTunedOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web);
+            InternalTunedOptions.TypeInfoResolverChain.Add(Default);
+
+            return InternalTunedOptions;
+        }
+    }
 }
\ No newline at end of file
diff --git a/compose.yaml b/compose.yaml
index 3f80e03b..f19057b5 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -36,4 +36,32 @@
       
       # Logging
       - "Logging__LogLevel__Default=Information"
-      - "Logging__LogLevel__Microsoft.AspNetCore=Warning"
\ No newline at end of file
+      - "Logging__LogLevel__Microsoft.AspNetCore=Warning"
+      - "Logging__LogLevel__System.Net.Http.HttpClient=Warning"
+
+      - "Moonlight__ContainerHelper__IsEnabled=true"
+      - "Moonlight__ContainerHelper__Url=http://app:8080"
+  
+  app:
+    image: git.battlestati.one/moonlight-panel/container_helper
+
+    group_add:
+      - "989"
+
+    environment:
+      # Logging
+      - "Logging__LogLevel__Default=Information"
+      - "Logging__LogLevel__Microsoft.AspNetCore=Warning"
+
+      # Compose
+      - "ContainerHelper__Compose__Directory=${PWD}"
+      - "ContainerHelper__Compose__Binary=docker-compose"
+      - "ContainerHelper__Service__Name=api"
+      
+      # HTTP Proxy
+      - "HTTP_PROXY=${HTTP_PROXY}"
+      - "HTTPS_PROXY=${HTTPS_PROXY}"
+
+    volumes:
+      - "${PWD}:${PWD}"
+      - "/var/run/docker.sock:/var/run/docker.sock"
\ No newline at end of file