diff --git a/src/Cli/Microsoft.DotNet.Cli.Definitions/Common/CommonOptions.cs b/src/Cli/Microsoft.DotNet.Cli.Definitions/Common/CommonOptions.cs
index abac7ed2d280..8c71272e6a02 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Definitions/Common/CommonOptions.cs
+++ b/src/Cli/Microsoft.DotNet.Cli.Definitions/Common/CommonOptions.cs
@@ -277,9 +277,10 @@ public static Option<bool> CreateDisableBuildServersOption() =>
     public static Option<bool> CreateSelfContainedOption() =>
         new Option<bool>("--self-contained", "--sc")
         {
-            Description = CommandDefinitionStrings.SelfContainedOptionDescription
+            Description = CommandDefinitionStrings.SelfContainedOptionDescription,
+            Arity = ArgumentArity.ZeroOrOne
         }
-        .ForwardIfEnabled([$"--property:SelfContained=true", "--property:_CommandLineDefinedSelfContained=true"]);
+        .ForwardAsMany(o => [$"--property:SelfContained={o}", "--property:_CommandLineDefinedSelfContained=true"]);
 
     public static Option<bool> CreateNoSelfContainedOption() =>
         new Option<bool>("--no-self-contained")