diff --git a/Directory.Build.props b/Directory.Build.props
index 20eb14a..0b94847 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -26,10 +26,10 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" Version="2022.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All" Version="6.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="17.3.44" />
-    <PackageReference Include="MinVer" PrivateAssets="All" Version="4.2.0" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" Version="2023.2.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All" Version="7.0.4" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="17.7.30" />
+    <PackageReference Include="MinVer" PrivateAssets="All" Version="4.3.0" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
   </ItemGroup>
 
diff --git a/Directory.Build.targets b/Directory.Build.targets
index e603de4..2f6a80a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -7,7 +7,7 @@
 
   <Target Name="Versioning" BeforeTargets="MinVer">
     <PropertyGroup Label="Build">
-      <MinVerDefaultPreReleasePhase>preview</MinVerDefaultPreReleasePhase>
+      <MinVerDefaultPreReleaseIdentifiers>preview.0</MinVerDefaultPreReleaseIdentifiers>
       <!-- Tag your repository with the semantic version e.g. '1.0.0' to version all NuGet packages. If you have
            multiple NuGet packages in your solution and want to version them separately, then uncomment this line
            and tag your repository with the name of the package followed by the semantic version e.g.
diff --git a/Sholo.ruleset b/Sholo.ruleset
index 287f6c8..8f51ab2 100644
--- a/Sholo.ruleset
+++ b/Sholo.ruleset
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="General rules" Description="Style + Rules - Laziness" ToolsVersion="16.0">
   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
     <Rule Id="CS1591" Action="None" />
+    <Rule Id="IDE0290" Action="None" />
   </Rules>
   <Rules AnalyzerId="Microsoft.CodeQuality.Analyzers" RuleNamespace="Microsoft.CodeQuality.Analyzers">
     <Rule Id="CA1030" Action="None" />
@@ -13,7 +14,7 @@
     <Rule Id="CA1812" Action="None" />
     <Rule Id="CA1819" Action="None" />
     <Rule Id="CA1822" Action="None" />
-    <Rule Id="CA2007" Action="Info" />
+    <Rule Id="CA2007" Action="None" />
   </Rules>
   <Rules AnalyzerId="Microsoft.NetCore.Analyzers" RuleNamespace="Microsoft.NetCore.Analyzers">
     <Rule Id="CA1303" Action="None" />
@@ -26,9 +27,11 @@
     <Rule Id="VSTHRD200" Action="Info" />
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <Rule Id="SA1000" Action="None" />
     <Rule Id="SA1009" Action="None" />
     <Rule Id="SA1101" Action="None" />
     <Rule Id="SA1111" Action="None" />
+    <Rule Id="SA1118" Action="None" />
     <Rule Id="SA1200" Action="None" />
     <Rule Id="SA1201" Action="None" />
     <Rule Id="SA1309" Action="None" />
@@ -43,4 +46,4 @@
     <Rule Id="SA1629" Action="None" />
     <Rule Id="SA1633" Action="None" />
   </Rules>
-</RuleSet>
\ No newline at end of file
+</RuleSet>
diff --git a/Source/Sholo.CommandLine.Containers/ApplicationNameAndVersion.cs b/Source/Sholo.CommandLine.Containers/ApplicationNameAndVersion.cs
index b465093..fc15db1 100644
--- a/Source/Sholo.CommandLine.Containers/ApplicationNameAndVersion.cs
+++ b/Source/Sholo.CommandLine.Containers/ApplicationNameAndVersion.cs
@@ -1,8 +1,11 @@
-namespace Sholo.CommandLine.Containers
+using System.ComponentModel.DataAnnotations;
+
+namespace Sholo.CommandLine.Containers;
+
+public class ApplicationNameAndVersion
 {
-    public class ApplicationNameAndVersion
-    {
-        public string Name { get; set; }
-        public string Version { get; set; }
-    }
+    [Required]
+    public string Name { get; set; }
+
+    public string Version { get; set; }
 }
diff --git a/Source/Sholo.CommandLine.Containers/ContainerizedAppOptions.cs b/Source/Sholo.CommandLine.Containers/ContainerizedAppOptions.cs
index 9f2df57..6de96a9 100644
--- a/Source/Sholo.CommandLine.Containers/ContainerizedAppOptions.cs
+++ b/Source/Sholo.CommandLine.Containers/ContainerizedAppOptions.cs
@@ -1,10 +1,9 @@
 using CommandLine;
 
