diff --git a/ci/edmtool.py b/ci/edmtool.py
index f42d2d982..fdb5d7b32 100644
--- a/ci/edmtool.py
+++ b/ci/edmtool.py
@@ -106,7 +106,11 @@
 }
 
 
-@click.group()
+def normalize(name):
+    return name.replace("_", "-")
+
+
+@click.group(context_settings={"token_normalize_func": normalize})
 def cli():
     pass