diff --git a/LANCommander.Server/LANCommander.Server.csproj b/LANCommander.Server/LANCommander.Server.csproj
index 914c02c8..04f87ad3 100644
--- a/LANCommander.Server/LANCommander.Server.csproj
+++ b/LANCommander.Server/LANCommander.Server.csproj
@@ -102,6 +102,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.1" />
     <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.7.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LANCommander.Server/Program.cs b/LANCommander.Server/Program.cs
index 7956045f..3db89c97 100644
--- a/LANCommander.Server/Program.cs
+++ b/LANCommander.Server/Program.cs
@@ -49,6 +49,13 @@ namespace LANCommander.Server
 
             var builder = WebApplication.CreateBuilder(args);
 
+            builder.Services.AddWindowsService(options =>
+            {
+                options.ServiceName = "LANCommander Server";
+            });
+
+            builder.Services.AddSystemd();
+
             ConfigurationManager configuration = builder.Configuration;
 
             #region Debug