diff --git a/src/Nitro/CommandLine/src/CommandLine/Program.cs b/src/Nitro/CommandLine/src/CommandLine/Program.cs
index d3e5872640e..26276b3b768 100644
--- a/src/Nitro/CommandLine/src/CommandLine/Program.cs
+++ b/src/Nitro/CommandLine/src/CommandLine/Program.cs
@@ -12,7 +12,7 @@ namespace ChilliCream.Nitro.CommandLine;
 #endif
 public static class Program
 {
-    public static async Task Main(string[] args)
+    public static async Task<int> Main(string[] args)
     {
         var builder = new CommandLineBuilder(new NitroRootCommand())
             .AddNitroCloudConfiguration()
@@ -21,6 +21,6 @@ public static async Task Main(string[] args)
             .UseExtendedConsole();
 
         builder.Command.AddNitroCloudCommands();
-        await builder.Build().InvokeAsync(args);
+        return await builder.Build().InvokeAsync(args);
     }
 }
diff --git a/src/Nitro/CommandLine/src/CommandLine/Services/Configuration/NitroCLIJsonContext.cs b/src/Nitro/CommandLine/src/CommandLine/Services/Configuration/NitroCLIJsonContext.cs
index ae74d7434df..ace47e8c5c5 100644
--- a/src/Nitro/CommandLine/src/CommandLine/Services/Configuration/NitroCLIJsonContext.cs
+++ b/src/Nitro/CommandLine/src/CommandLine/Services/Configuration/NitroCLIJsonContext.cs
@@ -8,4 +8,7 @@ namespace ChilliCream.Nitro.CommandLine.Services.Configuration;
 [JsonSerializable(typeof(Session))]
 [JsonSerializable(typeof(PersistedQueryStreamResult))]
 [JsonSerializable(typeof(StageConfigurationParameter[]))]
+[JsonSourceGenerationOptions(
+    PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
+    PropertyNameCaseInsensitive = true)]
 internal partial class NitroCLIJsonContext : JsonSerializerContext;