-namespace Sholo.CommandLine.Containers
+namespace Sholo.CommandLine.Containers;
+
+public class ContainerizedAppOptions
 {
-    public class ContainerizedAppOptions
-    {
-        [Option('c', "configfile", Required = false, HelpText = "The config file to load (.yaml or .json extension)")]
-        public string ConfigFile { get; set; }
-    }
+    [Option('c', "configfile", Required = false, HelpText = "The config file to load (.yaml or .json extension)")]
+    public string ConfigFile { get; set; }
 }
diff --git a/Source/Sholo.CommandLine.Containers/ContainerizedHostBuilder.cs b/Source/Sholo.CommandLine.Containers/ContainerizedHostBuilder.cs
index 8431a35..9795132 100644
--- a/Source/Sholo.CommandLine.Containers/ContainerizedHostBuilder.cs
+++ b/Source/Sholo.CommandLine.Containers/ContainerizedHostBuilder.cs
@@ -1,94 +1,129 @@
 using System;
 using System.IO;
 using System.Reflection;
-using JetBrains.Annotations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Sholo.CommandLine.Containers.SplashService;
+using Sholo.Utils.Logging;
+using Sholo.Utils.Validation;
 
-namespace Sholo.CommandLine.Containers
+namespace Sholo.CommandLine.Containers;
+
+[PublicAPI]
+public static class ContainerizedHostBuilder
 {
-    [PublicAPI]
-    public static class ContainerizedHostBuilder
-    {
-        public static IHostBuilder Create(string[] args, string applicationName = null)
-            => ConfigureHostBuilder<Splash>(new HostBuilder().UseOptions<ContainerizedAppOptions>(args), applicationName);
+    public static IHostBuilder Create(string[] args, string applicationName = null)
+        => ConfigureHostBuilder<Splash>(new HostBuilder().UseOptions<ContainerizedAppOptions>(args), applicationName);
 
-        public static IHostBuilder Create<TOptions>(string[] args, string applicationName = null)
-            where TOptions : ContainerizedAppOptions
-            => ConfigureHostBuilder<Splash>(new HostBuilder().UseOptions<TOptions>(args), applicationName);
+    public static IHostBuilder Create<TOptions>(string[] args, string applicationName = null)
+        where TOptions : ContainerizedAppOptions
+        => ConfigureHostBuilder<Splash>(new HostBuilder().UseOptions<TOptions>(args), applicationName);
 
-        public static IHostBuilder Create<TOptions, TSplash>(string[] args, string applicationName = null)
-            where TOptions : ContainerizedAppOptions
-            where TSplash : class, ISplash
-            => ConfigureHostBuilder<TSplash>(new HostBuilder().UseOptions<TOptions>(args), applicationName);
+    public static IHostBuilder Create<TOptions, TSplash>(string[] args, string applicationName = null)
+        where TOptions : ContainerizedAppOptions
+        where TSplash : class, ISplash
+        => ConfigureHostBuilder<TSplash>(new HostBuilder().UseOptions<TOptions>(args), applicationName);
 
-        public static IHostBuilder ConfigureHostBuilder<TSplash>(IHostBuilder hostBuilder, string applicationName)
-            where TSplash : class, ISplash
-                => hostBuilder
-                    .UseVersionResource(applicationName)
-                    .UseEnvironment(Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production")
-                    .ConfigureAppConfiguration((ctx, cb) =>
+    public static IHostBuilder ConfigureHostBuilder<TSplash>(IHostBuilder hostBuilder, string applicationName)
+        where TSplash : class, ISplash
+        => hostBuilder
+            .UseVersionResource(applicationName)
+            .UseEnvironment(Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production")
+            .UseDefaultServiceProvider((ctx, options) => { options.ValidateScopes = ctx.HostingEnvironment.IsDevelopment(); })
+            .ConfigureHostConfiguration(cb =>
+            {
+                if (hostBuilder.Properties.TryGetValue(HostBuilderExtensions.ContextPropertyName, out var optionsObj) && optionsObj is ContainerizedAppOptions options && !string.IsNullOrEmpty(options.ConfigFile))
+                {
+                    var configFile = options.ConfigFile;
+                    if (!File.Exists(configFile))
                     {
-                        if (ctx.TryGetOptions<ContainerizedAppOptions>(out var options) && !string.IsNullOrEmpty(options?.ConfigFile))
-                        {
-                            var configFile = options.ConfigFile;
-                            if (!File.Exists(configFile))
-                            {
-                                throw new Exception("The config file specified does not exist");
-                            }
+                        throw new Exception("The config file specified does not exist");
+                    }
 
-                            var configFileExtension = Path.GetExtension(configFile);
+                    var configFileExtension = Path.GetExtension(configFile);
 
-                            if (configFileExtension.Equals(".yaml", StringComparison.OrdinalIgnoreCase))
-                            {
-                                cb.AddYamlFile(configFile, false);
-                            }
-                            else if (configFileExtension.Equals(".json", StringComparison.OrdinalIgnoreCase))
-                            {
-                                cb.AddJsonFile(configFile, false);
-                            }
-                            else
-                            {
-                                throw new Exception($"Unsupported config file extension: {configFileExtension}.  Expecting .yaml or .json");
-                            }
-                        }
-                        else
-                        {
-                            cb.AddYamlFile("config.yaml", true);
-                            cb.AddYamlFile("config.yml", true);
-                            cb.AddJsonFile("config.json", true);
-                        }
+                    if (configFileExtension.Equals(".yaml", StringComparison.OrdinalIgnoreCase))
+                    {
+                        cb.AddYamlFile(configFile, false);
+                    }
+                    else if (configFileExtension.Equals(".json", StringComparison.OrdinalIgnoreCase))
+                    {
+                        cb.AddJsonFile(configFile, false);
+                    }
+                    else
+                    {
+                        throw new Exception($"Unsupported config file extension: {configFileExtension}.  Expecting .yaml or .json");
+                    }
+                }
+                else
+                {
+                    cb.AddYamlFile("config.yaml", true);
+                    cb.AddYamlFile("config.yml", true);
+                    cb.AddJsonFile("config.json", true);
 
-                        cb.AddEnvironmentVariables();
+                    cb.AddYamlFile("secrets.yaml", true);
+                    cb.AddYamlFile("secrets.yml", true);
+                    cb.AddJsonFile("secrets.json", true);
+                }
 
-                        if (ctx.HostingEnvironment.IsDevelopment())
-                        {
-                            try
-                            {
-                                cb.AddUserSecrets(Assembly.GetEntryAssembly());
-                            }
-                            catch
-                            {
-                                // We tried
-                            }
-                        }
-                    })
-                    .ConfigureServices((ctx, services) =>
+                cb.AddEnvironmentVariables();
+            })
+            .ConfigureAppConfiguration((ctx, cb) =>
+            {
+                if (ctx.TryGetOptions<ContainerizedAppOptions>(out var options) && !string.IsNullOrEmpty(options?.ConfigFile))
+                {
+                    var configFile = options.ConfigFile;
+                    if (!File.Exists(configFile))
+                    {
+                        throw new Exception("The config file specified does not exist");
+                    }
+
+                    var configFileExtension = Path.GetExtension(configFile);
+
+                    if (configFileExtension.Equals(".yaml", StringComparison.OrdinalIgnoreCase) || configFileExtension.Equals(".yml", StringComparison.OrdinalIgnoreCase))
+                    {
+                        cb.AddYamlFile(configFile, false);
+                    }
+                    else if (configFileExtension.Equals(".json", StringComparison.OrdinalIgnoreCase))
                     {
-                        services.AddOptions<ApplicationNameAndVersion>()
-                            .Configure(opt =>
-                            {
-                                opt.Name = ctx.Properties?["ApplicationName"]?.ToString() ?? string.Empty;
-                                opt.Version = ctx.Properties?["ApplicationVersion"]?.ToString() ?? string.Empty;
-                            });
+                        cb.AddJsonFile(configFile, false);
+                    }
+                    else
+                    {
+                        throw new Exception($"Unsupported config file extension: {configFileExtension}.  Expecting .yaml, .yml, or .json");
+                    }
+                }
+                else
+                {
+                    cb.AddYamlFile("config.yaml", true, true);
+                    cb.AddYamlFile("config.yml", true, true);
+                    cb.AddJsonFile("config.json", true, true);
+                }
 
-                        services.AddSingleton<ISplash, TSplash>();
-                        services.AddHostedService<SplashService.SplashService>();
-                        services.AddLogging();
+                cb.AddEnvironmentVariables();
+            })
+            .ConfigureServices((ctx, services) =>
+            {
+                services.AddOptions<ApplicationNameAndVersion>()
+                    .Configure(opt =>
+                    {
+                        opt.Name = ctx.Properties?["ApplicationName"]?.ToString() ?? string.Empty;
+                        opt.Version = ctx.Properties?["ApplicationVersion"]?.ToString() ?? string.Empty;
                     })
-                    .ConfigureLogging((ctx, lb) => { lb.AddSerilogConsole(); })
-                    .UseConsoleLifetime(c => { c.SuppressStatusMessages = true; });
-    }
+                    .PostConfigure(opt =>
+                    {
+                        opt.Name ??= Assembly.GetEntryAssembly()?.GetName().Name ?? "Unknown";
+                    })
+                    .ValidateDataAnnotations(true)
+                    .ValidateOnStart();
+
+                services.AddSingleton<ISplash, TSplash>();
+                services.AddHostedService<SplashService>();
+                services.AddLogging();
+            })
+            .ConfigureLogging((c, lb) =>
+            {
+                lb.AddSerilogConsole(c.Configuration);
+            })
+            .UseConsoleLifetime(c => { c.SuppressStatusMessages = true; });
 }
diff --git a/Source/Sholo.CommandLine.Containers/GlobalUsings.cs b/Source/Sholo.CommandLine.Containers/GlobalUsings.cs
new file mode 100644
index 0000000..f3b5eaa
--- /dev/null
+++ b/Source/Sholo.CommandLine.Containers/GlobalUsings.cs
@@ -0,0 +1,3 @@
+// Global using directives
+
+global using JetBrains.Annotations;
\ No newline at end of file
diff --git a/Source/Sholo.CommandLine.Containers/HostBuilderContextExtensions.cs b/Source/Sholo.CommandLine.Containers/HostBuilderContextExtensions.cs
index 90e90d7..3fae754 100644
--- a/Source/Sholo.CommandLine.Containers/HostBuilderContextExtensions.cs
+++ b/Source/Sholo.CommandLine.Containers/HostBuilderContextExtensions.cs
@@ -1,23 +1,22 @@
 using Microsoft.Extensions.Hosting;
 
-namespace Sholo.CommandLine.Containers
+namespace Sholo.CommandLine.Containers;
+
+public static class HostBuilderContextExtensions
 {
-    public static class HostBuilderContextExtensions
+    public static bool TryGetOptions<TOptions>(this HostBuilderContext context, out TOptions options)
+        where TOptions : ContainerizedAppOptions
     {
-        public static bool TryGetOptions<TOptions>(this HostBuilderContext context, out TOptions options)
-            where TOptions : ContainerizedAppOptions
+        if (context.Properties.TryGetValue(HostBuilderExtensions.ContextPropertyName, out var optionsObject))
         {
-            if (context.Properties.TryGetValue(HostBuilderExtensions.ContextPropertyName, out var optionsObject))
+            if (optionsObject is TOptions optionsResult)
             {
-                if (optionsObject is TOptions optionsResult)
-                {
-                    options = optionsResult;
-                    return true;
-                }
+                options = optionsResult;
+                return true;
             }
-
-            options = default;
-            return false;
         }
+
+        options = default;
+        return false;
     }
 }
diff --git a/Source/Sholo.CommandLine.Containers/HostBuilderExtensions.cs b/Source/Sholo.CommandLine.Containers/HostBuilderExtensions.cs
index d5042d8..279ab0e 100644
--- a/Source/Sholo.CommandLine.Containers/HostBuilderExtensions.cs
+++ b/Source/Sholo.CommandLine.Containers/HostBuilderExtensions.cs
@@ -5,62 +5,57 @@
 using CommandLine;
 using Microsoft.Extensions.Hosting;
 
-namespace Sholo.CommandLine.Containers
+namespace Sholo.CommandLine.Containers;
+
+public static class HostBuilderExtensions
 {
-    public static class HostBuilderExtensions
+    public static readonly string ContextPropertyName = "CommandLineArguments";
+
+    public static IHostBuilder UseOptions<TOptions>(this IHostBuilder hostBuilder, string[] args)
+        where TOptions : ContainerizedAppOptions
     {
-        public static readonly string ContextPropertyName = "CommandLineArguments";
+        TOptions options = null;
+        Parser.Default.ParseArguments<TOptions>(args).WithParsed(o => options = o);
 
-        public static IHostBuilder UseOptions<TOptions>(this IHostBuilder hostBuilder, string[] args)
-            where TOptions : ContainerizedAppOptions
+        if (options != null)
         {
-            TOptions options = null;
-            Parser.Default.ParseArguments<TOptions>(args).WithParsed(o => options = o);
+            hostBuilder.Properties[ContextPropertyName] = options;
+        }
 
-            if (options != null)
-            {
-                hostBuilder.Properties[ContextPropertyName] = options;
-            }
+        return hostBuilder;
+    }
 
-            return hostBuilder;
-        }
+    public static IHostBuilder UseVersionResource(this IHostBuilder hostBuilder, string applicationName = null)
+    {
+        var entryAssembly = Assembly.GetEntryAssembly();
+        var name = applicationName ?? entryAssembly?.GetName().Name ?? Environment.GetCommandLineArgs().FirstOrDefault();
 
-        public static IHostBuilder UseVersionResource(this IHostBuilder hostBuilder, string applicationName = null)
+        string version = null;
+        if (entryAssembly != null)
         {
-            var entryAssembly = Assembly.GetEntryAssembly();
-            var name = applicationName ?? entryAssembly?.GetName().Name ?? Environment.GetCommandLineArgs().FirstOrDefault();
-
-            string version = null;
-            if (entryAssembly != null)
+            var resourceName = entryAssembly.GetManifestResourceNames().SingleOrDefault(str => str.EndsWith("VERSION", StringComparison.Ordinal));
+            if (resourceName != null)
             {
-                var resourceName = entryAssembly.GetManifestResourceNames().SingleOrDefault(str => str.EndsWith("VERSION", StringComparison.Ordinal));
-                if (resourceName != null)
+                using var stream = entryAssembly.GetManifestResourceStream(resourceName);
+                if (stream != null)
                 {
-                    using (var stream = entryAssembly.GetManifestResourceStream(resourceName))
+                    using var sr = new StreamReader(stream);
+                    var versionLine = sr.ReadLine();
+                    if (versionLine != null)
                     {
-                        if (stream != null)
+                        var versionParts = versionLine.Split('.');
+                        if (versionParts.Length == 2 && versionParts[0].All(char.IsDigit) && versionParts[1].All(char.IsDigit))
                         {
-                            using (var sr = new StreamReader(stream))
-                            {
-                                var versionLine = sr.ReadLine();
-                                if (versionLine != null)
-                                {
-                                    var versionParts = versionLine.Split('.');
-                                    if (versionParts.Length == 2 && versionParts[0].All(char.IsDigit) && versionParts[1].All(char.IsDigit))
-                                    {
-                                        version = versionLine;
-                                    }
-                                }
-                            }
+                            version = versionLine;
                         }
                     }
                 }
             }
+        }
 
-            hostBuilder.Properties["ApplicationName"] = name;
-            hostBuilder.Properties["ApplicationVersion"] = version;
+        hostBuilder.Properties["ApplicationName"] = name;
+        hostBuilder.Properties["ApplicationVersion"] = version;
 
-            return hostBuilder;
-        }
+        return hostBuilder;
     }
 }
