diff --git a/Api.props b/Api.props
new file mode 100644
index 0000000..f531296
--- /dev/null
+++ b/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/Dockerfile b/Dockerfile
index c34594e..41632bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,9 @@ RUN git clone -b $GIT_BRANCH --single-branch $GIT_REPOSITORY .
 WORKDIR /src
 RUN mkdir -p "/output" && echo -n $GIT_BRANCH > /output/version
 
-# TODO: Implement plugin loading here
+# Copy over plugin configuration
+COPY Api.props /src/Hosts/Moonlight.Api.Host/
+COPY Frontend.props /src/Hosts/Moonlight.Frontend.Host/
 
 # Install npm packages
 WORKDIR /src/Hosts/Moonlight.Frontend.Host/Styles
@@ -64,7 +66,7 @@ RUN dotnet publish --no-restore "./Moonlight.Frontend.Host.csproj" -c $BUILD_CON
 #
 # Construct final docker image
 #
-FROM cgr.dev/chainguard/aspnet-runtime:latest AS final
+FROM git.battlestati.one/moonlight-panel/app_base:moonlight AS final
 
 WORKDIR /app
 
@@ -72,4 +74,6 @@ COPY --from=publish /output/publish-api .
 COPY --from=publish /output/publish-frontend/wwwroot ./wwwroot
 COPY --from=publish /output/version .
 
+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/Frontend.props b/Frontend.props
new file mode 100644
index 0000000..384e727
--- /dev/null
+++ b/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/compose.yml b/compose.yml
index 4fd6c46..3220f53 100644
--- a/compose.yml
+++ b/compose.yml
@@ -23,6 +23,13 @@
       - moonlight
     ports:
       - "8080:8080"
+      
+    # User
+    user: 0:0
+        
+    # Persistent storage
+    volumes:
+      - ${DATA_PATH}/moonlight:/app/storage
     
     # Env Settings
     environment:
@@ -75,6 +82,7 @@
       interval: 10s
       timeout: 5s
       retries: 5
+      start_period: 3s
   
   helper:
     image: git.battlestati.one/moonlight-panel/container_helper