diff --git a/Hosts/Moonlight.Api.Host/Api.props b/Hosts/Moonlight.Api.Host/Api.props
new file mode 100644
index 00000000..f5312969
--- /dev/null
+++ b/Hosts/Moonlight.Api.Host/Api.props
@@ -0,0 +1,6 @@
+<Project>
+    <ItemGroup>
+        <!-- Put your plugin references here -->
+        <!-- E.g. <PackageReference Include="MoonlightServers.Api" Version="2.1.0" /> -->
+    </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Hosts/Moonlight.Api.Host/Dockerfile b/Hosts/Moonlight.Api.Host/Dockerfile
index 08e9ea5c..9c3688b8 100644
--- a/Hosts/Moonlight.Api.Host/Dockerfile
+++ b/Hosts/Moonlight.Api.Host/Dockerfile
@@ -1,5 +1,5 @@
 # Base image
-FROM cgr.dev/chainguard/aspnet-runtime:latest AS base
+FROM git.battlestati.one/moonlight-panel/app_base:moonlight AS base
 WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
@@ -29,6 +29,9 @@ COPY ["Moonlight.Shared/Moonlight.Shared.csproj", "Moonlight.Shared/"]
 COPY ["Hosts/Moonlight.Frontend.Host/Moonlight.Frontend.Host.csproj", "Hosts/Moonlight.Frontend.Host/"]
 COPY ["Hosts/Moonlight.Api.Host/Moonlight.Api.Host.csproj", "Hosts/Moonlight.Api.Host/"]
 
+COPY ["Hosts/Moonlight.Frontend.Host/Frontend.props", "Hosts/Moonlight.Frontend.Host/"]
+COPY ["Hosts/Moonlight.Api.Host/Api.props", "Hosts/Moonlight.Api.Host/"]
+
 RUN dotnet restore "Hosts/Moonlight.Api.Host/Moonlight.Api.Host.csproj"
 RUN dotnet restore "Hosts/Moonlight.Frontend.Host/Moonlight.Frontend.Host.csproj"
 
@@ -69,4 +72,6 @@ WORKDIR /app
 COPY --from=publish /app/publish-api .
 COPY --from=publish /app/publish-frontend/wwwroot ./wwwroot
 
+HEALTHCHECK --interval=30s --timeout=3s --start-period=10s --retries=3 CMD ["/usr/bin/curl", "-sf", "-o", "/dev/null", "http://localhost:8080/"]
+
 ENTRYPOINT ["dotnet", "Moonlight.Api.Host.dll"]
\ No newline at end of file
diff --git a/Hosts/Moonlight.Api.Host/Moonlight.Api.Host.csproj b/Hosts/Moonlight.Api.Host/Moonlight.Api.Host.csproj
index 37e5935e..ca1ae0b3 100644
--- a/Hosts/Moonlight.Api.Host/Moonlight.Api.Host.csproj
+++ b/Hosts/Moonlight.Api.Host/Moonlight.Api.Host.csproj
@@ -29,4 +29,5 @@
         </Content>
     </ItemGroup>
 
+    <Import Project="Api.props"/>
 </Project>
diff --git a/Hosts/Moonlight.Frontend.Host/Frontend.props b/Hosts/Moonlight.Frontend.Host/Frontend.props
new file mode 100644
index 00000000..384e727f
--- /dev/null
+++ b/Hosts/Moonlight.Frontend.Host/Frontend.props
@@ -0,0 +1,6 @@
+<Project>
+    <ItemGroup>
+        <!-- Put your plugin references here -->
+        <!-- E.g. <PackageReference Include="MoonlightServers.Frontend" Version="2.1.0" /> -->
+    </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Hosts/Moonlight.Frontend.Host/Moonlight.Frontend.Host.csproj b/Hosts/Moonlight.Frontend.Host/Moonlight.Frontend.Host.csproj
index 46b3dfe3..6e02dc87 100644
--- a/Hosts/Moonlight.Frontend.Host/Moonlight.Frontend.Host.csproj
+++ b/Hosts/Moonlight.Frontend.Host/Moonlight.Frontend.Host.csproj
@@ -21,4 +21,6 @@
     <ItemGroup>
         <ProjectReference Include="..\..\Moonlight.Frontend\Moonlight.Frontend.csproj" />
     </ItemGroup>
+
+    <Import Project="Frontend.props"/>
 </Project>