diff --git a/build/.editorconfig b/build/.editorconfig
new file mode 100644
index 0000000..4e03cce
--- /dev/null
+++ b/build/.editorconfig
@@ -0,0 +1,5 @@
+[*.cs]
+# Nuke build fields use attribute-based reflection injection and cannot follow
+# the standard private field naming convention with underscore prefix.
+dotnet_naming_rule.private_fields_should_start_with_underscore.severity = none
+dotnet_naming_rule.private_static_fields_should_start_with_s_underscore.severity = none
diff --git a/build/Build.cs b/build/Build.cs
index 072052e..c66bbe7 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -17,7 +17,7 @@
 using static Nuke.Common.Tools.ReportGenerator.ReportGeneratorTasks;
 
 [ShutdownDotNetAfterServerBuild]
-class Build : NukeBuild
+internal class Build : NukeBuild
 {
     /// Support plugins are available for:
     ///   - JetBrains ReSharper        https://nuke.build/resharper
@@ -28,30 +28,30 @@ class Build : NukeBuild
     public static int Main() => Execute<Build>(x => x.Compile);
 
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
-    readonly string Configuration = IsLocalBuild ? "Debug" : "Release";
+    private readonly string Configuration = IsLocalBuild ? "Debug" : "Release";
 
     [Parameter("Enable code coverage collection")]
-    readonly bool CoverageEnabled = true;
+    private readonly bool CoverageEnabled = true;
 
     [Parameter("Verbosity level for build output")]
-    readonly DotNetVerbosity BuildVerbosity = DotNetVerbosity.minimal;
+    private readonly DotNetVerbosity BuildVerbosity = DotNetVerbosity.minimal;
 
     [Solution(GenerateProjects = false)]
-    readonly Solution Solution;
+    private readonly Solution Solution;
 
     [GitVersion(NoFetch = true, Framework = "net10.0")]
     [CanBeNull]
-    readonly GitVersion GitVersion;
+    private readonly GitVersion GitVersion;
 
-    AbsolutePath SourceDirectory => RootDirectory / "src";
-    AbsolutePath TestsDirectory => RootDirectory / "tests";
-    AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
-    AbsolutePath TestResultsDirectory => ArtifactsDirectory / "test-results";
-    AbsolutePath CoverageDirectory => ArtifactsDirectory / "coverage";
-    AbsolutePath PublishDirectory => ArtifactsDirectory / "publish";
-    AbsolutePath PackagesDirectory => ArtifactsDirectory / "packages";
+    private AbsolutePath SourceDirectory => RootDirectory / "src";
+    private AbsolutePath TestsDirectory => RootDirectory / "tests";
+    private AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
+    private AbsolutePath TestResultsDirectory => ArtifactsDirectory / "test-results";
+    private AbsolutePath CoverageDirectory => ArtifactsDirectory / "coverage";
+    private AbsolutePath PublishDirectory => ArtifactsDirectory / "publish";
+    private AbsolutePath PackagesDirectory => ArtifactsDirectory / "packages";
 
-    Target Clean => _ => _
+    private Target Clean => _ => _
         .Before(Restore)
         .Executes(() =>
         {
@@ -60,14 +60,14 @@ class Build : NukeBuild
             ArtifactsDirectory.CreateOrCleanDirectory();
         });
 
-    Target Restore => _ => _
+    private Target Restore => _ => _
         .Executes(() =>
         {
             DotNetRestore(s => s
                 .SetProjectFile(Solution));
         });
 
-    Target Compile => _ => _
+    private Target Compile => _ => _
         .DependsOn(Restore)
         .Executes(() =>
         {
@@ -81,7 +81,7 @@ class Build : NukeBuild
                 .SetVerbosity(BuildVerbosity));
         });
 
-    Target Test => _ => _
+    private Target Test => _ => _
         .DependsOn(Compile)
         .Produces(TestResultsDirectory / "*.trx")
         .Produces(CoverageDirectory / "*.xml")
@@ -110,7 +110,7 @@ class Build : NukeBuild
             DotNetTest(testSettings);
         });
 
-    Target IntegrationTest => _ => _
+    private Target IntegrationTest => _ => _
         .DependsOn(Compile)
         .Produces(TestResultsDirectory / "integration-*.trx")
         .Executes(() =>
@@ -129,7 +129,7 @@ class Build : NukeBuild
                     .SetProjectFile(project)));
         });
 
-    Target Coverage => _ => _
+    private Target Coverage => _ => _
         .DependsOn(Test)
         .Produces(CoverageDirectory / "*.xml")
         .Executes(() =>
@@ -143,7 +143,7 @@ class Build : NukeBuild
             }
         });
 
-    Target CoverageReport => _ => _
+    private Target CoverageReport => _ => _
         .DependsOn(Coverage)
         .Produces(CoverageDirectory / "report" / "**/*")
         .Executes(() =>
@@ -161,7 +161,7 @@ class Build : NukeBuild
             Log.Information("Coverage report generated: {Report}", CoverageDirectory / "report" / "index.html");
         });
 
-    Target Pack => _ => _
+    private Target Pack => _ => _
         .DependsOn(Compile)
         .Produces(PackagesDirectory / "*.nupkg")
         .Executes(() =>
@@ -176,7 +176,7 @@ class Build : NukeBuild
                 .SetVerbosity(BuildVerbosity));
         });
 
-    Target Publish => _ => _
+    private Target Publish => _ => _
         .DependsOn(Compile)
         .Produces(PublishDirectory / "**/*")
         .Executes(() =>
@@ -199,19 +199,19 @@ class Build : NukeBuild
                     .SetOutput(PublishDirectory / project.Name)));
         });
 
-    Target Format => _ => _
+    private Target Format => _ => _
         .Executes(() =>
         {
             DotNet($"format \"{Solution}\" --verbosity {Verbosity}");
         });
 
-    Target FormatVerify => _ => _
+    private Target FormatVerify => _ => _
         .Executes(() =>
         {
             DotNet($"format \"{Solution}\" --verify-no-changes --verbosity {Verbosity}");
         });
 
-    Target Lint => _ => _
+    private Target Lint => _ => _
         .DependsOn(Restore)
         .Executes(() =>
         {
@@ -224,12 +224,12 @@ class Build : NukeBuild
                 .SetVerbosity(BuildVerbosity));
         });
 
-    Target Default => _ => _
+    private Target Default => _ => _
         .DependsOn(Restore)
         .DependsOn(Compile)
         .DependsOn(Test);
 
-    Target Full => _ => _
+    private Target Full => _ => _
         .DependsOn(Clean)
         .DependsOn(Restore)
         .DependsOn(Compile)
@@ -238,7 +238,7 @@ class Build : NukeBuild
         .DependsOn(Pack)
         .DependsOn(Publish);
 
-    Target CI => _ => _
+    private Target CI => _ => _
         .DependsOn(Clean)
         .DependsOn(Restore)
         .DependsOn(Compile)
diff --git a/src/Core/PokManager.Application/Configuration/ArkConfigurationDefaults.cs b/src/Core/PokManager.Application/Configuration/ArkConfigurationDefaults.cs
index 60b2fb3..e6ac0e7 100644
--- a/src/Core/PokManager.Application/Configuration/ArkConfigurationDefaults.cs
+++ b/src/Core/PokManager.Application/Configuration/ArkConfigurationDefaults.cs
@@ -120,7 +120,7 @@ public static Dictionary<string, ArkConfigSetting> GetDefaults()
             { "bUseSingleplayerSettings", new ArkConfigSetting("False", "Advanced", "Use singleplayer settings multipliers") },
         };
     }
-    
+
     /// <summary>
     /// Represents an ARK configuration setting with metadata.
     /// </summary>
@@ -129,7 +129,7 @@ public class ArkConfigSetting
         public string DefaultValue { get; }
         public string Category { get; }
         public string Description { get; }
