diff --git a/crates/topos/src/components/node/commands/up.rs b/crates/topos/src/components/node/commands/up.rs
index 2802b82c2..ab428e01b 100644
--- a/crates/topos/src/components/node/commands/up.rs
+++ b/crates/topos/src/components/node/commands/up.rs
@@ -13,8 +13,8 @@ pub struct Up {
     #[arg(long, env = "TOPOS_SECRETS_MANAGER")]
     pub secrets_config: Option<String>,
 
-    /// Do not run background edge process as part of node
-    /// Usable for cases where edge edpoint is available as infura (or similar cluod provider) endpoint
-    #[arg(long, env = "EXTERNAL_EDGE_NODE", action)]
-    pub external_edge_node: bool,
+    /// Defines that an external edge node will be use, replacing the one normally run by the node.
+    /// Usable for cases where edge endpoint is available as infura (or similar cloud provider) endpoint
+    #[arg(long, env = "TOPOS_NO_EDGE_PROCESS", action)]
+    pub no_edge_process: bool,
 }
diff --git a/crates/topos/src/components/node/mod.rs b/crates/topos/src/components/node/mod.rs
index 8a5fb167e..077c43c5a 100644
--- a/crates/topos/src/components/node/mod.rs
+++ b/crates/topos/src/components/node/mod.rs
@@ -139,7 +139,7 @@ pub(crate) async fn handle_command(
             let mut processes = FuturesUnordered::new();
 
             // Edge
-            if cmd.external_edge_node {
+            if cmd.no_edge_process {
                 info!("Using external edge node, skip running of local edge instance...")
             } else {
                 let data_dir = node_path.clone();
@@ -148,7 +148,7 @@ pub(crate) async fn handle_command(
                      edge arguments: {:?}",
                     genesis.path.display(),
                     data_dir.display(),
-                    config.edge.as_ref().unwrap().args
+                    config.edge.as_ref().expect("valid edge configuration").args
                 );
                 processes.push(services::spawn_edge_process(
                     edge_path.join(BINARY_NAME),