diff --git a/QRCodeService/Program.cs b/QRCodeService/Program.cs
index 6c791ff..3d0c521 100644
--- a/QRCodeService/Program.cs
+++ b/QRCodeService/Program.cs
@@ -9,16 +9,15 @@ namespace QRCodeService
 {
     public class Program
     {
-        public static IConfiguration Configuration { get; } = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
-            .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-            .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json", optional: true)
-            .AddJsonFile($"appsettings.{Environment.MachineName}.json", optional: true)
-            .AddEnvironmentVariables()
-            .Build();
-
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
-                .UseSerilog()
+                .UseSerilog((hostingContext, loggerConfiguration) => {
+                    loggerConfiguration
+                        .ReadFrom.Configuration(hostingContext.Configuration)
+                        .Enrich.FromLogContext()
+                        .Enrich.WithProperty("ApplicationName", typeof(Program).Assembly.GetName().Name)
+                        .Enrich.WithProperty("Environment", hostingContext.HostingEnvironment);
+                })
                 .UseSystemd()
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
@@ -27,9 +26,6 @@ namespace QRCodeService
 
         public static void Main(string[] args)
         {
-            Log.Logger = new LoggerConfiguration()
-                .ReadFrom.Configuration(Configuration)
-                .CreateLogger();
 
             CreateHostBuilder(args).Build().Run();
         }