-        
+
         public ArkConfigSetting(string defaultValue, string category, string description)
         {
             DefaultValue = defaultValue;
diff --git a/src/Core/PokManager.Application/DependencyInjection/ApplicationServiceRegistration.cs b/src/Core/PokManager.Application/DependencyInjection/ApplicationServiceRegistration.cs
index c28e704..8a61746 100644
--- a/src/Core/PokManager.Application/DependencyInjection/ApplicationServiceRegistration.cs
+++ b/src/Core/PokManager.Application/DependencyInjection/ApplicationServiceRegistration.cs
@@ -1,6 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
-using FluentValidation;
 using System.Reflection;
+using FluentValidation;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace PokManager.Application.DependencyInjection;
 
diff --git a/src/Core/PokManager.Application/UseCases/InstanceLifecycle/CreateInstance/CreateInstanceRequestValidator.cs b/src/Core/PokManager.Application/UseCases/InstanceLifecycle/CreateInstance/CreateInstanceRequestValidator.cs
index bd82bce..da7cc3e 100644
--- a/src/Core/PokManager.Application/UseCases/InstanceLifecycle/CreateInstance/CreateInstanceRequestValidator.cs
+++ b/src/Core/PokManager.Application/UseCases/InstanceLifecycle/CreateInstance/CreateInstanceRequestValidator.cs
@@ -4,7 +4,7 @@ namespace PokManager.Application.UseCases.InstanceLifecycle.CreateInstance;
 
 public class CreateInstanceRequestValidator : AbstractValidator<CreateInstanceRequest>
 {
-    private static readonly string[] ValidMapNames = new[]
+    private static readonly string[] s_validMapNames = new[]
     {
         "TheIsland",
         "TheCenter",
@@ -34,7 +34,7 @@ public CreateInstanceRequestValidator()
 
         RuleFor(x => x.MapName)
             .NotEmpty().WithMessage("Map name cannot be empty")
-            .Must(BeAValidMapName).WithMessage($"Map name must be one of: {string.Join(", ", ValidMapNames)}");
+            .Must(BeAValidMapName).WithMessage($"Map name must be one of: {string.Join(", ", s_validMapNames)}");
 
         RuleFor(x => x.MaxPlayers)
             .InclusiveBetween(1, 127).WithMessage("Max players must be between 1 and 127");
@@ -71,6 +71,6 @@ public CreateInstanceRequestValidator()
 
     private bool BeAValidMapName(string mapName)
     {
-        return ValidMapNames.Contains(mapName, StringComparer.OrdinalIgnoreCase);
+        return s_validMapNames.Contains(mapName, StringComparer.OrdinalIgnoreCase);
     }
 }
diff --git a/src/Core/PokManager.Application/UseCases/InstanceManagement/SaveWorld/SaveWorldHandler.cs b/src/Core/PokManager.Application/UseCases/InstanceManagement/SaveWorld/SaveWorldHandler.cs
index e97ca1e..db7a395 100644
--- a/src/Core/PokManager.Application/UseCases/InstanceManagement/SaveWorld/SaveWorldHandler.cs
+++ b/src/Core/PokManager.Application/UseCases/InstanceManagement/SaveWorld/SaveWorldHandler.cs
@@ -1,8 +1,8 @@
+using System.Diagnostics;
 using PokManager.Application.Models;
 using PokManager.Application.Ports;
 using PokManager.Domain.Common;
 using PokManager.Domain.Enumerations;
-using System.Diagnostics;
 
 namespace PokManager.Application.UseCases.InstanceManagement.SaveWorld;
 
diff --git a/src/Core/PokManager.Domain/Entities/Instance.cs b/src/Core/PokManager.Domain/Entities/Instance.cs
index 0159473..a24043c 100644
--- a/src/Core/PokManager.Domain/Entities/Instance.cs
+++ b/src/Core/PokManager.Domain/Entities/Instance.cs
@@ -15,7 +15,7 @@ public class Instance(string instanceId, string sessionName, string mapName, int
     public string? ContainerId { get; set; }
 
     // State transition rules
-    private static readonly Dictionary<InstanceState, HashSet<InstanceState>> AllowedTransitions = new()
+    private static readonly Dictionary<InstanceState, HashSet<InstanceState>> s_allowedTransitions = new()
     {
         [InstanceState.Created] = new() { InstanceState.Starting },
         [InstanceState.Stopped] = new() { InstanceState.Starting, InstanceState.Deleted },
@@ -28,7 +28,7 @@ public class Instance(string instanceId, string sessionName, string mapName, int
 
     public Result<Unit> TransitionTo(InstanceState newState)
     {
-        if (!AllowedTransitions.TryGetValue(State, out var allowedStates))
+        if (!s_allowedTransitions.TryGetValue(State, out var allowedStates))
         {
             return Result.Failure<Unit>($"No transitions defined for state {State}");
         }
diff --git a/src/Core/PokManager.Domain/ValueObjects/BackupId.cs b/src/Core/PokManager.Domain/ValueObjects/BackupId.cs
index cb26d07..78b5710 100644
--- a/src/Core/PokManager.Domain/ValueObjects/BackupId.cs
+++ b/src/Core/PokManager.Domain/ValueObjects/BackupId.cs
@@ -5,7 +5,7 @@ namespace PokManager.Domain.ValueObjects;
 
 public sealed class BackupId : IEquatable<BackupId>
 {
-    private static readonly Regex ValidationPattern = new(
+    private static readonly Regex s_validationPattern = new(
         @"^([a-zA-Z0-9_-]+)_backup_(\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2})$",
         RegexOptions.Compiled);
 
@@ -29,7 +29,7 @@ public static Result<BackupId> Create(string value)
             return Result<BackupId>.Failure("BackupId cannot be empty or whitespace.");
         }
 
-        var match = ValidationPattern.Match(value);
+        var match = s_validationPattern.Match(value);
         if (!match.Success)
         {
             return Result<BackupId>.Failure(
diff --git a/src/Core/PokManager.Domain/ValueObjects/InstanceId.cs b/src/Core/PokManager.Domain/ValueObjects/InstanceId.cs
index cef2f5f..29bd7ca 100644
--- a/src/Core/PokManager.Domain/ValueObjects/InstanceId.cs
+++ b/src/Core/PokManager.Domain/ValueObjects/InstanceId.cs
@@ -5,7 +5,7 @@ namespace PokManager.Domain.ValueObjects;
 
 public sealed class InstanceId : IEquatable<InstanceId>
 {
-    private static readonly Regex ValidationPattern = new(@"^[a-zA-Z0-9_-]+$", RegexOptions.Compiled);
+    private static readonly Regex s_validationPattern = new(@"^[a-zA-Z0-9_-]+$", RegexOptions.Compiled);
     private const int MaxLength = 64;
 
     public string Value { get; }
@@ -27,7 +27,7 @@ public static Result<InstanceId> Create(string value)
             return Result<InstanceId>.Failure($"InstanceId cannot exceed {MaxLength} characters.");
         }
 
-        if (!ValidationPattern.IsMatch(value))
+        if (!s_validationPattern.IsMatch(value))
         {
             return Result<InstanceId>.Failure("InstanceId must contain only alphanumeric characters, hyphens, and underscores.");
         }
diff --git a/src/Core/PokManager.Domain/ValueObjects/ServerPassword.cs b/src/Core/PokManager.Domain/ValueObjects/ServerPassword.cs
index f5fa0cb..1fe18fb 100644
--- a/src/Core/PokManager.Domain/ValueObjects/ServerPassword.cs
+++ b/src/Core/PokManager.Domain/ValueObjects/ServerPassword.cs
@@ -5,7 +5,7 @@ namespace PokManager.Domain.ValueObjects;
 
 public sealed class ServerPassword : IEquatable<ServerPassword>
 {
-    private static readonly Regex ValidationPattern = new(@"^[a-zA-Z0-9]+$", RegexOptions.Compiled);
+    private static readonly Regex s_validationPattern = new(@"^[a-zA-Z0-9]+$", RegexOptions.Compiled);
     private const int MinLength = 4;
     private const int MaxLength = 64;
 
@@ -33,7 +33,7 @@ public static Result<ServerPassword> Create(string value)
             return Result<ServerPassword>.Failure($"ServerPassword cannot exceed {MaxLength} characters.");
         }
 
-        if (!ValidationPattern.IsMatch(value))
+        if (!s_validationPattern.IsMatch(value))
         {
             return Result<ServerPassword>.Failure("ServerPassword must contain only alphanumeric characters.");
         }
diff --git a/src/Hosting/PokManager.ServiceDefaults/Extensions.cs b/src/Hosting/PokManager.ServiceDefaults/Extensions.cs
index 1c4f9b3..3942434 100644
--- a/src/Hosting/PokManager.ServiceDefaults/Extensions.cs
+++ b/src/Hosting/PokManager.ServiceDefaults/Extensions.cs
@@ -110,7 +110,7 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
     {
         // Health checks are enabled in all environments for deployment verification
         // In production, consider adding authentication or IP restrictions if needed
-        
+
         // All health checks must pass for app to be considered ready to accept traffic after starting
         app.MapHealthChecks(HealthEndpointPath);
 
diff --git a/src/Infrastructure/PokManager.Infrastructure.Docker/Models/DockerComposeConfig.cs b/src/Infrastructure/PokManager.Infrastructure.Docker/Models/DockerComposeConfig.cs
index 3150753..f385dac 100644
--- a/src/Infrastructure/PokManager.Infrastructure.Docker/Models/DockerComposeConfig.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.Docker/Models/DockerComposeConfig.cs
@@ -30,7 +30,7 @@ public class DockerComposeConfig
     public int RestartNoticeMinutes { get; set; }
     public string TimeZone { get; set; } = string.Empty;
     public string MemoryLimit { get; set; } = string.Empty;
-    
+
     /// <summary>
     /// Path to the docker-compose file
     /// </summary>
diff --git a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DiskBasedInstanceDiscoveryService.cs b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DiskBasedInstanceDiscoveryService.cs
index c3da8f4..cde69f4 100644
--- a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DiskBasedInstanceDiscoveryService.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DiskBasedInstanceDiscoveryService.cs
@@ -1,7 +1,7 @@
+using Microsoft.Extensions.Logging;
 using PokManager.Application.Ports;
 using PokManager.Domain.Common;
 using PokManager.Infrastructure.Docker.Models;
-using Microsoft.Extensions.Logging;
 
 namespace PokManager.Infrastructure.Docker.Services;
 
diff --git a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerComposeParser.cs b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerComposeParser.cs
index cdf6b27..c28e482 100644
--- a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerComposeParser.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerComposeParser.cs
@@ -34,18 +34,18 @@ public class DockerComposeParser
                 .Build();
 
             var doc = deserializer.Deserialize<Dictionary<string, object>>(yaml);
-            
+
             if (!doc.ContainsKey("services"))
                 return null;
 
             var services = (Dictionary<object, object>)doc["services"];
             var firstService = services.Values.FirstOrDefault();
-            
+
             if (firstService == null)
                 return null;
 
             var service = (Dictionary<object, object>)firstService;
-            
+
             var config = new DockerComposeConfig
             {
                 ConfigFilePath = filePath
diff --git a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerInstanceDiscoveryService.cs b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerInstanceDiscoveryService.cs
index 057879b..15bf20d 100644
--- a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerInstanceDiscoveryService.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerInstanceDiscoveryService.cs
@@ -30,7 +30,7 @@ public async Task<Result<IReadOnlyList<string>>> DiscoverInstancesAsync(Cancella
         try
         {
             var containers = await _dockerService.ListContainersAsync(cancellationToken);
-            
+
             // Extract instance IDs from container names (remove 'asa_' prefix)
             var instanceIds = containers
                 .Where(c => c.Name.StartsWith("asa_", StringComparison.OrdinalIgnoreCase))
diff --git a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerPokManagerClient.cs b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerPokManagerClient.cs
index 46dee9f..2388642 100644
--- a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerPokManagerClient.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/DockerPokManagerClient.cs
@@ -194,9 +194,9 @@ public async Task<Result<Unit>> StartInstanceAsync(string instanceId, Cancellati
         {
             var containerName = $"asa_{instanceId}";
             var success = await _dockerService.StartContainerAsync(containerName, cancellationToken);
-            
-            return success 
-                ? Result.Success() 
+
+            return success
+                ? Result.Success()
                 : Result.Failure<Unit>($"Failed to start instance '{instanceId}'");
         }
         catch (Exception ex)
@@ -211,9 +211,9 @@ public async Task<Result<Unit>> StopInstanceAsync(string instanceId, StopInstanc
         {
             var containerName = $"asa_{instanceId}";
             var success = await _dockerService.StopContainerAsync(containerName, cancellationToken);
-            
-            return success 
-                ? Result.Success() 
+
+            return success
+                ? Result.Success()
                 : Result.Failure<Unit>($"Failed to stop instance '{instanceId}'");
         }
         catch (Exception ex)
@@ -228,9 +228,9 @@ public async Task<Result<Unit>> RestartInstanceAsync(string instanceId, RestartI
         {
             var containerName = $"asa_{instanceId}";
             var success = await _dockerService.RestartContainerAsync(containerName, cancellationToken);
-            
-            return success 
-                ? Result.Success() 
+
+            return success
+                ? Result.Success()
                 : Result.Failure<Unit>($"Failed to restart instance '{instanceId}'");
         }
         catch (Exception ex)
@@ -272,7 +272,7 @@ private async Task<Dictionary<string, string>> GetContainerEnvironmentAsync(stri
         await process.WaitForExitAsync(cancellationToken);
 
         var envVars = new Dictionary<string, string>();
-        
+
         try
         {
             var envArray = JsonSerializer.Deserialize<string[]>(output);
@@ -315,7 +315,7 @@ private async Task<Dictionary<string, string>> GetContainerStateAsync(string con
         await process.WaitForExitAsync(cancellationToken);
 
         var state = new Dictionary<string, string>();
-        
+
         try
         {
             var stateJson = JsonSerializer.Deserialize<JsonElement>(output);
@@ -546,7 +546,7 @@ public async Task<Result<IReadOnlyList<LogEntry>>> GetLogsAsync(string instanceI
             var containerName = $"asa_{instanceId}";
             var lines = options?.MaxLines ?? 100;
             var logs = await _dockerService.GetContainerLogsAsync(containerName, lines, cancellationToken);
-            
+
             // Parse logs into LogEntry objects (simple implementation for now)
             var logEntries = logs.Split('\n')
                 .Where(line => !string.IsNullOrWhiteSpace(line))
diff --git a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/LocalDockerComposeService.cs b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/LocalDockerComposeService.cs
index 7307ba3..9bcb289 100644
--- a/src/Infrastructure/PokManager.Infrastructure.Docker/Services/LocalDockerComposeService.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.Docker/Services/LocalDockerComposeService.cs
@@ -1,7 +1,7 @@
-using PokManager.Domain.Common;
-using PokManager.Application.Ports;
-using Microsoft.Extensions.Logging;
 using System.Diagnostics;
+using Microsoft.Extensions.Logging;
+using PokManager.Application.Ports;
+using PokManager.Domain.Common;
 
 namespace PokManager.Infrastructure.Docker.Services;
 
diff --git a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/BackupListParser.cs b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/BackupListParser.cs
index 5e840fa..31d4160 100644
--- a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/BackupListParser.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/BackupListParser.cs
@@ -12,12 +12,12 @@ namespace PokManager.Infrastructure.PokManager.PokManager.Parsers;
 /// </summary>
 public class BackupListParser : IPokManagerOutputParser<IReadOnlyList<ParsedBackupInfo>>
 {
-    private static readonly Regex BackupPattern = new(
+    private static readonly Regex s_backupPattern = new(
         @"backup_(?<instanceId>.+?)_(?<date>\d{8})_(?<time>\d{6})\.tar\.(?<compression>gz|zst|.+?)(?:\s|$|,)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
 
-    private static readonly Regex ErrorPattern = new(
+    private static readonly Regex s_errorPattern = new(
         @"Error:\s*(?<message>.+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
@@ -31,7 +31,7 @@ public Result<IReadOnlyList<ParsedBackupInfo>> Parse(string output)
         }
 
         // Check for error messages first
-        var errorMatch = ErrorPattern.Match(output);
+        var errorMatch = s_errorPattern.Match(output);
         if (errorMatch.Success)
         {
             var errorMessage = errorMatch.Groups["message"].Value.Trim();
@@ -53,7 +53,7 @@ public Result<IReadOnlyList<ParsedBackupInfo>> Parse(string output)
             var fileName = Path.GetFileName(trimmedLine);
 
             // Add space at the end to help regex match
-            var match = BackupPattern.Match(fileName + " ");
+            var match = s_backupPattern.Match(fileName + " ");
             if (!match.Success)
             {
                 continue;
diff --git a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/DetailsOutputParser.cs b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/DetailsOutputParser.cs
index 79fa0d3..727e311 100644
--- a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/DetailsOutputParser.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/DetailsOutputParser.cs
@@ -14,7 +14,7 @@ namespace PokManager.Infrastructure.PokManager.PokManager.Parsers;
 /// </summary>
 public class DetailsOutputParser : IPokManagerOutputParser<Dictionary<string, string>>
 {
-    private static readonly Regex ErrorPattern = new(
+    private static readonly Regex s_errorPattern = new(
         @"Error:\s*(?<message>.+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
@@ -32,7 +32,7 @@ public Result<Dictionary<string, string>> Parse(string output)
         }
 
         // Check for error messages first
-        var errorMatch = ErrorPattern.Match(output);
+        var errorMatch = s_errorPattern.Match(output);
         if (errorMatch.Success)
         {
             var errorMessage = errorMatch.Groups["message"].Value.Trim();
diff --git a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/ErrorOutputParser.cs b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/ErrorOutputParser.cs
index be96328..9d2b594 100644
--- a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/ErrorOutputParser.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/ErrorOutputParser.cs
@@ -10,12 +10,12 @@ namespace PokManager.Infrastructure.PokManager.PokManager.Parsers;
 /// </summary>
 public class ErrorOutputParser : IPokManagerOutputParser<PokManagerError>
 {
-    private static readonly Regex ErrorPattern = new(
+    private static readonly Regex s_errorPattern = new(
         @"Error:\s*(?<message>.+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline
     );
 
-    private static readonly Dictionary<PokManagerErrorCode, string[]> ErrorPatterns = new()
+    private static readonly Dictionary<PokManagerErrorCode, string[]> s_errorPatterns = new()
     {
         [PokManagerErrorCode.InstanceNotFound] = new[] { "instance not found", "does not exist", "cannot find", "unknown instance" },
         [PokManagerErrorCode.InstanceAlreadyExists] = new[] { "already exists", "duplicate" },
@@ -38,7 +38,7 @@ public Result<PokManagerError> Parse(string output)
         }
 
         // Check if this is an error message
-        var match = ErrorPattern.Match(output);
+        var match = s_errorPattern.Match(output);
         if (!match.Success)
         {
             return Result<PokManagerError>.Failure("Output is not an error message");
@@ -61,7 +61,7 @@ private static PokManagerErrorCode CategorizeError(string message)
         var lowerMessage = message.ToLowerInvariant();
 
         // Check patterns in priority order
-        foreach (var (errorCode, patterns) in ErrorPatterns)
+        foreach (var (errorCode, patterns) in s_errorPatterns)
         {
             foreach (var pattern in patterns)
             {
diff --git a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/ListInstancesParser.cs b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/ListInstancesParser.cs
index 979ed37..0ea8ba1 100644
--- a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/ListInstancesParser.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/ListInstancesParser.cs
@@ -12,12 +12,12 @@ namespace PokManager.Infrastructure.PokManager.PokManager.Parsers;
 /// </summary>
 public class ListInstancesParser : IPokManagerOutputParser<IReadOnlyList<string>>
 {
-    private static readonly Regex InstancePattern = new(
+    private static readonly Regex s_instancePattern = new(
         @"\bInstance_(?<instanceId>[^\s,\r\n]+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
 
-    private static readonly Regex ErrorPattern = new(
+    private static readonly Regex s_errorPattern = new(
         @"Error:\s*(?<message>.+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
@@ -31,7 +31,7 @@ public Result<IReadOnlyList<string>> Parse(string output)
         }
 
         // Check for error messages first
-        var errorMatch = ErrorPattern.Match(output);
+        var errorMatch = s_errorPattern.Match(output);
         if (errorMatch.Success)
         {
             var errorMessage = errorMatch.Groups["message"].Value.Trim();
@@ -40,7 +40,7 @@ public Result<IReadOnlyList<string>> Parse(string output)
 
         // Find all instances using regex
         var instances = new List<string>();
-        var matches = InstancePattern.Matches(output);
+        var matches = s_instancePattern.Matches(output);
 
         foreach (Match match in matches)
         {
diff --git a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/StatusOutputParser.cs b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/StatusOutputParser.cs
index d6c5ac5..5d90c47 100644
--- a/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/StatusOutputParser.cs
+++ b/src/Infrastructure/PokManager.Infrastructure.PokManager/PokManager/Parsers/StatusOutputParser.cs
@@ -11,12 +11,12 @@ namespace PokManager.Infrastructure.PokManager.PokManager.Parsers;
 /// </summary>
 public class StatusOutputParser : IPokManagerOutputParser<InstanceStatus>
 {
-    private static readonly Regex StatusPattern = new(
+    private static readonly Regex s_statusPattern = new(
         @"Instance:\s*(?<instance>[^,]+)\s*,\s*State:\s*(?<state>[^,]+)\s*,\s*Container:\s*(?<container>[^,]+)\s*,\s*Health:\s*(?<health>[^,\s]+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
 
-    private static readonly Regex ErrorPattern = new(
+    private static readonly Regex s_errorPattern = new(
         @"Error:\s*(?<message>.+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
@@ -29,7 +29,7 @@ public Result<InstanceStatus> Parse(string output)
         }
 
         // Check for error messages first
-        var errorMatch = ErrorPattern.Match(output);
+        var errorMatch = s_errorPattern.Match(output);
         if (errorMatch.Success)
         {
             var errorMessage = errorMatch.Groups["message"].Value.Trim();
@@ -37,7 +37,7 @@ public Result<InstanceStatus> Parse(string output)
         }
 
         // Parse status output
-        var match = StatusPattern.Match(output);
+        var match = s_statusPattern.Match(output);
         if (!match.Success)
         {
             return Result<InstanceStatus>.Failure("Failed to parse status output: invalid format");
diff --git a/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryAuditSink.cs b/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryAuditSink.cs
index ecd5715..f4848b5 100644
--- a/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryAuditSink.cs
+++ b/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryAuditSink.cs
@@ -1,7 +1,7 @@
-using PokManager.Application.Ports;
+using System.Collections.Concurrent;
 using PokManager.Application.Models;
+using PokManager.Application.Ports;
 using PokManager.Domain.Common;
-using System.Collections.Concurrent;
 
 namespace PokManager.Infrastructure.Fakes;
 
diff --git a/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryBackupStore.cs b/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryBackupStore.cs
index d404ed1..66fede3 100644
--- a/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryBackupStore.cs
+++ b/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryBackupStore.cs
@@ -1,7 +1,7 @@
-using PokManager.Application.Ports;
+using System.Collections.Concurrent;
 using PokManager.Application.Models;
+using PokManager.Application.Ports;
 using PokManager.Domain.Common;
-using System.Collections.Concurrent;
 
 namespace PokManager.Infrastructure.Fakes;
 
diff --git a/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryOperationLockManager.cs b/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryOperationLockManager.cs
index 6d7ed61..d035979 100644
--- a/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryOperationLockManager.cs
+++ b/src/Infrastructure/PokManager.Infrastructure/Fakes/InMemoryOperationLockManager.cs
@@ -1,6 +1,6 @@
+using System.Collections.Concurrent;
 using PokManager.Application.Ports;
 using PokManager.Domain.Common;
-using System.Collections.Concurrent;
 
 namespace PokManager.Infrastructure.Fakes;
 
diff --git a/src/Infrastructure/PokManager.Infrastructure/PokManager/Commands/PokManagerCommandBuilder.cs b/src/Infrastructure/PokManager.Infrastructure/PokManager/Commands/PokManagerCommandBuilder.cs
index 5219c42..ba05d88 100644
--- a/src/Infrastructure/PokManager.Infrastructure/PokManager/Commands/PokManagerCommandBuilder.cs
+++ b/src/Infrastructure/PokManager.Infrastructure/PokManager/Commands/PokManagerCommandBuilder.cs
@@ -11,12 +11,12 @@ namespace PokManager.Infrastructure.PokManager.Commands;
 /// </summary>
 public sealed class PokManagerCommandBuilder
 {
-    private static readonly Regex DangerousCharactersPattern = new(
+    private static readonly Regex s_dangerousCharactersPattern = new(
         @"[;&|`$()<>\\]",
         RegexOptions.Compiled
     );
 
-    private static readonly Regex PathTraversalPattern = new(
+    private static readonly Regex s_pathTraversalPattern = new(
         @"\.\./",
         RegexOptions.Compiled
     );
@@ -145,7 +145,7 @@ public Result<string> Build()
     private static Result<Unit> ValidateArgumentValue(string key, string value)
     {
         // Check for dangerous characters that could lead to command injection
-        if (DangerousCharactersPattern.IsMatch(value))
+        if (s_dangerousCharactersPattern.IsMatch(value))
         {
             return Result.Failure<Unit>(
                 $"Argument '{key}' contains dangerous characters that could lead to command injection."
@@ -153,7 +153,7 @@ private static Result<Unit> ValidateArgumentValue(string key, string value)
         }
 
         // Check for path traversal attempts
-        if (PathTraversalPattern.IsMatch(value))
+        if (s_pathTraversalPattern.IsMatch(value))
         {
             return Result.Failure<Unit>(
                 $"Argument '{key}' contains path traversal patterns which are not allowed."
diff --git a/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/ConfigOutputParser.cs b/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/ConfigOutputParser.cs
index 86c5fa0..32eb7d9 100644
--- a/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/ConfigOutputParser.cs
+++ b/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/ConfigOutputParser.cs
@@ -9,27 +9,27 @@ namespace PokManager.Infrastructure.PokManager.Parsers;
 /// </summary>
 public class ConfigOutputParser
 {
-    private static readonly Regex ConfigLinePattern = new(
+    private static readonly Regex s_configLinePattern = new(
         @"^(?<key>[^:]+):\s*(?<value>.+)$",
         RegexOptions.Compiled
     );
 
-    private static readonly Regex ValidationResultPattern = new(
+    private static readonly Regex s_validationResultPattern = new(
         @"Configuration\s+validation:\s*(?<result>PASSED|FAILED)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
 
-    private static readonly Regex ErrorLinePattern = new(
+    private static readonly Regex s_errorLinePattern = new(
         @"^\s*-\s*(?<error>.+)$",
         RegexOptions.Compiled
     );
 
-    private static readonly Regex WarningLinePattern = new(
+    private static readonly Regex s_warningLinePattern = new(
         @"^\s*-\s*(?<warning>.+)$",
         RegexOptions.Compiled
     );
 
-    private static readonly Regex ChangedSettingsPattern = new(
+    private static readonly Regex s_changedSettingsPattern = new(
         @"Changed\s+settings:\s*(?<settings>.+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
@@ -50,7 +50,7 @@ public Result<IReadOnlyDictionary<string, string>> ParseConfiguration(string out
         foreach (var line in lines)
         {
             var trimmedLine = line.Trim();
-            var match = ConfigLinePattern.Match(trimmedLine);
+            var match = s_configLinePattern.Match(trimmedLine);
 
             if (match.Success)
             {
@@ -78,7 +78,7 @@ public Result<ConfigurationValidationResult> ParseValidation(string output)
             return Result.Failure<ConfigurationValidationResult>("Output is null or empty");
         }
 
-        var validationMatch = ValidationResultPattern.Match(output);
+        var validationMatch = s_validationResultPattern.Match(output);
         var isValid = validationMatch.Success &&
             validationMatch.Groups["result"].Value.Equals("PASSED", StringComparison.OrdinalIgnoreCase);
 
@@ -163,7 +163,7 @@ public Result<ApplyConfigurationResult> ParseApplyConfiguration(string output)
         var success = successPattern.IsMatch(output);
 
         var changedSettings = new List<string>();
-        var changedSettingsMatch = ChangedSettingsPattern.Match(output);
+        var changedSettingsMatch = s_changedSettingsPattern.Match(output);
         if (changedSettingsMatch.Success)
         {
             var settingsStr = changedSettingsMatch.Groups["settings"].Value;
diff --git a/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/LogOutputParser.cs b/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/LogOutputParser.cs
index b5a2e9b..18af128 100644
--- a/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/LogOutputParser.cs
+++ b/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/LogOutputParser.cs
@@ -9,12 +9,12 @@ namespace PokManager.Infrastructure.PokManager.Parsers;
 /// </summary>
 public class LogOutputParser
 {
-    private static readonly Regex LogLinePattern = new(
+    private static readonly Regex s_logLinePattern = new(
         @"^(?<timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[Z\+\-\d:]*)\s*\[(?<level>[^\]]+)\]\s*(?<message>.+)$",
         RegexOptions.Compiled
     );
 
-    private static readonly Regex SourcePattern = new(
+    private static readonly Regex s_sourcePattern = new(
         @"\[(?<source>[^\]]+)\]",
         RegexOptions.Compiled
     );
@@ -45,7 +45,7 @@ public Result<IReadOnlyList<LogEntry>> ParseLogs(string output, string instanceI
                 continue;
             }
 
-            var match = LogLinePattern.Match(trimmedLine);
+            var match = s_logLinePattern.Match(trimmedLine);
             if (!match.Success)
             {
                 // If line doesn't match expected format, treat it as continuation of previous log
@@ -83,7 +83,7 @@ public Result<IReadOnlyList<LogEntry>> ParseLogs(string output, string instanceI
 
             // Try to extract source from message
             string? source = null;
-            var sourceMatch = SourcePattern.Match(message);
+            var sourceMatch = s_sourcePattern.Match(message);
             if (sourceMatch.Success)
             {
                 source = sourceMatch.Groups["source"].Value;
@@ -125,7 +125,7 @@ public Result<LogEntry> ParseLogLine(string line, string instanceId)
             return Result.Failure<LogEntry>("Instance ID cannot be null or empty");
         }
 
-        var match = LogLinePattern.Match(line.Trim());
+        var match = s_logLinePattern.Match(line.Trim());
         if (!match.Success)
         {
             // Treat as simple info log if pattern doesn't match
@@ -161,7 +161,7 @@ public Result<LogEntry> ParseLogLine(string line, string instanceId)
         };
 
         string? source = null;
-        var sourceMatch = SourcePattern.Match(message);
+        var sourceMatch = s_sourcePattern.Match(message);
         if (sourceMatch.Success)
         {
             source = sourceMatch.Groups["source"].Value;
diff --git a/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/UpdateOutputParser.cs b/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/UpdateOutputParser.cs
index 7bbcfe8..5e2b50e 100644
--- a/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/UpdateOutputParser.cs
+++ b/src/Infrastructure/PokManager.Infrastructure/PokManager/Parsers/UpdateOutputParser.cs
@@ -9,32 +9,32 @@ namespace PokManager.Infrastructure.PokManager.Parsers;
 /// </summary>
 public class UpdateOutputParser
 {
-    private static readonly Regex CurrentVersionPattern = new(
+    private static readonly Regex s_currentVersionPattern = new(
         @"Current\s+version:\s*(?<version>[\d\.]+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
 
-    private static readonly Regex LatestVersionPattern = new(
+    private static readonly Regex s_latestVersionPattern = new(
         @"Latest\s+version:\s*(?<version>[\d\.]+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
 
-    private static readonly Regex UpdateAvailablePattern = new(
+    private static readonly Regex s_updateAvailablePattern = new(
         @"Update\s+available:\s*(?<available>Yes|No|True|False)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
 
-    private static readonly Regex EstimatedSizePattern = new(
+    private static readonly Regex s_estimatedSizePattern = new(
         @"Estimated\s+size:\s*(?<size>\d+)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
 
-    private static readonly Regex RequiresRestartPattern = new(
+    private static readonly Regex s_requiresRestartPattern = new(
         @"Requires\s+restart:\s*(?<restart>Yes|No|True|False)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled
     );
 
-    private static readonly Regex ReleaseNotesPattern = new(
+    private static readonly Regex s_releaseNotesPattern = new(
         @"Release\s+notes:\s*(?<notes>.+?)(?=\n[A-Z]|\z)",
         RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Singleline
     );
@@ -49,12 +49,12 @@ public Result<UpdateAvailability> ParseCheckForUpdates(string output)
             return Result.Failure<UpdateAvailability>("Output is null or empty");
         }
 
-        var currentVersionMatch = CurrentVersionPattern.Match(output);
-        var latestVersionMatch = LatestVersionPattern.Match(output);
-        var updateAvailableMatch = UpdateAvailablePattern.Match(output);
-        var estimatedSizeMatch = EstimatedSizePattern.Match(output);
-        var requiresRestartMatch = RequiresRestartPattern.Match(output);
-        var releaseNotesMatch = ReleaseNotesPattern.Match(output);
+        var currentVersionMatch = s_currentVersionPattern.Match(output);
+        var latestVersionMatch = s_latestVersionPattern.Match(output);
+        var updateAvailableMatch = s_updateAvailablePattern.Match(output);
+        var estimatedSizeMatch = s_estimatedSizePattern.Match(output);
+        var requiresRestartMatch = s_requiresRestartPattern.Match(output);
+        var releaseNotesMatch = s_releaseNotesPattern.Match(output);
 
         var currentVersion = currentVersionMatch.Success
             ? currentVersionMatch.Groups["version"].Value.Trim()
@@ -139,7 +139,7 @@ public Result<UpdateResult> ParseApplyUpdates(string output)
             (restartedMatch.Groups["restarted"].Value.Equals("Yes", StringComparison.OrdinalIgnoreCase) ||
              output.Contains("Restarting server", StringComparison.OrdinalIgnoreCase));
 
-        var requiresRestartMatch = RequiresRestartPattern.Match(output);
+        var requiresRestartMatch = s_requiresRestartPattern.Match(output);
         var requiredRestart = requiresRestartMatch.Success &&
             (requiresRestartMatch.Groups["restart"].Value.Equals("Yes", StringComparison.OrdinalIgnoreCase) ||
              requiresRestartMatch.Groups["restart"].Value.Equals("True", StringComparison.OrdinalIgnoreCase));
diff --git a/src/Infrastructure/PokManager.Infrastructure/Shell/BashCommandExecutor.cs b/src/Infrastructure/PokManager.Infrastructure/Shell/BashCommandExecutor.cs
index abe4534..d0e7308 100644
--- a/src/Infrastructure/PokManager.Infrastructure/Shell/BashCommandExecutor.cs
+++ b/src/Infrastructure/PokManager.Infrastructure/Shell/BashCommandExecutor.cs
@@ -106,8 +106,10 @@ public async Task<BashCommandResult> ExecuteAsync(
             // Wait for the completion to finish
             await completedTask;
 
-            // Ensure all output is captured
-            await Task.Delay(100, cancellationToken); // Small delay to ensure all data is received
+            // Ensure all async stdout/stderr output has been fully delivered.
+            // Process.WaitForExit() (no timeout) guarantees all output stream
+            // handlers have completed when BeginOutputReadLine/BeginErrorReadLine are used.
+            process.WaitForExit();
 
             var exitCode = process.ExitCode;
             var stdOut = stdOutBuilder.ToString().TrimEnd();
diff --git a/src/Presentation/PokManager.ApiService/Endpoints/BackupEndpoints.cs b/src/Presentation/PokManager.ApiService/Endpoints/BackupEndpoints.cs
index 3de46e3..23092fe 100644
--- a/src/Presentation/PokManager.ApiService/Endpoints/BackupEndpoints.cs
+++ b/src/Presentation/PokManager.ApiService/Endpoints/BackupEndpoints.cs
@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
+using PokManager.Application.BackgroundWorkers;
+using PokManager.Application.Caching;
+using PokManager.Application.Configuration;
+using PokManager.Application.Ports;
 using PokManager.Application.UseCases.BackupManagement.CreateBackup;
 using PokManager.Application.UseCases.BackupManagement.ListBackups;
 using PokManager.Application.UseCases.BackupManagement.RestoreBackup;
 using PokManager.Application.UseCases.BackupManagement.UploadBackup;
-using PokManager.Application.Caching;
-using PokManager.Application.Ports;
-using PokManager.Application.BackgroundWorkers;
-using PokManager.Application.Configuration;
 
 namespace PokManager.ApiService.Endpoints;
 
diff --git a/src/Presentation/PokManager.ApiService/Endpoints/CacheEndpoints.cs b/src/Presentation/PokManager.ApiService/Endpoints/CacheEndpoints.cs
index b811499..c6463d8 100644
--- a/src/Presentation/PokManager.ApiService/Endpoints/CacheEndpoints.cs
+++ b/src/Presentation/PokManager.ApiService/Endpoints/CacheEndpoints.cs
@@ -1,5 +1,5 @@
-using PokManager.Application.Ports;
 using PokManager.Application.BackgroundWorkers;
+using PokManager.Application.Ports;
 
 namespace PokManager.ApiService.Endpoints;
 
diff --git a/src/Presentation/PokManager.ApiService/Endpoints/GameConfigurationEndpoints.cs b/src/Presentation/PokManager.ApiService/Endpoints/GameConfigurationEndpoints.cs
index eef0718..7fdcbd2 100644
--- a/src/Presentation/PokManager.ApiService/Endpoints/GameConfigurationEndpoints.cs
+++ b/src/Presentation/PokManager.ApiService/Endpoints/GameConfigurationEndpoints.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
-using PokManager.Application.UseCases.ConfigurationManagement.GetConfiguration;
 using PokManager.Application.UseCases.Configuration.ApplyConfiguration;
+using PokManager.Application.UseCases.ConfigurationManagement.GetConfiguration;
 
 namespace PokManager.ApiService.Endpoints;
 
diff --git a/src/Presentation/PokManager.ApiService/Endpoints/InstanceEndpoints.cs b/src/Presentation/PokManager.ApiService/Endpoints/InstanceEndpoints.cs
index e2baa1e..15891da 100644
--- a/src/Presentation/PokManager.ApiService/Endpoints/InstanceEndpoints.cs
+++ b/src/Presentation/PokManager.ApiService/Endpoints/InstanceEndpoints.cs
@@ -1,12 +1,12 @@
+using PokManager.Application.BackgroundWorkers;
+using PokManager.Application.Caching;
+using PokManager.Application.Configuration;
+using PokManager.Application.Ports;
 using PokManager.Application.UseCases.InstanceDiscovery.ListInstances;
-using PokManager.Application.UseCases.InstanceQuery;
+using PokManager.Application.UseCases.InstanceLifecycle.RestartInstance;
 using PokManager.Application.UseCases.InstanceLifecycle.StartInstance;
 using PokManager.Application.UseCases.InstanceLifecycle.StopInstance;
-using PokManager.Application.UseCases.InstanceLifecycle.RestartInstance;
-using PokManager.Application.Caching;
-using PokManager.Application.Ports;
-using PokManager.Application.BackgroundWorkers;
-using PokManager.Application.Configuration;
+using PokManager.Application.UseCases.InstanceQuery;
 
 namespace PokManager.ApiService.Endpoints;
 
@@ -22,9 +22,9 @@ public static void MapInstanceEndpoints(this IEndpointRouteBuilder routes)
             CancellationToken ct) =>
         {
             var result = await handler.Handle(new ListInstancesRequest(), ct);
-            
-            return result.IsSuccess 
-                ? Results.Ok(result.Value) 
+
+            return result.IsSuccess
+                ? Results.Ok(result.Value)
                 : Results.BadRequest(new { error = result.Error });
         })
         .WithName("ListInstances")
@@ -92,11 +92,11 @@ await refreshQueue.EnqueueAsync(
             CancellationToken ct) =>
         {
             var result = await handler.Handle(
-                new StartInstanceRequest(instanceId, Guid.NewGuid().ToString()), 
+                new StartInstanceRequest(instanceId, Guid.NewGuid().ToString()),
                 ct);
-            
-            return result.IsSuccess 
-                ? Results.Ok(new { message = result.Value.Message }) 
+
+            return result.IsSuccess
+                ? Results.Ok(new { message = result.Value.Message })
                 : Results.BadRequest(new { error = result.Error });
         })
         .WithName("StartInstance")
@@ -109,11 +109,11 @@ await refreshQueue.EnqueueAsync(
             CancellationToken ct) =>
         {
             var result = await handler.Handle(
-                new StopInstanceRequest(instanceId, Guid.NewGuid().ToString(), ForceKill: false), 
+                new StopInstanceRequest(instanceId, Guid.NewGuid().ToString(), ForceKill: false),
                 ct);
-            
-            return result.IsSuccess 
-                ? Results.Ok(new { message = result.Value.Message }) 
+
+            return result.IsSuccess
+                ? Results.Ok(new { message = result.Value.Message })
                 : Results.BadRequest(new { error = result.Error });
         })
         .WithName("StopInstance")
@@ -126,11 +126,11 @@ await refreshQueue.EnqueueAsync(
             CancellationToken ct) =>
         {
             var result = await handler.Handle(
-                new RestartInstanceRequest(instanceId, Guid.NewGuid().ToString(), GracePeriodSeconds: 30), 
+                new RestartInstanceRequest(instanceId, Guid.NewGuid().ToString(), GracePeriodSeconds: 30),
                 ct);
-            
-            return result.IsSuccess 
-                ? Results.Ok(new { message = result.Value.Message }) 
+
+            return result.IsSuccess
+                ? Results.Ok(new { message = result.Value.Message })
                 : Results.BadRequest(new { error = result.Error });
         })
         .WithName("RestartInstance")
@@ -148,7 +148,7 @@ await refreshQueue.EnqueueAsync(
                 // Get container ID for the instance
                 var containers = await dockerService.ListContainersAsync(ct);
                 var container = containers.FirstOrDefault(c => c.Name.Contains(instanceId, StringComparison.OrdinalIgnoreCase));
-                
+
                 if (container == null)
                 {
                     return Results.NotFound(new { error = $"Container for instance '{instanceId}' not found" });
@@ -156,8 +156,9 @@ await refreshQueue.EnqueueAsync(
 
                 // Fetch logs from Docker
                 var logs = await dockerService.GetContainerLogsAsync(container.Id, tail, ct);
-                
-                return Results.Ok(new { 
+
+                return Results.Ok(new
+                {
                     instanceId = instanceId,
                     containerId = container.Id,
                     logs = logs
@@ -184,7 +185,7 @@ await refreshQueue.EnqueueAsync(
                 // Path to docker-compose files on the server
                 var basePath = "/home/pokuser/asa_server";
                 var configPath = Path.Combine(basePath, $"Instance_{instanceId}", $"docker-compose-{instanceId}.yaml");
-                
+
                 if (!File.Exists(configPath))
                 {
                     return Results.NotFound(new { error = $"Configuration file not found for instance '{instanceId}'" });
@@ -192,7 +193,7 @@ await refreshQueue.EnqueueAsync(
 
                 var parser = new PokManager.Infrastructure.Docker.Services.DockerComposeParser();
                 var config = parser.ParseFile(configPath);
-                
+
                 if (config == null)
                 {
                     return Results.Problem(
diff --git a/src/Presentation/PokManager.ApiService/Endpoints/LogEndpoints.cs b/src/Presentation/PokManager.ApiService/Endpoints/LogEndpoints.cs
index c699564..c300f62 100644
--- a/src/Presentation/PokManager.ApiService/Endpoints/LogEndpoints.cs
+++ b/src/Presentation/PokManager.ApiService/Endpoints/LogEndpoints.cs
@@ -31,7 +31,8 @@ public static void MapLogEndpoints(this IEndpointRouteBuilder routes)
                     lines = lines.TakeLast(tail.Value).ToArray();
                 }
 
-                return Results.Ok(new {
+                return Results.Ok(new
+                {
                     instanceId,
                     logType = "game",
                     content = string.Join(Environment.NewLine, lines),
@@ -145,7 +146,8 @@ public static void MapLogEndpoints(this IEndpointRouteBuilder routes)
                     lines = lines.TakeLast(tail.Value).ToArray();
                 }
 
-                return Results.Ok(new {
+                return Results.Ok(new
+                {
                     instanceId,
                     logType = "api",
                     fileName = latestLog.Name,
diff --git a/src/Presentation/PokManager.ApiService/Program.cs b/src/Presentation/PokManager.ApiService/Program.cs
index 6524bba..54f36c9 100644
--- a/src/Presentation/PokManager.ApiService/Program.cs
+++ b/src/Presentation/PokManager.ApiService/Program.cs
@@ -1,33 +1,33 @@
+using Microsoft.EntityFrameworkCore;
 using PokManager.ApiService.Endpoints;
-using PokManager.Infrastructure.Docker.Services;
+using PokManager.Application.Configuration;
 using PokManager.Application.Ports;
-using PokManager.Application.UseCases.InstanceDiscovery.ListInstances;
-using PokManager.Application.UseCases.InstanceQuery;
-using PokManager.Application.UseCases.InstanceLifecycle.StartInstance;
-using PokManager.Application.UseCases.InstanceLifecycle.StopInstance;
-using PokManager.Application.UseCases.InstanceLifecycle.RestartInstance;
-using PokManager.Application.UseCases.InstanceLifecycle.CreateContainer;
-using PokManager.Application.UseCases.InstanceLifecycle.DestroyContainer;
-using PokManager.Application.UseCases.InstanceLifecycle.RecreateContainer;
-using PokManager.Application.UseCases.BackupManagement.ListBackups;
 using PokManager.Application.UseCases.BackupManagement.CreateBackup;
+using PokManager.Application.UseCases.BackupManagement.ListBackups;
 using PokManager.Application.UseCases.BackupManagement.RestoreBackup;
 using PokManager.Application.UseCases.BackupManagement.UploadBackup;
-using PokManager.Application.UseCases.ConfigurationTemplates.ListTemplates;
-using PokManager.Application.UseCases.ConfigurationTemplates.SaveTemplate;
-using PokManager.Application.UseCases.ConfigurationTemplates.PreviewTemplate;
+using PokManager.Application.UseCases.ConfigurationManagement.GetConfiguration;
 using PokManager.Application.UseCases.ConfigurationTemplates.ApplyTemplate;
 using PokManager.Application.UseCases.ConfigurationTemplates.DeleteTemplate;
 using PokManager.Application.UseCases.ConfigurationTemplates.ExportTemplate;
 using PokManager.Application.UseCases.ConfigurationTemplates.ImportTemplate;
-using PokManager.Application.UseCases.ConfigurationManagement.GetConfiguration;
+using PokManager.Application.UseCases.ConfigurationTemplates.ListTemplates;
+using PokManager.Application.UseCases.ConfigurationTemplates.PreviewTemplate;
+using PokManager.Application.UseCases.ConfigurationTemplates.SaveTemplate;
+using PokManager.Application.UseCases.InstanceDiscovery.ListInstances;
+using PokManager.Application.UseCases.InstanceLifecycle.CreateContainer;
+using PokManager.Application.UseCases.InstanceLifecycle.DestroyContainer;
+using PokManager.Application.UseCases.InstanceLifecycle.RecreateContainer;
+using PokManager.Application.UseCases.InstanceLifecycle.RestartInstance;
+using PokManager.Application.UseCases.InstanceLifecycle.StartInstance;
+using PokManager.Application.UseCases.InstanceLifecycle.StopInstance;
+using PokManager.Application.UseCases.InstanceQuery;
+using PokManager.Infrastructure.BackgroundWorkers;
+using PokManager.Infrastructure.Caching;
 using PokManager.Infrastructure.Common;
+using PokManager.Infrastructure.Docker.Services;
 using PokManager.Infrastructure.Fakes;
-using PokManager.Infrastructure.Caching;
-using PokManager.Infrastructure.BackgroundWorkers;
-using PokManager.Application.Configuration;
 using PokManager.Web.Data;
-using Microsoft.EntityFrameworkCore;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -168,7 +168,7 @@
 
 app.Run();
 
-record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary)
+internal record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary)
 {
     public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
 }
diff --git a/src/Presentation/PokManager.Web/Data/Entities/InstanceSnapshot.cs b/src/Presentation/PokManager.Web/Data/Entities/InstanceSnapshot.cs
index 0d98216..3bbead6 100644
--- a/src/Presentation/PokManager.Web/Data/Entities/InstanceSnapshot.cs
+++ b/src/Presentation/PokManager.Web/Data/Entities/InstanceSnapshot.cs
@@ -9,13 +9,13 @@ public class InstanceSnapshot
     public string InstanceId { get; set; } = string.Empty;
     public string Name { get; set; } = string.Empty;
     public DateTime Timestamp { get; set; }
-    
+
     // Status fields
     public string Status { get; set; } = string.Empty;
     public string Health { get; set; } = string.Empty;
     public string? Uptime { get; set; }
     public DateTime? StartedAt { get; set; }
-    
+
     // Server info
     public string? ServerMap { get; set; }
     public int MaxPlayers { get; set; }
@@ -24,11 +24,11 @@ public class InstanceSnapshot
     public string? Version { get; set; }
     public bool IsPublic { get; set; }
     public bool IsPvE { get; set; }
-    
+
     // Resource usage
     public double CpuUsagePercent { get; set; }
     public long MemoryUsageMB { get; set; }
-    
+
     // Navigation properties
     public ICollection<PlayerSession> PlayerSessions { get; set; } = new List<PlayerSession>();
     public ICollection<TelemetrySnapshot> TelemetrySnapshots { get; set; } = new List<TelemetrySnapshot>();
diff --git a/src/Presentation/PokManager.Web/Data/Entities/LogEntry.cs b/src/Presentation/PokManager.Web/Data/Entities/LogEntry.cs
index aeb9f5e..af327fd 100644
--- a/src/Presentation/PokManager.Web/Data/Entities/LogEntry.cs
+++ b/src/Presentation/PokManager.Web/Data/Entities/LogEntry.cs
@@ -11,7 +11,7 @@ public class LogEntry
     public string Level { get; set; } = string.Empty;
     public string Message { get; set; } = string.Empty;
     public string? Source { get; set; }
-    
+
     // Navigation
     public int? InstanceSnapshotId { get; set; }
     public InstanceSnapshot? InstanceSnapshot { get; set; }
diff --git a/src/Presentation/PokManager.Web/Data/Entities/PlayerSession.cs b/src/Presentation/PokManager.Web/Data/Entities/PlayerSession.cs
index 8c4cb57..8ff5caf 100644
--- a/src/Presentation/PokManager.Web/Data/Entities/PlayerSession.cs
+++ b/src/Presentation/PokManager.Web/Data/Entities/PlayerSession.cs
@@ -14,7 +14,7 @@ public class PlayerSession
     public int Level { get; set; }
     public string? Location { get; set; }
     public bool IsOnline { get; set; }
-    
+
     // Navigation
     public int? InstanceSnapshotId { get; set; }
     public InstanceSnapshot? InstanceSnapshot { get; set; }
diff --git a/src/Presentation/PokManager.Web/Data/Entities/TelemetrySnapshot.cs b/src/Presentation/PokManager.Web/Data/Entities/TelemetrySnapshot.cs
index cf263f6..c180325 100644
--- a/src/Presentation/PokManager.Web/Data/Entities/TelemetrySnapshot.cs
+++ b/src/Presentation/PokManager.Web/Data/Entities/TelemetrySnapshot.cs
@@ -8,7 +8,7 @@ public class TelemetrySnapshot
     public int Id { get; set; }
     public string InstanceId { get; set; } = string.Empty;
     public DateTime Timestamp { get; set; }
-    
+
     // Performance metrics
     public double CpuUsagePercent { get; set; }
     public long MemoryUsageMB { get; set; }
@@ -16,10 +16,10 @@ public class TelemetrySnapshot
     public long NetworkOutKBps { get; set; }
     public int Fps { get; set; }
     public int TickRate { get; set; }
-    
+
     // Game stats (stored as JSON)
     public string? GameStatsJson { get; set; }
-    
+
     // Navigation
     public int? InstanceSnapshotId { get; set; }
     public InstanceSnapshot? InstanceSnapshot { get; set; }
diff --git a/src/Presentation/PokManager.Web/Data/PresetTemplateSeeder.cs b/src/Presentation/PokManager.Web/Data/PresetTemplateSeeder.cs
index 166a205..a83e005 100644
--- a/src/Presentation/PokManager.Web/Data/PresetTemplateSeeder.cs
+++ b/src/Presentation/PokManager.Web/Data/PresetTemplateSeeder.cs
@@ -1,6 +1,6 @@
+using System.Text.Json;
 using Microsoft.EntityFrameworkCore;
 using PokManager.Web.Data.Entities;
-using System.Text.Json;
 
 namespace PokManager.Web.Data;
 
@@ -9,7 +9,7 @@ namespace PokManager.Web.Data;
 /// </summary>
 public static class PresetTemplateSeeder
 {
-    private static readonly JsonSerializerOptions JsonOptions = new()
+    private static readonly JsonSerializerOptions s_jsonOptions = new()
     {
         WriteIndented = true,
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase
@@ -73,7 +73,7 @@ private static ConfigurationTemplate CreatePvPCompetitiveTemplate()
             Difficulty = "Normal",
             MapCompatibility = "",
             Tags = "pvp,competitive,fastpaced",
-            ConfigurationDataJson = JsonSerializer.Serialize(config, JsonOptions),
+            ConfigurationDataJson = JsonSerializer.Serialize(config, s_jsonOptions),
             IncludedSettingsJson = "[]",
             Author = "System",
             TimesUsed = 0,
@@ -113,7 +113,7 @@ private static ConfigurationTemplate CreatePvECasualTemplate()
             Difficulty = "Easy",
             MapCompatibility = "",
             Tags = "pve,casual,relaxed,coop",
-            ConfigurationDataJson = JsonSerializer.Serialize(config, JsonOptions),
+            ConfigurationDataJson = JsonSerializer.Serialize(config, s_jsonOptions),
             IncludedSettingsJson = "[]",
             Author = "System",
             TimesUsed = 0,
@@ -153,7 +153,7 @@ private static ConfigurationTemplate CreateBeginnerFriendlyTemplate()
             Difficulty = "Beginner",
             MapCompatibility = "",
             Tags = "pve,beginner,easy,learning",
-            ConfigurationDataJson = JsonSerializer.Serialize(config, JsonOptions),
+            ConfigurationDataJson = JsonSerializer.Serialize(config, s_jsonOptions),
             IncludedSettingsJson = "[]",
             Author = "System",
             TimesUsed = 0,
@@ -193,7 +193,7 @@ private static ConfigurationTemplate CreateHardcoreSurvivalTemplate()
             Difficulty = "Hardcore",
             MapCompatibility = "",
             Tags = "pve,hardcore,survival,challenge",
-            ConfigurationDataJson = JsonSerializer.Serialize(config, JsonOptions),
+            ConfigurationDataJson = JsonSerializer.Serialize(config, s_jsonOptions),
             IncludedSettingsJson = "[]",
             Author = "System",
             TimesUsed = 0,
@@ -238,7 +238,7 @@ private static ConfigurationTemplate CreateBalancedVanillaTemplate()
             Difficulty = "Normal",
             MapCompatibility = "",
             Tags = "balanced,vanilla,default,standard",
-            ConfigurationDataJson = JsonSerializer.Serialize(config, JsonOptions),
+            ConfigurationDataJson = JsonSerializer.Serialize(config, s_jsonOptions),
             IncludedSettingsJson = "[]",
             Author = "System",
             TimesUsed = 0,
diff --git a/src/Presentation/PokManager.Web/Migrations/20260122025326_InitialCreate.cs b/src/Presentation/PokManager.Web/Migrations/20260122025326_InitialCreate.cs
index f02aa89..6885973 100644
--- a/src/Presentation/PokManager.Web/Migrations/20260122025326_InitialCreate.cs
+++ b/src/Presentation/PokManager.Web/Migrations/20260122025326_InitialCreate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/src/Presentation/PokManager.Web/Migrations/20260122131101_AddConfigurationTemplates.cs b/src/Presentation/PokManager.Web/Migrations/20260122131101_AddConfigurationTemplates.cs
index 72b4ef5..5ffdfca 100644
--- a/src/Presentation/PokManager.Web/Migrations/20260122131101_AddConfigurationTemplates.cs
+++ b/src/Presentation/PokManager.Web/Migrations/20260122131101_AddConfigurationTemplates.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
diff --git a/src/Presentation/PokManager.Web/Models/InstanceViewModel.cs b/src/Presentation/PokManager.Web/Models/InstanceViewModel.cs
index 689ccf9..e0e55ee 100644
--- a/src/Presentation/PokManager.Web/Models/InstanceViewModel.cs
+++ b/src/Presentation/PokManager.Web/Models/InstanceViewModel.cs
@@ -10,7 +10,7 @@ public class InstanceViewModel
     public InstanceHealth Health { get; set; }
     public string Uptime { get; set; } = "N/A";
     public DateTime? StartedAt { get; set; }
-    
+
     // Map and Server Info
     public string ServerMap { get; set; } = string.Empty;
     public int MaxPlayers { get; set; }
@@ -18,40 +18,40 @@ public class InstanceViewModel
     public int Port { get; set; }
     public int RconPort { get; set; }
     public string Version { get; set; } = string.Empty;
-    
+
     // Game Settings
     public bool IsPublic { get; set; }
     public bool IsPvE { get; set; }
     public string ServerPassword { get; set; } = string.Empty;
     public string AdminPassword { get; set; } = string.Empty;
-    
+
     // Mods and Plugins
     public List<string> Mods { get; set; } = new();
     public List<string> ModIds { get; set; } = new();
     public List<string> PassiveMods { get; set; } = new();
-    
+
     // Server Features
     public bool BattleEyeEnabled { get; set; }
     public bool ApiEnabled { get; set; }
     public bool RconEnabled { get; set; }
     public string ClusterId { get; set; } = string.Empty;
-    
+
     // MOTD and Messages
     public string Motd { get; set; } = string.Empty;
     public int MotdDuration { get; set; }
-    
+
     // Update Settings
     public bool UpdateServer { get; set; }
     public int CheckForUpdateInterval { get; set; }
     public string UpdateWindowMinimum { get; set; } = string.Empty;
     public string UpdateWindowMaximum { get; set; } = string.Empty;
     public int RestartNoticeMinutes { get; set; }
-    
+
     // Advanced
     public string CustomServerArgs { get; set; } = string.Empty;
     public string TimeZone { get; set; } = string.Empty;
     public string MemoryLimit { get; set; } = string.Empty;
-    
+
     // Resource Usage (from Docker)
     public long MemoryUsageMB { get; set; }
     public double CpuUsagePercent { get; set; }
diff --git a/src/Presentation/PokManager.Web/Program.cs b/src/Presentation/PokManager.Web/Program.cs
index b0e69f3..e577487 100644
--- a/src/Presentation/PokManager.Web/Program.cs
+++ b/src/Presentation/PokManager.Web/Program.cs
@@ -1,23 +1,23 @@
-using PokManager.Web;
-using PokManager.Web.Components;
-using PokManager.Web.Services;
+using Microsoft.EntityFrameworkCore;
+using MudBlazor.Services;
 using PokManager.Application.Ports;
-using PokManager.Application.UseCases.InstanceLifecycle.StartInstance;
-using PokManager.Application.UseCases.InstanceLifecycle.StopInstance;
-using PokManager.Application.UseCases.InstanceLifecycle.RestartInstance;
 using PokManager.Application.UseCases.BackupManagement.CreateBackup;
-using PokManager.Application.UseCases.InstanceManagement.SaveWorld;
+using PokManager.Application.UseCases.BackupManagement.ListBackups;
 using PokManager.Application.UseCases.Configuration.ApplyConfiguration;
+using PokManager.Application.UseCases.ConfigurationManagement.GetConfiguration;
 using PokManager.Application.UseCases.InstanceDiscovery.ListInstances;
+using PokManager.Application.UseCases.InstanceLifecycle.RestartInstance;
+using PokManager.Application.UseCases.InstanceLifecycle.StartInstance;
+using PokManager.Application.UseCases.InstanceLifecycle.StopInstance;
+using PokManager.Application.UseCases.InstanceManagement.SaveWorld;
 using PokManager.Application.UseCases.InstanceQuery;
-using PokManager.Application.UseCases.BackupManagement.ListBackups;
-using PokManager.Application.UseCases.ConfigurationManagement.GetConfiguration;
-using PokManager.Infrastructure.Fakes;
 using PokManager.Infrastructure.Common;
 using PokManager.Infrastructure.Docker.Services;
-using MudBlazor.Services;
-using Microsoft.EntityFrameworkCore;
+using PokManager.Infrastructure.Fakes;
+using PokManager.Web;
+using PokManager.Web.Components;
 using PokManager.Web.Data;
+using PokManager.Web.Services;
 
 var builder = WebApplication.CreateBuilder(args);
 
diff --git a/src/Presentation/PokManager.Web/Services/BackupApiClient.cs b/src/Presentation/PokManager.Web/Services/BackupApiClient.cs
index d03c416..479492a 100644
--- a/src/Presentation/PokManager.Web/Services/BackupApiClient.cs
+++ b/src/Presentation/PokManager.Web/Services/BackupApiClient.cs
@@ -1,6 +1,6 @@
 using System.Net.Http.Json;
-using PokManager.Web.Models;
 using PokManager.Domain.Enumerations;
+using PokManager.Web.Models;
 
 namespace PokManager.Web.Services;
 
diff --git a/src/Presentation/PokManager.Web/Services/BackupService.cs b/src/Presentation/PokManager.Web/Services/BackupService.cs
index 40a810d..11f9af7 100644
--- a/src/Presentation/PokManager.Web/Services/BackupService.cs
+++ b/src/Presentation/PokManager.Web/Services/BackupService.cs
@@ -1,6 +1,6 @@
-using PokManager.Application.UseCases.BackupManagement.ListBackups;
-using PokManager.Application.UseCases.BackupManagement.CreateBackup;
 using PokManager.Application.Models;
+using PokManager.Application.UseCases.BackupManagement.CreateBackup;
+using PokManager.Application.UseCases.BackupManagement.ListBackups;
 using PokManager.Domain.Common;
 using PokManager.Domain.Enumerations;
 using PokManager.Web.Models;
diff --git a/src/Presentation/PokManager.Web/Services/ConfigurationService.cs b/src/Presentation/PokManager.Web/Services/ConfigurationService.cs
index 711b1cf..8dc1fa5 100644
--- a/src/Presentation/PokManager.Web/Services/ConfigurationService.cs
+++ b/src/Presentation/PokManager.Web/Services/ConfigurationService.cs
@@ -1,5 +1,5 @@
-using PokManager.Application.UseCases.ConfigurationManagement.GetConfiguration;
 using PokManager.Application.UseCases.Configuration.ApplyConfiguration;
+using PokManager.Application.UseCases.ConfigurationManagement.GetConfiguration;
 using PokManager.Domain.Common;
 using PokManager.Web.Models;
 
diff --git a/src/Presentation/PokManager.Web/Services/InstanceDataRepository.cs b/src/Presentation/PokManager.Web/Services/InstanceDataRepository.cs
index f7aa3de..4db930c 100644
--- a/src/Presentation/PokManager.Web/Services/InstanceDataRepository.cs
+++ b/src/Presentation/PokManager.Web/Services/InstanceDataRepository.cs
@@ -1,8 +1,8 @@
+using System.Text.Json;
 using Microsoft.EntityFrameworkCore;
 using PokManager.Web.Data;
 using PokManager.Web.Data.Entities;
 using PokManager.Web.Models;
-using System.Text.Json;
 
 namespace PokManager.Web.Services;
 
@@ -75,8 +75,8 @@ public async Task SavePlayerSessionsAsync(string instanceId, List<InstanceDataCa
         foreach (var player in players)
         {
             var existingSession = await context.PlayerSessions
-                .FirstOrDefaultAsync(p => p.InstanceId == instanceId 
-                    && p.SteamId == player.SteamId 
+                .FirstOrDefaultAsync(p => p.InstanceId == instanceId
+                    && p.SteamId == player.SteamId
                     && p.IsOnline, cancellationToken);
 
             if (existingSession == null)
@@ -143,7 +143,7 @@ public async Task SaveLogEntriesAsync(string instanceId, List<InstanceDataCache.
             .ToListAsync(cancellationToken);
 
         var newLogs = logs
-            .Where(log => !existingHashes.Any(e => 
+            .Where(log => !existingHashes.Any(e =>
                 e.Timestamp == log.Timestamp && e.Message == log.Message))
             .Select(log => new Data.Entities.LogEntry
             {
diff --git a/src/Presentation/PokManager.Web/Services/InstanceDataWorker.cs b/src/Presentation/PokManager.Web/Services/InstanceDataWorker.cs
index db6e9bc..c144f8a 100644
--- a/src/Presentation/PokManager.Web/Services/InstanceDataWorker.cs
+++ b/src/Presentation/PokManager.Web/Services/InstanceDataWorker.cs
@@ -36,7 +36,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             try
             {
                 await UpdateInstanceDataAsync(stoppingToken);
-                
+
                 // Run cleanup if needed
                 if (DateTime.UtcNow - _lastCleanup > _cleanupInterval)
                 {
@@ -136,14 +136,14 @@ private async Task UpdateInstanceDetailsAsync(string instanceId, CancellationTok
         try
         {
             _logger.LogDebug("Fetching real player data via RCON for instance {InstanceId}", instanceId);
-            
+
             var players = await rconService.GetOnlinePlayersAsync(instanceId, cancellationToken);
-            
+
             if (players.Any())
             {
                 _logger.LogInformation("Found {Count} players online for instance {InstanceId}", players.Count, instanceId);
             }
-            
+
             return players;
         }
         catch (Exception ex)
@@ -154,7 +154,7 @@ private async Task UpdateInstanceDetailsAsync(string instanceId, CancellationTok
     }
 
     private async Task<List<InstanceDataCache.LogEntry>> FetchRealLogsAsync(
-        string instanceId, 
+        string instanceId,
         InstanceService instanceService,
         CancellationToken cancellationToken)
     {
@@ -164,9 +164,9 @@ private async Task UpdateInstanceDetailsAsync(string instanceId, CancellationTok
             using var scope = _serviceProvider.CreateScope();
             var httpClientFactory = scope.ServiceProvider.GetRequiredService<IHttpClientFactory>();
             using var httpClient = httpClientFactory.CreateClient(nameof(InstanceService));
-            
+
             var response = await httpClient.GetAsync($"/api/instances/{instanceId}/logs?tail=50", cancellationToken);
-            
+
             if (!response.IsSuccessStatusCode)
             {
                 _logger.LogWarning("Failed to fetch logs for instance {InstanceId}: {StatusCode}", instanceId, response.StatusCode);
@@ -242,14 +242,14 @@ private bool TryExtractTimestamp(string line, out DateTime timestamp)
     private string DetermineLogLevel(string line)
     {
         var lowerLine = line.ToLowerInvariant();
-        
+
         if (lowerLine.Contains("error") || lowerLine.Contains("fatal") || lowerLine.Contains("exception"))
             return "ERROR";
         if (lowerLine.Contains("warn") || lowerLine.Contains("warning"))
             return "WARN";
         if (lowerLine.Contains("debug") || lowerLine.Contains("trace"))
             return "DEBUG";
-        
+
         return "INFO";
     }
 
@@ -261,10 +261,10 @@ private async Task CleanupOldDataAsync(CancellationToken cancellationToken)
         {
             using var scope = _serviceProvider.CreateScope();
             var repository = scope.ServiceProvider.GetRequiredService<InstanceDataRepository>();
-            
+
             // Keep 30 days of historical data
             await repository.CleanupOldDataAsync(TimeSpan.FromDays(30), cancellationToken);
-            
+
             _logger.LogInformation("Completed database cleanup");
         }
         catch (Exception ex)
diff --git a/src/Presentation/PokManager.Web/Services/InstanceService.cs b/src/Presentation/PokManager.Web/Services/InstanceService.cs
index 6f57398..6aa9dfc 100644
--- a/src/Presentation/PokManager.Web/Services/InstanceService.cs
+++ b/src/Presentation/PokManager.Web/Services/InstanceService.cs
@@ -1,6 +1,6 @@
+using System.Net.Http.Json;
 using PokManager.Domain.Common;
 using PokManager.Web.Models;
-using System.Net.Http.Json;
 
 namespace PokManager.Web.Services;
 
@@ -230,7 +230,7 @@ public async Task<Result<string>> SaveWorldAsync(string instanceId, Cancellation
 
     // DTOs for API responses
     private record ListInstancesResponseDto(List<InstanceSummaryDto> Instances);
-    
+
     public record DockerComposeConfigDto(
         string InstanceName,
         string ContainerName,
diff --git a/src/Presentation/PokManager.Web/Services/RconConfiguration.cs b/src/Presentation/PokManager.Web/Services/RconConfiguration.cs
index a273a3b..d40c95c 100644
--- a/src/Presentation/PokManager.Web/Services/RconConfiguration.cs
+++ b/src/Presentation/PokManager.Web/Services/RconConfiguration.cs
@@ -51,7 +51,7 @@ public class RconConfiguration
 
     public static RconInstanceConfig? GetByInstanceId(string instanceId)
     {
-        return Instances.Values.FirstOrDefault(c => 
+        return Instances.Values.FirstOrDefault(c =>
             c.InstanceId.Equals(instanceId, StringComparison.OrdinalIgnoreCase));
     }
 }
diff --git a/src/Presentation/PokManager.Web/Services/RconService.cs b/src/Presentation/PokManager.Web/Services/RconService.cs
index 706fdbf..c17ff5a 100644
--- a/src/Presentation/PokManager.Web/Services/RconService.cs
+++ b/src/Presentation/PokManager.Web/Services/RconService.cs
@@ -1,5 +1,5 @@
-using CoreRCON;
 using System.Text.RegularExpressions;
+using CoreRCON;
 
 namespace PokManager.Web.Services;
 
@@ -19,7 +19,7 @@ public RconService(ILogger<RconService> logger)
     /// Gets online players from an ARK server via RCON.
     /// </summary>
     public async Task<List<InstanceDataCache.PlayerInfo>> GetOnlinePlayersAsync(
-        string instanceId, 
+        string instanceId,
         CancellationToken cancellationToken = default)
     {
         var config = RconConfiguration.GetByInstanceId(instanceId);
@@ -32,8 +32,8 @@ public RconService(ILogger<RconService> logger)
         try
         {
             using var rcon = new RCON(
-                System.Net.IPAddress.Parse(config.Host), 
-                (ushort)config.Port, 
+                System.Net.IPAddress.Parse(config.Host),
+                (ushort)config.Port,
                 config.Password,
                 timeout: 5000);
 
@@ -41,14 +41,14 @@ public RconService(ILogger<RconService> logger)
 
             // Execute ListPlayers command
             var response = await rcon.SendCommandAsync("ListPlayers");
-            
+
             _logger.LogDebug("RCON response from {Instance}: {Response}", instanceId, response);
 
             return ParsePlayerList(response);
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Error connecting to RCON for instance {InstanceId} at {Host}:{Port}", 
+            _logger.LogError(ex, "Error connecting to RCON for instance {InstanceId} at {Host}:{Port}",
                 instanceId, config.Host, config.Port);
             return new List<InstanceDataCache.PlayerInfo>();
         }
@@ -58,7 +58,7 @@ public RconService(ILogger<RconService> logger)
     /// Sends a broadcast message to all players on the server.
     /// </summary>
     public async Task<bool> BroadcastMessageAsync(
-        string instanceId, 
+        string instanceId,
         string message,
         CancellationToken cancellationToken = default)
     {
@@ -68,13 +68,13 @@ public async Task<bool> BroadcastMessageAsync(
         try
         {
             using var rcon = new RCON(
-                System.Net.IPAddress.Parse(config.Host), 
-                (ushort)config.Port, 
+                System.Net.IPAddress.Parse(config.Host),
+                (ushort)config.Port,
                 config.Password);
 
             await rcon.ConnectAsync();
             await rcon.SendCommandAsync($"Broadcast {message}");
-            
+
             return true;
         }
         catch (Exception ex)
@@ -88,7 +88,7 @@ public async Task<bool> BroadcastMessageAsync(
     /// Executes a custom RCON command on the server.
     /// </summary>
     public async Task<string?> ExecuteCommandAsync(
-        string instanceId, 
+        string instanceId,
         string command,
         CancellationToken cancellationToken = default)
     {
@@ -98,8 +98,8 @@ public async Task<bool> BroadcastMessageAsync(
         try
         {
             using var rcon = new RCON(
-                System.Net.IPAddress.Parse(config.Host), 
-                (ushort)config.Port, 
+                System.Net.IPAddress.Parse(config.Host),
+                (ushort)config.Port,
                 config.Password);
 
             await rcon.ConnectAsync();
diff --git a/tests/PokManager.Application.Tests/PokManager.Application.Tests.csproj b/tests/PokManager.Application.Tests/PokManager.Application.Tests.csproj
index 6964a62..87084f3 100644
--- a/tests/PokManager.Application.Tests/PokManager.Application.Tests.csproj
+++ b/tests/PokManager.Application.Tests/PokManager.Application.Tests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="8.0.1" />
+    <PackageReference Include="coverlet.collector" Version="10.0.0" />
     <PackageReference Include="FluentAssertions" Version="8.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
diff --git a/tests/PokManager.Application.Tests/UseCases/InstanceLifecycle/StopInstance/StopInstanceHandlerTests.cs b/tests/PokManager.Application.Tests/UseCases/InstanceLifecycle/StopInstance/StopInstanceHandlerTests.cs
index 4057bac..7f57f5d 100644
--- a/tests/PokManager.Application.Tests/UseCases/InstanceLifecycle/StopInstance/StopInstanceHandlerTests.cs
+++ b/tests/PokManager.Application.Tests/UseCases/InstanceLifecycle/StopInstance/StopInstanceHandlerTests.cs
@@ -1,12 +1,12 @@
 using FluentAssertions;
 using NSubstitute;
+using PokManager.Application.Models;
 using PokManager.Application.Ports;
 using PokManager.Application.UseCases.InstanceLifecycle.StopInstance;
 using PokManager.Domain.Common;
 using PokManager.Domain.Enumerations;
 using PokManager.Infrastructure.Tests.Fakes;
 using Xunit;
-using PokManager.Application.Models;
 
 namespace PokManager.Application.Tests.UseCases.InstanceLifecycle.StopInstance;
 
diff --git a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryAuditSink.cs b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryAuditSink.cs
index 0e550b2..26bceb5 100644
--- a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryAuditSink.cs
+++ b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryAuditSink.cs
@@ -1,7 +1,7 @@
-using PokManager.Application.Ports;
+using System.Collections.Concurrent;
 using PokManager.Application.Models;
+using PokManager.Application.Ports;
 using PokManager.Domain.Common;
-using System.Collections.Concurrent;
 
 namespace PokManager.Infrastructure.Tests.Fakes;
 
diff --git a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryAuditSinkTests.cs b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryAuditSinkTests.cs
index 1a0e8d2..c043fa3 100644
--- a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryAuditSinkTests.cs
+++ b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryAuditSinkTests.cs
@@ -216,13 +216,13 @@ public async Task QueryAsync_CombinesMultipleFilters()
     }
 
     [Fact]
-    public void Reset_ClearsAllEvents()
+    public async Task Reset_ClearsAllEvents()
     {
         // Arrange
         var event1 = CreateAuditEvent("instance-1", "Start");
         var event2 = CreateAuditEvent("instance-2", "Stop");
-        _auditSink.EmitAsync(event1).Wait();
-        _auditSink.EmitAsync(event2).Wait();
+        await _auditSink.EmitAsync(event1);
+        await _auditSink.EmitAsync(event2);
 
         // Act
         _auditSink.Reset();
diff --git a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryBackupStore.cs b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryBackupStore.cs
index 94f6510..65585f3 100644
--- a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryBackupStore.cs
+++ b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryBackupStore.cs
@@ -1,7 +1,7 @@
-using PokManager.Application.Ports;
+using System.Collections.Concurrent;
 using PokManager.Application.Models;
+using PokManager.Application.Ports;
 using PokManager.Domain.Common;
-using System.Collections.Concurrent;
 
 namespace PokManager.Infrastructure.Tests.Fakes;
 
diff --git a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryBackupStoreTests.cs b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryBackupStoreTests.cs
index 0a964a3..950fcf3 100644
--- a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryBackupStoreTests.cs
+++ b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryBackupStoreTests.cs
@@ -178,7 +178,7 @@ public async Task GetTotalBackupSizeAsync_WithMultipleBackups_ReturnsSumOfSizes(
     }
 
     [Fact]
-    public void Reset_ClearsAllBackups()
+    public async Task Reset_ClearsAllBackups()
     {
         // Arrange
         var backup1 = CreateBackupInfo("backup-1", "instance-1", DateTimeOffset.UtcNow);
@@ -190,8 +190,8 @@ public void Reset_ClearsAllBackups()
         _store.Reset();
 
         // Assert
-        var result1 = _store.ListBackupsAsync("instance-1").Result;
-        var result2 = _store.ListBackupsAsync("instance-2").Result;
+        var result1 = await _store.ListBackupsAsync("instance-1");
+        var result2 = await _store.ListBackupsAsync("instance-2");
         Assert.Empty(result1.Value);
         Assert.Empty(result2.Value);
     }
diff --git a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryOperationLockManager.cs b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryOperationLockManager.cs
index e59abbe..ebb4f32 100644
--- a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryOperationLockManager.cs
+++ b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryOperationLockManager.cs
@@ -1,6 +1,6 @@
+using System.Collections.Concurrent;
 using PokManager.Application.Ports;
 using PokManager.Domain.Common;
-using System.Collections.Concurrent;
 
 namespace PokManager.Infrastructure.Tests.Fakes;
 
diff --git a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryOperationLockManagerTests.cs b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryOperationLockManagerTests.cs
index dd5a45c..5c85dcc 100644
--- a/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryOperationLockManagerTests.cs
+++ b/tests/PokManager.Infrastructure.Tests/Fakes/InMemoryOperationLockManagerTests.cs
@@ -153,18 +153,18 @@ public async Task DisposeAsync_CanBeCalledMultipleTimes()
     }
 
     [Fact]
-    public void Reset_ClearsAllLocks()
+    public async Task Reset_ClearsAllLocks()
     {
         // Arrange
-        var lock1 = _lockManager.AcquireLockAsync("instance-1", "op-1", TimeSpan.FromSeconds(30)).Result;
-        var lock2 = _lockManager.AcquireLockAsync("instance-2", "op-2", TimeSpan.FromSeconds(30)).Result;
+        var lock1 = await _lockManager.AcquireLockAsync("instance-1", "op-1", TimeSpan.FromSeconds(30));
+        var lock2 = await _lockManager.AcquireLockAsync("instance-2", "op-2", TimeSpan.FromSeconds(30));
 
         // Act
         _lockManager.Reset();
 
         // Assert
-        var isLocked1 = _lockManager.IsLockedAsync("instance-1").Result;
-        var isLocked2 = _lockManager.IsLockedAsync("instance-2").Result;
+        var isLocked1 = await _lockManager.IsLockedAsync("instance-1");
+        var isLocked2 = await _lockManager.IsLockedAsync("instance-2");
         Assert.False(isLocked1);
         Assert.False(isLocked2);
 
diff --git a/tests/PokManager.Infrastructure.Tests/PokManager/Parsers/StatusOutputParserTests.cs b/tests/PokManager.Infrastructure.Tests/PokManager/Parsers/StatusOutputParserTests.cs
index 99d17bc..6eadb9f 100644
--- a/tests/PokManager.Infrastructure.Tests/PokManager/Parsers/StatusOutputParserTests.cs
+++ b/tests/PokManager.Infrastructure.Tests/PokManager/Parsers/StatusOutputParserTests.cs
@@ -1,8 +1,8 @@
 using FluentAssertions;
+using PokManager.Application.Models;
 using PokManager.Domain.Common;
 using PokManager.Domain.Enumerations;
 using PokManager.Infrastructure.PokManager.PokManager.Parsers;
-using PokManager.Application.Models;
 using Xunit;
 
 namespace PokManager.Infrastructure.Tests.PokManager.Parsers;
diff --git a/tests/PokManager.Infrastructure.Tests/PokManager/PokManagerClientLifecycleTests.cs b/tests/PokManager.Infrastructure.Tests/PokManager/PokManagerClientLifecycleTests.cs
index c418103..2011e44 100644
--- a/tests/PokManager.Infrastructure.Tests/PokManager/PokManagerClientLifecycleTests.cs
+++ b/tests/PokManager.Infrastructure.Tests/PokManager/PokManagerClientLifecycleTests.cs
@@ -7,8 +7,8 @@
 using PokManager.Domain.Enumerations;
 using PokManager.Infrastructure.PokManager;
 using PokManager.Infrastructure.Shell;
-using static TinyBDD.TestContext;
 using Xunit;
+using static TinyBDD.TestContext;
 
 namespace PokManager.Infrastructure.Tests.PokManager;
 
diff --git a/tests/PokManager.Infrastructure.Tests/PokManager/PokManagerClientTests.cs b/tests/PokManager.Infrastructure.Tests/PokManager/PokManagerClientTests.cs
index f188dc4..b79ef5a 100644
--- a/tests/PokManager.Infrastructure.Tests/PokManager/PokManagerClientTests.cs
+++ b/tests/PokManager.Infrastructure.Tests/PokManager/PokManagerClientTests.cs
@@ -5,8 +5,8 @@
 using PokManager.Application.Ports;
 using PokManager.Infrastructure.PokManager;
 using PokManager.Infrastructure.Shell;
-using static TinyBDD.TestContext;
 using Xunit;
+using static TinyBDD.TestContext;
 
 namespace PokManager.Infrastructure.Tests.PokManager;
 
diff --git a/tests/PokManager.Infrastructure.Tests/Shell/BashCommandExecutorTests.cs b/tests/PokManager.Infrastructure.Tests/Shell/BashCommandExecutorTests.cs
index 099992b..aea9c61 100644
--- a/tests/PokManager.Infrastructure.Tests/Shell/BashCommandExecutorTests.cs
+++ b/tests/PokManager.Infrastructure.Tests/Shell/BashCommandExecutorTests.cs
@@ -1,8 +1,8 @@
 using FluentAssertions;
 using Microsoft.Extensions.Logging.Abstractions;
 using PokManager.Infrastructure.Shell;
-using static TinyBDD.TestContext;
 using Xunit;
+using static TinyBDD.TestContext;
 
 namespace PokManager.Infrastructure.Tests.Shell;