diff --git a/COMMANDS_EXAMPLE.md b/COMMANDS_EXAMPLE.md
index a4377e6..b22c94e 100644
--- a/COMMANDS_EXAMPLE.md
+++ b/COMMANDS_EXAMPLE.md
@@ -74,7 +74,7 @@ export CLOUD_ML_REGION=<google-location>
 
 ```shell
 acp \
-  --agent claude \
+  --agent claude-acp \
   --provider vertex-ai \
   --model claude-opus-4-6 \
   --prompt "Say Hello"
@@ -82,14 +82,14 @@ acp \
 or use the default model: `claude-opus-4-6` using the provider `vertex-ai`
 ```shell
 acp \
-  --agent claude \
+  --agent claude-acp \
   --provider vertex-ai \
   --prompt "Read the skills/dummy/SKILL.md instructions and say hello at the root of the project."
 ```
 
 ```shell
 acp \
-  --agent claude \
+  --agent claude-acp \
   --provider vertex-ai \
   --prompt "Execute the **java-project-discovery** skill. Inspect the workspace root directory, determine the build setup, target Java version, and framework configurations, and return the structured JSON output."
 ```
diff --git a/client/pom.xml b/client/pom.xml
index 37fcb16..06cd712 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -20,6 +20,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.aesh</groupId>
+                <artifactId>aesh-bom</artifactId>
+                <version>${aesh.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus.platform</groupId>
                 <artifactId>quarkus-bom</artifactId>
@@ -41,12 +48,10 @@
         <dependency>
             <groupId>org.aesh</groupId>
             <artifactId>aesh</artifactId>
-            <version>${aesh.version}</version>
         </dependency>
         <dependency>
             <groupId>org.aesh</groupId>
             <artifactId>aesh-processor</artifactId>
-            <version>${aesh.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/client/src/main/java/io/quarkiverse/acp/AcpCommand.java b/client/src/main/java/io/quarkiverse/acp/AcpCommand.java
index cc21e4a..6ab153d 100644
--- a/client/src/main/java/io/quarkiverse/acp/AcpCommand.java
+++ b/client/src/main/java/io/quarkiverse/acp/AcpCommand.java
@@ -9,11 +9,11 @@
 import io.quarkiverse.agentclientprotocol.sdk.client.transport.AgentParameters;
 import io.quarkiverse.agentclientprotocol.sdk.client.transport.StdioAcpClientTransport;
 import io.quarkiverse.agentclientprotocol.sdk.spec.schema.v1.*;
+import org.aesh.command.CommandDefinition;
 import org.jboss.logging.Logger;
 
 import org.aesh.command.Command;
 import org.aesh.command.CommandResult;
-import org.aesh.command.GroupCommandDefinition;
 import org.aesh.command.invocation.CommandInvocation;
 import org.aesh.command.option.Option;
 
@@ -43,7 +43,7 @@
  * acp --agent-binary my-agent --agent-args "serve" --prompt "Say hello"
  * }</pre>
  */
-@GroupCommandDefinition(
+@CommandDefinition(
         name = "acp",
         description = "acp tool for any acp compatible agent (OpenCode, Claude, Pi, Gemini, etc.)",
         generateHelp = true,
diff --git a/client/src/main/java/io/quarkiverse/acp/registry/RegistryCommand.java b/client/src/main/java/io/quarkiverse/acp/registry/RegistryCommand.java
index ef0f5d2..b7e00ff 100644
--- a/client/src/main/java/io/quarkiverse/acp/registry/RegistryCommand.java
+++ b/client/src/main/java/io/quarkiverse/acp/registry/RegistryCommand.java
@@ -1,8 +1,8 @@
 package io.quarkiverse.acp.registry;
 
 import org.aesh.command.Command;
+import org.aesh.command.CommandDefinition;
 import org.aesh.command.CommandResult;
-import org.aesh.command.GroupCommandDefinition;
 import org.aesh.command.invocation.CommandInvocation;
 
 /**
@@ -16,7 +16,7 @@
  * acp reg remove opencode     # remove an installed agent
  * }</pre>
  */
-@GroupCommandDefinition(
+@CommandDefinition(
         name = "reg",
         description = "Manage ACP agents via the registry (list, install, remove)",
         groupCommands = {ListAgentsCommand.class, InstallCommand.class, RemoveCommand.class}
diff --git a/pom.xml b/pom.xml
index 742b4ee..f23c52b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,15 +48,15 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <aesh.version>3.11</aesh.version>
+        <aesh.version>3.16.3</aesh.version>
         <acp-core.version>0.11.0</acp-core.version>
         <jackson-databind.version>2.18.2</jackson-databind.version>
         <jboss-logmanager.version>3.2.2.Final</jboss-logmanager.version>
+        <quarkus.platform.version>3.37.1</quarkus.platform.version>
         <slf4j-jboss-logmanager.version>2.1.0.Final</slf4j-jboss-logmanager.version>
         <slf4j.version>2.0.9</slf4j.version>
 
         <exec-maven-plugin.version>3.6.3</exec-maven-plugin.version>
-        <quarkus.platform.version>3.35.3</quarkus.platform.version>
     </properties>
 
     <dependencyManagement>