diff --git a/metricq_source_ipmi/source/main.py b/metricq_source_ipmi/source/main.py
index 8969368..5c9cc89 100644
--- a/metricq_source_ipmi/source/main.py
+++ b/metricq_source_ipmi/source/main.py
@@ -13,6 +13,7 @@
 import metricq
 from metricq import Timedelta
 from metricq.logging import get_logger
+from metricq.cli import metricq_command
 
 from .version import version as client_version
 import hostlist
@@ -514,11 +515,8 @@ async def update(self):
         )
 
 
-@click.command()
-@click.option('--server', default='amqp://localhost/')
-@click.option('--token', default='source-ipmi')
+@metricq_command(default_token="source-ipmi")
 @click.version_option(client_version)
-@click_log.simple_verbosity_option(logger)
 def run(server, token):
     src = IpmiSource(token=token, management_url=server, client_version=client_version)
     src.run()
diff --git a/setup.py b/setup.py
index 76d1369..926a031 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
         "aiomonitor",
         "click",
         "click_log",
-        "metricq ~= 4.0",
+        "metricq[cli] ~= 5.4",
         "python-hostlist",
     ],
     use_scm_version=True,