diff --git a/Source/Sholo.CommandLine.Containers/ISplash.cs b/Source/Sholo.CommandLine.Containers/ISplash.cs
new file mode 100644
index 0000000..f2dcd55
--- /dev/null
+++ b/Source/Sholo.CommandLine.Containers/ISplash.cs
@@ -0,0 +1,8 @@
+namespace Sholo.CommandLine.Containers;
+
+[PublicAPI]
+public interface ISplash
+{
+    void WriteSplashMessage(string applicationName, string version);
+    void WriteShutdownMessage(string applicationName, string version);
+}
diff --git a/Source/Sholo.CommandLine.Containers/LoggingBuilderExtensions.cs b/Source/Sholo.CommandLine.Containers/LoggingBuilderExtensions.cs
deleted file mode 100644
index 75ab0ca..0000000
--- a/Source/Sholo.CommandLine.Containers/LoggingBuilderExtensions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Serilog;
-using Serilog.Events;
-using Serilog.Sinks.SystemConsole.Themes;
-
-namespace Sholo.CommandLine.Containers
-{
-    public static class LoggingBuilderExtensions
-    {
-        public static ILoggingBuilder AddSerilogConsole(this ILoggingBuilder loggingBuilder)
-        {
-            var logger = new LoggerConfiguration()
-                .WriteTo.Console(
-                    LogEventLevel.Information,
-                    "{Message:lj}{NewLine}{Exception}",
-                    null,
-                    null,
-                    LogEventLevel.Warning,
-                    AnsiConsoleTheme.Literate)
-                .CreateLogger();
-
-            loggingBuilder.AddSerilog(logger, true);
-
-            return loggingBuilder;
-        }
-    }
-}
diff --git a/Source/Sholo.CommandLine.Containers/Sholo.CommandLine.Containers.csproj b/Source/Sholo.CommandLine.Containers/Sholo.CommandLine.Containers.csproj
index 3ed372f..58132a4 100644
--- a/Source/Sholo.CommandLine.Containers/Sholo.CommandLine.Containers.csproj
+++ b/Source/Sholo.CommandLine.Containers/Sholo.CommandLine.Containers.csproj
@@ -1,16 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="[2.9.1,3.0.0)" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="[3.0.0,8.0.0)" />
-    <PackageReference Include="NetEscapades.Configuration.Yaml" Version="[2.2.0,3.0.0)" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="[3.1.0,4.0.0)" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="[4.0.1,5.0.0)" />
-    <PackageReference Include="YamlDotNet" Version="[12.0.0,13.0.0)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(SolutionName)' != 'HomeAutomation'">
+    <PackageReference Include="Sholo.Utils" Version="*-*" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(SolutionName)' == 'HomeAutomation'">
+    <ProjectReference Include="$(SmartSolutionDir)\Libraries\Sholo.Utils\Source\Sholo.Utils\Sholo.Utils.csproj" />
   </ItemGroup>
 
   <PropertyGroup Label="Package">
