diff --git a/giant/cli.py b/giant/cli.py
index 1f9769f..48b738a 100644
--- a/giant/cli.py
+++ b/giant/cli.py
@@ -1261,6 +1261,9 @@ def analyze_submit(
             help="Split each plot's data into this many event_id chunks/jobs",
         ),
     ] = 1,
+    n_energy_bins: Annotated[int, typer.Option("--energy-bins")] = 4,
+    n_marginal_bins: Annotated[int, typer.Option("--bins")] = 50,
+    top_k_pdg: Annotated[int, typer.Option("--top-pdg")] = 6,
     dry_run: Annotated[
         bool, typer.Option("--dry-run", help="Write files but don't condor_submit")
     ] = False,
@@ -1270,7 +1273,14 @@ def analyze_submit(
 
     from giant.analysis import SubmitConfig, prep, write_submit
 
-    path = prep(rollout_yaml, run_dir, n_chunks=chunks)
+    path = prep(
+        rollout_yaml,
+        run_dir,
+        n_chunks=chunks,
+        n_energy_bins=n_energy_bins,
+        n_marginal_bins=n_marginal_bins,
+        top_k_pdg=top_k_pdg,
+    )
     cfg = SubmitConfig(
         run_dir=path,
         accounting_group=accounting_group,