diff --git a/MoonlightServers.ApiServer/Http/Controllers/Admin/Stars/StarDockerImagesController.cs b/MoonlightServers.ApiServer/Http/Controllers/Admin/Stars/StarDockerImagesController.cs
new file mode 100644
index 0000000..da68dc3
--- /dev/null
+++ b/MoonlightServers.ApiServer/Http/Controllers/Admin/Stars/StarDockerImagesController.cs
@@ -0,0 +1,94 @@
+using Microsoft.AspNetCore.Mvc;
+using MoonCore.Exceptions;
+using MoonCore.Extended.Abstractions;
+using MoonCore.Extended.Helpers;
+using MoonCore.Helpers;
+using MoonCore.Models;
+using MoonlightServers.ApiServer.Database.Entities;
+using MoonlightServers.Shared.Http.Requests.Admin.StarDockerImages;
+using MoonlightServers.Shared.Http.Responses.Admin.StarDockerImages;
+
+namespace MoonlightServers.ApiServer.Http.Controllers.Admin.Stars;
+
+[ApiController]
+[Route("api/admin/servers/stars")]
+public class StarDockerImagesController : Controller
+{
+    private readonly CrudHelper<StarDockerImage, StarDockerImageDetailResponse> CrudHelper;
+    private readonly DatabaseRepository<Star> StarRepository;
+    private readonly DatabaseRepository<StarDockerImage> StarDockerImageRepository;
+    
+    private Star Star;
+
+    public StarDockerImagesController(
+        CrudHelper<StarDockerImage, StarDockerImageDetailResponse> crudHelper,
+        DatabaseRepository<Star> starRepository,
+        DatabaseRepository<StarDockerImage> starDockerImageRepository
+    )
+    {
+        CrudHelper = crudHelper;
+        StarRepository = starRepository;
+        StarDockerImageRepository = starDockerImageRepository;
+    }
+    
+    private void ApplyStar(int id)
+    {
+        var star = StarRepository
+            .Get()
+            .FirstOrDefault(x => x.Id == id);
+
+        if (star == null)
+            throw new HttpApiException("A star with this id could not be found", 404);
+
+        Star = star;
+
+        CrudHelper.QueryModifier = dockerImages =>
+            dockerImages.Where(x => x.Star.Id == star.Id);
+    }
+
+    [HttpGet("{starId:int}/dockerImages")]
+    public async Task<IPagedData<StarDockerImageDetailResponse>> Get([FromRoute] int starId, [FromQuery] int page, [FromQuery] int pageSize)
+    {
+        ApplyStar(starId);
+        
+        return await CrudHelper.Get(page, pageSize);
+    }
+
+    [HttpGet("{starId:int}/dockerImages/{id:int}")]
+    public async Task<StarDockerImageDetailResponse> GetSingle([FromRoute] int starId, [FromRoute] int id)
+    {
+        ApplyStar(starId);
+        
+        return await CrudHelper.GetSingle(id);
+    }
+
+    [HttpPost("{starId:int}/dockerImages")]
+    public async Task<StarDockerImageDetailResponse> Create([FromRoute] int starId, [FromBody] CreateStarDockerImageRequest request)
+    {
+        ApplyStar(starId);
+        
+        var starDockerImage = Mapper.Map<StarDockerImage>(request);
+        starDockerImage.Star = Star;
+
+        var finalVariable = StarDockerImageRepository.Add(starDockerImage);
+
+        return CrudHelper.MapToResult(finalVariable);
+    }
+
+    [HttpPatch("{starId:int}/dockerImages/{id:int}")]
+    public async Task<StarDockerImageDetailResponse> Update([FromRoute] int starId, [FromRoute] int id,
+        [FromBody] UpdateStarDockerImageRequest request)
+    {
+        ApplyStar(starId);
+        
+        return await CrudHelper.Update(id, request);
+    }
+
+    [HttpDelete("{starId:int}/dockerImages/{id:int}")]
+    public async Task Delete([FromRoute] int starId, [FromRoute] int id)
+    {
+        ApplyStar(starId);
+        
+        await CrudHelper.Delete(id);
+    }
+}
\ No newline at end of file
diff --git a/MoonlightServers.Frontend/UI/Components/Stars/Modals/CreateDockerImageModal.razor b/MoonlightServers.Frontend/UI/Components/Stars/Modals/CreateDockerImageModal.razor
new file mode 100644
index 0000000..7ae71b7
--- /dev/null
+++ b/MoonlightServers.Frontend/UI/Components/Stars/Modals/CreateDockerImageModal.razor
@@ -0,0 +1,58 @@
+@using MoonCore.Blazor.Tailwind.Modals.Components
+@using MoonlightServers.Shared.Enums
+@using MoonlightServers.Frontend.UI.Components.Forms
+@using MoonCore.Blazor.Tailwind.Components
+@using MoonlightServers.Shared.Http.Requests.Admin.StarDockerImages
+
+@inherits BaseModal
+
+<h1 class="mb-5 font-semibold text-xl">Add a new variable</h1>
+
+<HandleForm @ref="HandleForm" Model="Form" OnValidSubmit="OnValidSubmit">
+    <div class="grid grid-cols-2 gap-2">
+        <div class="col-span-2">
+            <label class="block text-sm font-medium leading-6 text-white">Display Name</label>
+            <input @bind="Form.DisplayName" type="text" class="form-input w-full"/>
+        </div>
+
+        <div class="col-span-2">
+            <label class="block text-sm font-medium leading-6 text-white">Identifier</label>
+            <input @bind="Form.Identifier" type="text" class="form-input w-full"/>
+        </div>
+
+        <div class="col-span-2">
+            <label class="block text-sm font-medium leading-6 text-white">Automatic pulling</label>
+            <Switch @bind-Value="Form.AutoPulling"/>
+        </div>
+    </div>
+</HandleForm>
+
+<div class="mt-5 flex space-x-2">
+    <WButton OnClick="_ => Hide()" CssClasses="btn btn-secondary grow">Cancel</WButton>
+    <WButton OnClick="_ => Submit()" CssClasses="btn btn-primary grow">Create</WButton>
+</div>
+
+@code
+{
+    [Parameter] public Func<CreateStarDockerImageRequest, Task> OnSubmit { get; set; }
+
+    private CreateStarDockerImageRequest Form;
+    private HandleForm HandleForm;
+
+    protected override void OnInitialized()
+    {
+        // Set default values
+        Form = new()
+        {
+            AutoPulling = true
+        };
+    }
+
+    private async Task OnValidSubmit()
+    {
+        await OnSubmit.Invoke(Form);
+        await Hide();
+    }
+
+    private Task Submit() => HandleForm.Submit();
+}
\ No newline at end of file
diff --git a/MoonlightServers.Frontend/UI/Components/Stars/Modals/CreateStarVariableModal.razor b/MoonlightServers.Frontend/UI/Components/Stars/Modals/CreateVariableModal.razor
similarity index 100%
rename from MoonlightServers.Frontend/UI/Components/Stars/Modals/CreateStarVariableModal.razor
rename to MoonlightServers.Frontend/UI/Components/Stars/Modals/CreateVariableModal.razor
diff --git a/MoonlightServers.Frontend/UI/Components/Stars/Modals/UpdateDockerImageModal.razor b/MoonlightServers.Frontend/UI/Components/Stars/Modals/UpdateDockerImageModal.razor
new file mode 100644
index 0000000..03ad462
--- /dev/null
+++ b/MoonlightServers.Frontend/UI/Components/Stars/Modals/UpdateDockerImageModal.razor
@@ -0,0 +1,56 @@
+@using MoonCore.Blazor.Tailwind.Modals.Components
+@using MoonlightServers.Frontend.UI.Components.Forms
+@using MoonCore.Blazor.Tailwind.Components
+@using MoonCore.Helpers
+@using MoonlightServers.Shared.Http.Requests.Admin.StarDockerImages
+@using MoonlightServers.Shared.Http.Responses.Admin.StarDockerImages
+
+@inherits BaseModal
+
+<h1 class="mb-5 font-semibold text-xl">Update variable</h1>
+
+<HandleForm @ref="HandleForm" Model="Form" OnValidSubmit="OnValidSubmit">
+    <div class="grid grid-cols-2 gap-2">
+        <div class="col-span-2">
+            <label class="block text-sm font-medium leading-6 text-white">Display Name</label>
+            <input @bind="Form.DisplayName" type="text" class="form-input w-full"/>
+        </div>
+
+        <div class="col-span-2">
+            <label class="block text-sm font-medium leading-6 text-white">Identifier</label>
+            <input @bind="Form.Identifier" type="text" class="form-input w-full"/>
+        </div>
+
+        <div class="col-span-2">
+            <label class="block text-sm font-medium leading-6 text-white">Automatic pulling</label>
+            <Switch @bind-Value="Form.AutoPulling"/>
+        </div>
+    </div>
+</HandleForm>
+
+<div class="mt-5 flex space-x-2">
+    <WButton OnClick="_ => Hide()" CssClasses="btn btn-secondary grow">Cancel</WButton>
+    <WButton OnClick="_ => Submit()" CssClasses="btn btn-primary grow">Update</WButton>
+</div>
+
+@code
+{
+    [Parameter] public Func<UpdateStarDockerImageRequest, Task> OnSubmit { get; set; }
+    [Parameter] public StarDockerImageDetailResponse DockerImage { get; set; }
+
+    private UpdateStarDockerImageRequest Form;
+    private HandleForm HandleForm;
+
+    protected override void OnInitialized()
+    {
+        Form = Mapper.Map<UpdateStarDockerImageRequest>(DockerImage);
+    }
+
+    private async Task OnValidSubmit()
+    {
+        await OnSubmit.Invoke(Form);
+        await Hide();
+    }
+
+    private Task Submit() => HandleForm.Submit();
+}
\ No newline at end of file
diff --git a/MoonlightServers.Frontend/UI/Components/Stars/Modals/UpdateStarVariableModel.razor b/MoonlightServers.Frontend/UI/Components/Stars/Modals/UpdateVariableModal.razor
similarity index 100%
rename from MoonlightServers.Frontend/UI/Components/Stars/Modals/UpdateStarVariableModel.razor
rename to MoonlightServers.Frontend/UI/Components/Stars/Modals/UpdateVariableModal.razor
diff --git a/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/DockerImageStarUpdate.razor b/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/DockerImageStarUpdate.razor
new file mode 100644
index 0000000..dec212c
--- /dev/null
+++ b/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/DockerImageStarUpdate.razor
@@ -0,0 +1,110 @@
+@using MoonCore.Blazor.Tailwind.Alerts
+@using MoonCore.Blazor.Tailwind.Components
+@using MoonCore.Blazor.Tailwind.Modals
+@using MoonCore.Blazor.Tailwind.Toasts
+@using MoonCore.Helpers
+@using MoonCore.Models
+@using MoonlightServers.Frontend.UI.Components.Stars.Modals
+@using MoonlightServers.Shared.Http.Requests.Admin.StarDockerImages
+@using MoonlightServers.Shared.Http.Responses.Admin.StarDockerImages
+@using MoonlightServers.Shared.Http.Responses.Admin.Stars
+
+@inject HttpApiClient ApiClient
+@inject ModalService ModalService
+@inject ToastService ToastService
+@inject AlertService AlertService
+
+<div class="flex justify-end mb-5">
+    <button type="button" @onclick="AddDockerImage" class="btn btn-primary">Add docker image</button>
+</div>
+
+<LazyLoader @ref="LazyLoader" Load="Load">
+    <div class="grid sm:grid-cols-2 xl:grid-cols-3 gap-4">
+        @foreach (var dockerImage in DockerImages)
+        {
+            <div class="col-span-1 card card-body p-2.5">
+                <div class="flex items-center justify-between">
+                    <div class="ml-3">
+                        <i class="icon-container text-xl align-middle mr-2"></i>
+                        <span class="align-middle text-lg">@dockerImage.DisplayName</span>
+                    </div>
+
+                    <div class="gap-x-2">
+                        <button @onclick="() => UpdateDockerImage(dockerImage)" class="btn btn-primary">
+                            <i class="icon-settings text-base"></i>
+                        </button>
+
+                        <button @onclick="() => DeleteDockerImage(dockerImage)" class="btn btn-danger">
+                            <i class="icon-trash text-base"></i>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        }
+    </div>
+</LazyLoader>
+
+@code
+{
+    [Parameter] public StarDetailResponse Star { get; set; }
+    
+    private StarDockerImageDetailResponse[] DockerImages;
+    private LazyLoader LazyLoader;
+
+    private async Task Load(LazyLoader _)
+    {
+        var pagedVariables = await ApiClient.GetJson<PagedData<StarDockerImageDetailResponse>>(
+            $"api/admin/servers/stars/{Star.Id}/dockerImages?page=0&pageSize=50"
+        );
+
+        DockerImages = pagedVariables.Items;
+    }
+
+    private async Task AddDockerImage()
+    {
+        Func<CreateStarDockerImageRequest, Task> onSubmit = async request =>
+        {
+            await ApiClient.Post($"api/admin/servers/stars/{Star.Id}/dockerImages", request);
+            
+            await ToastService.Success("Successfully created docker image");
+            await LazyLoader.Reload();
+        };
+        
+        await ModalService.Launch<CreateDockerImageModal>(parameters =>
+        {
+            parameters.Add("OnSubmit", onSubmit);
+        });
+    }
+    
+    private async Task UpdateDockerImage(StarDockerImageDetailResponse dockerImage)
+    {
+        Func<UpdateStarDockerImageRequest, Task> onSubmit = async request =>
+        {
+            await ApiClient.Patch($"api/admin/servers/stars/{Star.Id}/dockerImages/{dockerImage.Id}", request);
+            
+            await ToastService.Success("Successfully updated docker image");
+            await LazyLoader.Reload();
+        };
+        
+        await ModalService.Launch<UpdateDockerImageModal>(parameters =>
+        {
+            parameters.Add("OnSubmit", onSubmit);
+            parameters.Add("DockerImage", dockerImage);
+        });
+    }
+    
+    private async Task DeleteDockerImage(StarDockerImageDetailResponse dockerImage)
+    {
+        await AlertService.ConfirmDanger(
+            "Delete docker image",
+            "Do you really want to delete the selected docker image? This cannot be undone",
+            async () =>
+            {
+                await ApiClient.Delete($"api/admin/servers/stars/{Star.Id}/dockerImages/{dockerImage.Id}");
+            
+                await ToastService.Success("Successfully deleted docker image");
+                await LazyLoader.Reload();
+            }
+        );
+    }
+}
diff --git a/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/ParseConfigStarUpdate.razor b/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/ParseConfigStarUpdate.razor
index 91dc850..9fff3e1 100644
--- a/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/ParseConfigStarUpdate.razor
+++ b/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/ParseConfigStarUpdate.razor
@@ -27,7 +27,7 @@ else
             <div class="col-span-1 card card-body p-2.5">
                 <div class="flex items-center justify-between">
                     <div class="ml-3">