@@ -19,4 +22,4 @@
     <PackageTags>CommandLine;cli;containers;docker</PackageTags>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Sholo.CommandLine.Containers/Splash.cs b/Source/Sholo.CommandLine.Containers/Splash.cs
new file mode 100644
index 0000000..c6a81b4
--- /dev/null
+++ b/Source/Sholo.CommandLine.Containers/Splash.cs
@@ -0,0 +1,32 @@
+using Microsoft.Extensions.Logging;
+
+namespace Sholo.CommandLine.Containers;
+
+public class Splash : ISplash
+{
+    private ILogger<Splash> Logger { get; }
+
+    public Splash(ILogger<Splash> logger)
+    {
+        Logger = logger;
+    }
+
+    public virtual void WriteSplashMessage(string applicationName, string version)
+    {
+        if (!string.IsNullOrEmpty(version))
+        {
+            Logger.LogInformation($"{applicationName} {version}");
+        }
+        else
+        {
+            Logger.LogInformation($"{applicationName}");
+        }
+
+        Logger.LogInformation(string.Empty);
+    }
+
+    public virtual void WriteShutdownMessage(string applicationName, string version)
+    {
+        Logger.LogInformation(string.Empty);
+    }
+}
diff --git a/Source/Sholo.CommandLine.Containers/SplashService.cs b/Source/Sholo.CommandLine.Containers/SplashService.cs
new file mode 100644
index 0000000..2c342f8
--- /dev/null
+++ b/Source/Sholo.CommandLine.Containers/SplashService.cs
@@ -0,0 +1,30 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+
+namespace Sholo.CommandLine.Containers;
+
+public class SplashService : IHostedService
+{
+    private IOptions<ApplicationNameAndVersion> Options { get; }
+    private ISplash Splash { get; }
+
+    public SplashService(IOptions<ApplicationNameAndVersion> options, ISplash splash)
+    {
+        Options = options;
+        Splash = splash;
+    }
+
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        Splash.WriteSplashMessage(Options.Value.Name, Options.Value.Version);
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        Splash.WriteShutdownMessage(Options.Value.Name, Options.Value.Version);
+        return Task.CompletedTask;
+    }
+}
diff --git a/Source/Sholo.CommandLine.Containers/SplashService/ISplash.cs b/Source/Sholo.CommandLine.Containers/SplashService/ISplash.cs
deleted file mode 100644
index 6fedf5f..0000000
--- a/Source/Sholo.CommandLine.Containers/SplashService/ISplash.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using JetBrains.Annotations;
-
-namespace Sholo.CommandLine.Containers.SplashService
-{
-    [PublicAPI]
-    public interface ISplash
-    {
-        void WriteSplashMessage(string applicationName, string version);
-        void WriteShutdownMessage(string applicationName, string version);
-    }
-}
diff --git a/Source/Sholo.CommandLine.Containers/SplashService/Splash.cs b/Source/Sholo.CommandLine.Containers/SplashService/Splash.cs
deleted file mode 100644
index e98e867..0000000
--- a/Source/Sholo.CommandLine.Containers/SplashService/Splash.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-
-namespace Sholo.CommandLine.Containers.SplashService
-{
-    public class Splash : ISplash
-    {
-        public virtual void WriteSplashMessage(string applicationName, string version)
-        {
-            if (!string.IsNullOrEmpty(version))
-            {
-                Console.WriteLine($"{applicationName} {version}");
-            }
-            else
-            {
-                Console.WriteLine($"{applicationName}");
-            }
-
-            Console.WriteLine(string.Empty);
-        }
-
-        public virtual void WriteShutdownMessage(string applicationName, string version)
-        {
-            Console.WriteLine("Shutting down");
-        }
-    }
-}
diff --git a/Source/Sholo.CommandLine.Containers/SplashService/SplashService.cs b/Source/Sholo.CommandLine.Containers/SplashService/SplashService.cs
deleted file mode 100644
index e2c50e1..0000000
--- a/Source/Sholo.CommandLine.Containers/SplashService/SplashService.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
-
-namespace Sholo.CommandLine.Containers.SplashService
-{
-    public class SplashService : IHostedService
-    {
-        private IOptions<ApplicationNameAndVersion> Options { get; }
-        private ISplash Splash { get; }
-
-        public SplashService(IOptions<ApplicationNameAndVersion> options, ISplash splash)
-        {
-            Options = options;
-            Splash = splash;
-        }
-
-        public Task StartAsync(CancellationToken cancellationToken)
-        {
-            Splash.WriteSplashMessage(Options.Value.Name, Options.Value.Version);
-            return Task.CompletedTask;
-        }
-
-        public Task StopAsync(CancellationToken cancellationToken)
-        {
-            Splash.WriteShutdownMessage(Options.Value.Name, Options.Value.Version);
-            return Task.CompletedTask;
-        }
-    }
-}
diff --git a/Tests/Directory.Build.props b/Tests/Directory.Build.props
index c53eb6e..893680b 100644
--- a/Tests/Directory.Build.props
+++ b/Tests/Directory.Build.props
@@ -7,13 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="coverlet.collector" PrivateAssets="All" Version="3.1.2">
+    <PackageReference Update="coverlet.collector" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Include="Moq" Version="4.18.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="xunit" Version="2.5.1" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" Version="2.5.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Tests/Sholo.CommandLine.Test/Sholo.CommandLine.Test.csproj b/Tests/Sholo.CommandLine.Test/Sholo.CommandLine.Test.csproj
index 9f176f5..553b400 100644
--- a/Tests/Sholo.CommandLine.Test/Sholo.CommandLine.Test.csproj
+++ b/Tests/Sholo.CommandLine.Test/Sholo.CommandLine.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="Project References">