diff --git a/cli/src/main.rs b/cli/src/main.rs
index 3388721d..d62df670 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -120,11 +120,11 @@ struct CommonArgs {
         action = clap::ArgAction::Append,
         value_name = "tcp://HOSTNAME:PORT",
         value_hint = clap::ValueHint::Url,
-        env = "WORMHOLE_RELAY_SERVER",
+        env = "WORMHOLE_RELAY_URL",
     )]
     relay_server: Vec<url::Url>,
     /// Use a custom rendezvous server. Both sides need to use the same value in order to find each other.
-    #[arg(long, value_name = "ws://example.org", value_hint = clap::ValueHint::Url)]
+    #[arg(long, value_name = "ws://example.org", value_hint = clap::ValueHint::Url, env = "WORMHOLE_TRANSIT_HELPER")]
     rendezvous_server: Option<url::Url>,
     /// Disable the relay server support and force a direct connection.
     #[arg(long)]