-                        <i class="icon-file-cog text-xl align-middle"></i>
+                        <i class="icon-file-cog text-xl align-middle mr-2"></i>
                         <span class="align-middle text-lg">@configuration.File</span>
                     </div>
 
diff --git a/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/VariablesStarUpdate.razor b/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/VariablesStarUpdate.razor
index 6ba2156..2477c63 100644
--- a/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/VariablesStarUpdate.razor
+++ b/MoonlightServers.Frontend/UI/Components/Stars/UpdateStarPartials/VariablesStarUpdate.razor
@@ -25,7 +25,7 @@
             <div class="col-span-1 card card-body p-2.5">
                 <div class="flex items-center justify-between">
                     <div class="ml-3">
-                        <i class="icon-variable text-xl align-middle"></i>
+                        <i class="icon-variable text-xl align-middle mr-2"></i>
                         <span class="align-middle text-lg">@variable.Name</span>
                     </div>
                     
@@ -70,7 +70,7 @@
             await LazyLoader.Reload();
         };
         
-        await ModalService.Launch<CreateStarVariableModal>(parameters =>
+        await ModalService.Launch<CreateVariableModal>(parameters =>
         {
             parameters.Add("OnSubmit", onSubmit);
         }, "max-w-xl");
@@ -86,7 +86,7 @@
             await LazyLoader.Reload();
         };
         
