diff --git a/EnvelopeGenerator.ServiceHost/Program.cs b/EnvelopeGenerator.ServiceHost/Program.cs
index 753fc5f9..9fe2688e 100644
--- a/EnvelopeGenerator.ServiceHost/Program.cs
+++ b/EnvelopeGenerator.ServiceHost/Program.cs
@@ -9,7 +9,21 @@ using System.Globalization;
 
 var builder = WebApplication.CreateBuilder(args);
 
-// Add services to the container.
+#region Kestrel & Windows Service Configuration
+if (builder.Configuration.GetValue<bool>("UseWindowsService"))
+{
+    builder.Host.UseWindowsService();
+}
+
+if (builder.Configuration.GetValue<bool>("UseKestrelConfig"))
+{
+    builder.WebHost.ConfigureKestrel((context, serverOptions) =>
+    {
+        var kestrelSection = context.Configuration.GetSection("Kestrel");
+        serverOptions.Configure(kestrelSection);
+    });
+}
+#endregion
 
 var config = builder.Configuration;
 var connStr = config.GetConnectionString("Default") ??
@@ -76,4 +90,4 @@ app.UseAuthorization();
 
 app.MapControllers();
 
-app.Run();
+app.Run();
\ No newline at end of file