diff --git a/Moonlight/Dockerfile b/Moonlight/Dockerfile
index d6539dfb..7393e0f3 100644
--- a/Moonlight/Dockerfile
+++ b/Moonlight/Dockerfile
@@ -1,10 +1,12 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+
 ARG BUILD_CONFIGURATION=Release
+
 WORKDIR /src
 COPY ["Moonlight/Moonlight.csproj", "Moonlight/"]
 RUN dotnet restore "Moonlight/Moonlight.csproj"
diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj
index 63a95038..a7a07a4c 100644
--- a/Moonlight/Moonlight.csproj
+++ b/Moonlight/Moonlight.csproj
@@ -5,100 +5,101 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+        <RuntimeIdentifiers>linux-arm64;linux-x64;win-x64</RuntimeIdentifiers>
     </PropertyGroup>
 
     <ItemGroup>
-      <Content Include="..\.dockerignore">
-        <Link>.dockerignore</Link>
-      </Content>
-      <Content Update="Assets\Features\Core\js\moonlight.js">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-      <Content Update="Assets\Features\Core\js\sweetalert2.js">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-      <Content Update="Assets\Features\Core\js\toaster.js">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-      <Content Update="Assets\Features\Core\js\bootstrap.js">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-      <Content Update="Assets\Features\Core\css\blazor.css">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-      <Content Update="Assets\Features\Core\css\boxicons.css">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-      <Content Update="Assets\Features\Core\css\sweetalert2dark.css">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-      <Content Update="Assets\Features\Core\css\utils.css">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-      <Content Update="Assets\FileManager\js\dropzone.js">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
+        <Content Include="..\.dockerignore">
+            <Link>.dockerignore</Link>
+        </Content>
+        <Content Update="Assets\Features\Core\js\moonlight.js">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        </Content>
+        <Content Update="Assets\Features\Core\js\sweetalert2.js">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        </Content>
+        <Content Update="Assets\Features\Core\js\toaster.js">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        </Content>
+        <Content Update="Assets\Features\Core\js\bootstrap.js">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        </Content>
+        <Content Update="Assets\Features\Core\css\blazor.css">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        </Content>
+        <Content Update="Assets\Features\Core\css\boxicons.css">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        </Content>
+        <Content Update="Assets\Features\Core\css\sweetalert2dark.css">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        </Content>
+        <Content Update="Assets\Features\Core\css\utils.css">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        </Content>
+        <Content Update="Assets\FileManager\js\dropzone.js">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        </Content>
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="Core\Database\Migrations\" />
-      <Folder Include="Core\Http\Requests\" />
-      <Folder Include="Core\Http\Resources\" />
-      <Folder Include="Core\UI\Components\Forms\" />
-      <Folder Include="Features\Dummy\Configuration\" />
-      <Folder Include="Features\Dummy\Entities\" />
-      <Folder Include="Features\Dummy\Helpers\" />
-      <Folder Include="Features\Dummy\Http\Controllers\" />
-      <Folder Include="Features\Dummy\Http\Middleware\" />
-      <Folder Include="Features\Dummy\Http\Requests\" />
-      <Folder Include="Features\Dummy\Http\Resources\" />
-      <Folder Include="Features\Dummy\Models\Abstractions\" />
-      <Folder Include="Features\Dummy\Models\Enums\" />
-      <Folder Include="Features\Dummy\Models\Forms\" />
-      <Folder Include="Features\Dummy\Services\" />
-      <Folder Include="Features\Dummy\UI\Components\" />
-      <Folder Include="Features\Dummy\UI\Layouts\" />
-      <Folder Include="Features\Dummy\UI\Views\" />
-      <Folder Include="Features\FileManager\Configuration\" />
-      <Folder Include="Features\FileManager\Entities\" />
-      <Folder Include="Features\FileManager\Http\Middleware\" />
-      <Folder Include="Features\FileManager\Http\Requests\" />
-      <Folder Include="Features\FileManager\Http\Resources\" />
-      <Folder Include="Features\Servers\Http\Resources\" />
-      <Folder Include="storage\" />
-      <Folder Include="Styles\" />
-      <Folder Include="wwwroot\css\" />
+        <Folder Include="Core\Database\Migrations\"/>
+        <Folder Include="Core\Http\Requests\"/>
+        <Folder Include="Core\Http\Resources\"/>
+        <Folder Include="Core\UI\Components\Forms\"/>
+        <Folder Include="Features\Dummy\Configuration\"/>
+        <Folder Include="Features\Dummy\Entities\"/>
+        <Folder Include="Features\Dummy\Helpers\"/>
+        <Folder Include="Features\Dummy\Http\Controllers\"/>
+        <Folder Include="Features\Dummy\Http\Middleware\"/>
+        <Folder Include="Features\Dummy\Http\Requests\"/>
+        <Folder Include="Features\Dummy\Http\Resources\"/>
+        <Folder Include="Features\Dummy\Models\Abstractions\"/>
+        <Folder Include="Features\Dummy\Models\Enums\"/>
+        <Folder Include="Features\Dummy\Models\Forms\"/>
+        <Folder Include="Features\Dummy\Services\"/>
+        <Folder Include="Features\Dummy\UI\Components\"/>
+        <Folder Include="Features\Dummy\UI\Layouts\"/>
+        <Folder Include="Features\Dummy\UI\Views\"/>
+        <Folder Include="Features\FileManager\Configuration\"/>
+        <Folder Include="Features\FileManager\Entities\"/>
+        <Folder Include="Features\FileManager\Http\Middleware\"/>
+        <Folder Include="Features\FileManager\Http\Requests\"/>
+        <Folder Include="Features\FileManager\Http\Resources\"/>
+        <Folder Include="Features\Servers\Http\Resources\"/>
+        <Folder Include="storage\"/>
+        <Folder Include="Styles\"/>
+        <Folder Include="wwwroot\css\"/>
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
-      <PackageReference Include="Blazor-ApexCharts" Version="2.3.3" />
-      <PackageReference Include="Blazor.ContextMenu" Version="1.17.0" />
-      <PackageReference Include="BlazorTable" Version="1.17.0" />
-      <PackageReference Include="JWT" Version="10.1.1" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="MimeTypes" Version="2.4.1">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="MoonCore" Version="1.3.5" />
-      <PackageReference Include="MoonCoreUI" Version="1.2.1" />
-      <PackageReference Include="Otp.NET" Version="1.3.0" />
-      <PackageReference Include="QRCoder" Version="1.4.3" />
-      <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
-      <PackageReference Include="XtermBlazor" Version="1.10.2" />
-      <PackageReference Include="Z.Blazor.Diagrams" Version="3.0.2" />
+        <PackageReference Include="Ben.Demystifier" Version="0.4.1"/>
+        <PackageReference Include="Blazor-ApexCharts" Version="2.3.3"/>
+        <PackageReference Include="Blazor.ContextMenu" Version="1.17.0"/>
+        <PackageReference Include="BlazorTable" Version="1.17.0"/>
+        <PackageReference Include="JWT" Version="10.1.1"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="MimeTypes" Version="2.4.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="MoonCore" Version="1.3.5"/>
+        <PackageReference Include="MoonCoreUI" Version="1.2.1"/>
+        <PackageReference Include="Otp.NET" Version="1.3.0"/>
+        <PackageReference Include="QRCoder" Version="1.4.3"/>
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2"/>
+        <PackageReference Include="XtermBlazor" Version="1.10.2"/>
+        <PackageReference Include="Z.Blazor.Diagrams" Version="3.0.2"/>
     </ItemGroup>
 </Project>