-        await ModalService.Launch<UpdateStarVariableModel>(parameters =>
+        await ModalService.Launch<UpdateVariableModal>(parameters =>
         {
             parameters.Add("OnSubmit", onSubmit);
             parameters.Add("Variable", variable);
@@ -106,7 +106,5 @@
                 await LazyLoader.Reload();
             }
         );
-        
-        await InvokeAsync(StateHasChanged);
     }
 }
diff --git a/MoonlightServers.Frontend/UI/Views/Admin/Stars/Update.razor b/MoonlightServers.Frontend/UI/Views/Admin/Stars/Update.razor
index 0707b5f..f426f75 100644
--- a/MoonlightServers.Frontend/UI/Views/Admin/Stars/Update.razor
+++ b/MoonlightServers.Frontend/UI/Views/Admin/Stars/Update.razor
@@ -47,6 +47,10 @@
                 <Tab Name="Variables">
                     <VariablesStarUpdate Star="Detail" />
                 </Tab>
+
+                <Tab Name="Docker Images">
+                    <DockerImageStarUpdate Star="Detail" />
+                </Tab>
             </Tabs>
             
         </HandleForm>
diff --git a/MoonlightServers.Shared/Http/Requests/Admin/StarDockerImages/CreateStarDockerImageRequest.cs b/MoonlightServers.Shared/Http/Requests/Admin/StarDockerImages/CreateStarDockerImageRequest.cs
new file mode 100644
index 0000000..655597d
--- /dev/null
+++ b/MoonlightServers.Shared/Http/Requests/Admin/StarDockerImages/CreateStarDockerImageRequest.cs
@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace MoonlightServers.Shared.Http.Requests.Admin.StarDockerImages;
+
+public class CreateStarDockerImageRequest
+{
+    [Required(ErrorMessage = "You need to provide a display name")]
+    public string DisplayName { get; set; }
+    
+    [Required(ErrorMessage = "You need to specify a docker image identifier")]
+    [RegularExpression("^(?:(?=[^:\\/]{1,253})(?!-)[a-zA-Z0-9-]{1,63}(?<!-)(?:\\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-))*(?::[0-9]{1,5})?\\/)?((?![._-])(?:[a-z0-9._-]*)(?<![._-])(?:\\/(?![._-])[a-z0-9._-]*(?<![._-]))*)(?::(?![.-])[a-zA-Z0-9_.-]{1,128})?$", ErrorMessage = "You need to specify a valid docker image identifier")]
+    public string Identifier { get; set; }
+    
+    public bool AutoPulling { get; set; }
+}
\ No newline at end of file
diff --git a/MoonlightServers.Shared/Http/Requests/Admin/StarDockerImages/UpdateStarDockerImageRequest.cs b/MoonlightServers.Shared/Http/Requests/Admin/StarDockerImages/UpdateStarDockerImageRequest.cs
new file mode 100644
index 0000000..1dfd025
--- /dev/null
+++ b/MoonlightServers.Shared/Http/Requests/Admin/StarDockerImages/UpdateStarDockerImageRequest.cs
@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace MoonlightServers.Shared.Http.Requests.Admin.StarDockerImages;
+
+public class UpdateStarDockerImageRequest
+{
+    [Required(ErrorMessage = "You need to provide a display name")]
+    public string DisplayName { get; set; }
+    
+    [Required(ErrorMessage = "You need to specify a docker image identifier")]
+    [RegularExpression("^(?:(?=[^:\\/]{1,253})(?!-)[a-zA-Z0-9-]{1,63}(?<!-)(?:\\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-))*(?::[0-9]{1,5})?\\/)?((?![._-])(?:[a-z0-9._-]*)(?<![._-])(?:\\/(?![._-])[a-z0-9._-]*(?<![._-]))*)(?::(?![.-])[a-zA-Z0-9_.-]{1,128})?$", ErrorMessage = "You need to specify a valid docker image identifier")]
+    public string Identifier { get; set; }
+    
+    public bool AutoPulling { get; set; }
+}
\ No newline at end of file