diff --git a/apps/cli/src/commands/setup.ts b/apps/cli/src/commands/setup.ts
index 2177c77..fe9fdb5 100644
--- a/apps/cli/src/commands/setup.ts
+++ b/apps/cli/src/commands/setup.ts
@@ -38,7 +38,7 @@ export async function setup(): Promise<void> {
 
   const configPath = path.join(SHANNON_HOME, 'config.toml');
   p.log.success(`Configuration saved to ${configPath}`);
-  p.outro('Run `npx @keygraph/shannon start` to begin a scan.');
+  p.outro('Run `npx @keygraph/shannon@beta start` to begin a scan.');
 }
 
 async function setupProvider(provider: Provider): Promise<ShannonConfig> {
diff --git a/apps/cli/src/commands/start.ts b/apps/cli/src/commands/start.ts
index 88325ea..8d391e9 100644
--- a/apps/cli/src/commands/start.ts
+++ b/apps/cli/src/commands/start.ts
@@ -215,7 +215,7 @@ function printInfo(
   repoPath: string,
   workspacesDir: string,
 ): void {
-  const logsCmd = isLocal() ? `./shannon logs ${workspace}` : `npx @keygraph/shannon logs ${workspace}`;
+  const logsCmd = isLocal() ? `./shannon logs ${workspace}` : `npx @keygraph/shannon@beta logs ${workspace}`;
   const reportsPath = path.join(workspacesDir, workspace);
 
   console.log(`  Target:     ${args.url}`);
diff --git a/apps/cli/src/commands/uninstall.ts b/apps/cli/src/commands/uninstall.ts
index e65564e..4295f4e 100644
--- a/apps/cli/src/commands/uninstall.ts
+++ b/apps/cli/src/commands/uninstall.ts
@@ -33,5 +33,5 @@ export async function uninstall(): Promise<void> {
 
   fs.rmSync(SHANNON_HOME, { recursive: true, force: true });
   p.log.success('All Shannon data has been removed.');
-  p.outro('Shannon has been uninstalled. Run `npx @keygraph/shannon setup` to start fresh.');
+  p.outro('Shannon has been uninstalled. Run `npx @keygraph/shannon@beta setup` to start fresh.');
 }
diff --git a/apps/cli/src/config/resolver.ts b/apps/cli/src/config/resolver.ts
index 79a30e7..adffc6b 100644
--- a/apps/cli/src/config/resolver.ts
+++ b/apps/cli/src/config/resolver.ts
@@ -92,7 +92,7 @@ function loadTOML(): TOMLConfig | null {
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     console.error(`\nFailed to parse ${configPath}: ${message}`);
-    console.error(`\nRun 'npx @keygraph/shannon setup' to reconfigure.\n`);
+    console.error(`\nRun 'npx @keygraph/shannon@beta setup' to reconfigure.\n`);
     process.exit(1);
   }
 }
diff --git a/apps/cli/src/env.ts b/apps/cli/src/env.ts
index 581c617..c8c01d9 100644
--- a/apps/cli/src/env.ts
+++ b/apps/cli/src/env.ts
@@ -118,7 +118,7 @@ export function validateCredentials(): CredentialValidation {
   const hint =
     getMode() === 'local'
       ? `No credentials found. Set ANTHROPIC_API_KEY in .env or export it.`
-      : `Authentication not configured. Export variables or run 'npx @keygraph/shannon setup'.`;
+      : `Authentication not configured. Export variables or run 'npx @keygraph/shannon@beta setup'.`;
   return {
     valid: false,
     mode: 'api-key',
diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts
index 64c5299..b7250c2 100644
--- a/apps/cli/src/index.ts
+++ b/apps/cli/src/index.ts
@@ -56,7 +56,7 @@ function getVersion(): string {
 
 function showHelp(): void {
   const mode = getMode();
-  const prefix = mode === 'local' ? './shannon' : 'npx @keygraph/shannon';
+  const prefix = mode === 'local' ? './shannon' : 'npx @keygraph/shannon@beta';
 
   console.log(`
 Shannon - AI Penetration Testing Framework
@@ -173,14 +173,14 @@ function parseStartArgs(argv: string[]): ParsedStartArgs {
         break;
       default:
         console.error(`Unknown option: ${arg}`);
-        console.error(`Run "${getMode() === 'local' ? './shannon' : 'npx @keygraph/shannon'} help" for usage`);
+        console.error(`Run "${getMode() === 'local' ? './shannon' : 'npx @keygraph/shannon@beta'} help" for usage`);
         process.exit(1);
     }
   }
 
   if (!url || !repo) {
     console.error('ERROR: --url and --repo are required');
-    console.error(`Usage: ${getMode() === 'local' ? './shannon' : 'npx @keygraph/shannon'} start -u <url> -r <path>`);
+    console.error(`Usage: ${getMode() === 'local' ? './shannon' : 'npx @keygraph/shannon@beta'} start -u <url> -r <path>`);
     process.exit(1);
   }
 
@@ -215,7 +215,7 @@ switch (command) {
     const workspaceId = args[1];
     if (!workspaceId) {
       console.error('ERROR: Workspace ID is required');
-      console.error(`Usage: ${getMode() === 'local' ? './shannon' : 'npx @keygraph/shannon'} logs <workspace>`);
+      console.error(`Usage: ${getMode() === 'local' ? './shannon' : 'npx @keygraph/shannon@beta'} logs <workspace>`);
       process.exit(1);
     }
     logs(workspaceId);