diff --git a/argos/commands.py b/argos/commands.py
index 71ba697..ed5e4a2 100644
--- a/argos/commands.py
+++ b/argos/commands.py
@@ -18,8 +18,8 @@ def server():
 
 
 @cli.command()
-@click.argument("server")
-@click.argument("auth")
+@click.argument("server", envvar="ARGOS_AGENT_SERVER_URL")
+@click.argument("auth", envvar="ARGOS_AGENT_TOKEN")
 @click.option(
     "--max-tasks",
     default=10,