diff --git a/shipkit/cli.py b/shipkit/cli.py
index 0f58400..881f082 100644
--- a/shipkit/cli.py
+++ b/shipkit/cli.py
@@ -799,9 +799,10 @@ def run(prompt: tuple[str, ...], no_agent: bool):
         )
 
     # Build launch command with shipkit agent (unless --no-agent)
+    from shipkit import __version__
     cmd = ["claude"]
     if not no_agent:
-        cmd.extend(["--agent", "shipkit"])
+        cmd.extend(["--agent", f"shipkit v{__version__}"])
     if prompt:
         cmd.append(" ".join(prompt))
 
diff --git a/shipkit/compilers/agents.py b/shipkit/compilers/agents.py
index 0a1d686..68adf8c 100644
--- a/shipkit/compilers/agents.py
+++ b/shipkit/compilers/agents.py
@@ -151,8 +151,8 @@ def generate_claude_agent_with_hooks(
     # Build YAML frontmatter with hooks and MCP servers
     import yaml
     frontmatter_data = {
-        "name": "shipkit",
-        "description": f"Shipkit v{__version__} — Production-grade Claude Code assistant with battle-tested skills and self-learning capabilities",
+        "name": f"shipkit v{__version__}",
+        "description": "Production-grade Claude Code assistant with battle-tested skills and self-learning capabilities",
         "model": "sonnet",
         "tools": "*",
         "permissionMode": "acceptEdits",
diff --git a/tests/test_run.py b/tests/test_run.py
index 4d22c07..752cde4 100644
--- a/tests/test_run.py
+++ b/tests/test_run.py
@@ -43,7 +43,8 @@ def test_run_with_agent(self, initialized_home, tmp_repo, monkeypatch):
             call_args = mock_run.call_args[0][0]
             assert "claude" in call_args
             assert "--agent" in call_args
-            assert "shipkit" in call_args
+            agent_arg = call_args[call_args.index("--agent") + 1]
+            assert agent_arg.startswith("shipkit")
 
     def test_run_without_agent(self, initialized_home, tmp_repo, monkeypatch):
         """Test run command with --no-agent flag."""