diff --git a/src/cli/run.rs b/src/cli/run.rs
index 23135b9..c66b9a8 100644
--- a/src/cli/run.rs
+++ b/src/cli/run.rs
@@ -215,7 +215,8 @@ fn run_inner(args: RunArgs, run_dir: &Path) -> Result<()> {
 
     if args.config_only {
         println!("==> Generating Helm values...");
-        let helm_values = generate_helm_values(&spec, &vc)?;
+        let mut helm_values = generate_helm_values(&spec, &vc)?;
+        helm_values.prometheus.enabled = !args.skip_metrics;
         write_helm_values(&helm_values, &args.output_dir)?;
         generate_pod_secrets(&vc, &spec.namespace, &args.output_dir)?;
         println!("\nConfig generated in {}", args.output_dir.display());
@@ -243,7 +244,8 @@ fn run_inner(args: RunArgs, run_dir: &Path) -> Result<()> {
 
     // Step 5: Generate Helm values
     println!("==> Generating Helm values...");
-    let helm_values = generate_helm_values(&spec, &vc)?;
+    let mut helm_values = generate_helm_values(&spec, &vc)?;
+    helm_values.prometheus.enabled = !args.skip_metrics;
     write_helm_values(&helm_values, &args.output_dir)?;
     generate_pod_secrets(&vc, &spec.namespace, &args.output_dir)?;
 
diff --git a/src/config/clients.rs b/src/config/clients.rs
index 8b913a6..2e39428 100644
--- a/src/config/clients.rs
+++ b/src/config/clients.rs
@@ -175,9 +175,9 @@ pub fn build_args(
         "zeam" => {
             args.extend_from_slice(&[
                 "node".into(),
-                "--custom_genesis".into(),
+                "--custom-genesis".into(),
                 "/config".into(),
-                "--validator_config".into(),
+                "--validator-config".into(),
                 "/config".into(),
                 "--data-dir".into(),
                 "/data".into(),