diff --git a/src/Nitro/CommandLine/src/CommandLine/Commands/Schemas/UploadSchemaCommand.cs b/src/Nitro/CommandLine/src/CommandLine/Commands/Schemas/UploadSchemaCommand.cs
index cdd0a1c3d75..d250819009d 100644
--- a/src/Nitro/CommandLine/src/CommandLine/Commands/Schemas/UploadSchemaCommand.cs
+++ b/src/Nitro/CommandLine/src/CommandLine/Commands/Schemas/UploadSchemaCommand.cs
@@ -62,7 +62,7 @@ async Task UploadSchema(StatusContext? ctx)
 
             var input = new UploadSchemaInput
             {
-                Schema = new Upload(stream, "operations.graphql"),
+                Schema = new Upload(stream, "schema.graphqls"),
                 ApiId = apiId,
                 Tag = tag
             };
diff --git a/src/Nitro/CommandLine/src/CommandLine/Options/OptionalSubgraphIdOption.cs b/src/Nitro/CommandLine/src/CommandLine/Options/OptionalSubgraphIdOption.cs
new file mode 100644
index 00000000000..245a1a7c907
--- /dev/null
+++ b/src/Nitro/CommandLine/src/CommandLine/Options/OptionalSubgraphIdOption.cs
@@ -0,0 +1,11 @@
+namespace ChilliCream.Nitro.CommandLine.Options;
+
+internal sealed class OptionalSubgraphIdOption : Option<string>
+{
+    public OptionalSubgraphIdOption() : base("--subgraph-id", "The id of the subgraph")
+    {
+        IsRequired = false;
+        IsHidden = true;
+        this.DefaultFromEnvironmentValue("SUBGRAPH_ID");
+    }
+}
diff --git a/src/Nitro/CommandLine/src/CommandLine/Options/OptionalSubgraphNameOption.cs b/src/Nitro/CommandLine/src/CommandLine/Options/OptionalSubgraphNameOption.cs
new file mode 100644
index 00000000000..f2f55362255
--- /dev/null
+++ b/src/Nitro/CommandLine/src/CommandLine/Options/OptionalSubgraphNameOption.cs
@@ -0,0 +1,11 @@
+namespace ChilliCream.Nitro.CommandLine.Options;
+
+internal sealed class OptionalSubgraphNameOption : Option<string>
+{
+    public OptionalSubgraphNameOption() : base("--subgraph-name", "The name of the subgraph")
+    {
+        IsRequired = false;
+        IsHidden = true;
+        this.DefaultFromEnvironmentValue("SUBGRAPH_NAME");
+    }
+}
diff --git a/src/Nitro/CommandLine/src/CommandLine/Options/SubgraphIdOption.cs b/src/Nitro/CommandLine/src/CommandLine/Options/SubgraphIdOption.cs
deleted file mode 100644
index 70d038db62e..00000000000
--- a/src/Nitro/CommandLine/src/CommandLine/Options/SubgraphIdOption.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace ChilliCream.Nitro.CommandLine.Options;
-
-internal class SubgraphIdOption : Option<string>
-{
-    public SubgraphIdOption() : base("--subgraph-id", "The id of the subgraph")
-    {
-        IsRequired = true;
-        this.DefaultFromEnvironmentValue("SUBGRAPH_ID");
-    }
-}
-
-internal sealed class OptionalSubgraphIdOption : SubgraphIdOption
-{
-    public OptionalSubgraphIdOption() : base()
-    {
-        IsRequired = false;
-    }
-}
diff --git a/src/Nitro/CommandLine/src/CommandLine/Options/SubgraphName.cs b/src/Nitro/CommandLine/src/CommandLine/Options/SubgraphName.cs
deleted file mode 100644
index 8764b972c40..00000000000
--- a/src/Nitro/CommandLine/src/CommandLine/Options/SubgraphName.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace ChilliCream.Nitro.CommandLine.Options;
-
-internal class SubgraphNameOption : Option<string>
-{
-    public SubgraphNameOption() : base("--subgraph-name", "The name of the subgraph")
-    {
-        IsRequired = true;
-        this.DefaultFromEnvironmentValue("SUBGRAPH_NAME");
-    }
-}
-
-internal sealed class OptionalSubgraphNameOption : SubgraphNameOption
-{
-    public OptionalSubgraphNameOption() : base()
-    {
-        IsRequired = false;
-    }
-}