diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts
index df0689b4b5..ba11a53cfd 100644
--- a/packages/cli/src/commands/index.ts
+++ b/packages/cli/src/commands/index.ts
@@ -25,11 +25,11 @@ const configOption = [
   Array<string>(),
 ] as const;
 
-export function registerAdminCommand(program: Command) {
+export function registerOnboardCommand(program: Command) {
   program
-    .command('admin', { hidden: true })
+    .command('onboard', { hidden: true })
     .description('Get help setting up your Backstage App.')
-    .action(lazy(() => import('./admin').then(m => m.command)));
+    .action(lazy(() => import('./onboard').then(m => m.command)));
 }
 
 export function registerRepoCommand(program: Command) {
@@ -367,7 +367,7 @@ export function registerCommands(program: Command) {
   registerRepoCommand(program);
   registerScriptCommand(program);
   registerMigrateCommand(program);
-  registerAdminCommand(program);
+  registerOnboardCommand(program);
 
   program
     .command('versions:bump')
diff --git a/packages/cli/src/commands/admin/README.md b/packages/cli/src/commands/onboard/README.md
similarity index 100%
rename from packages/cli/src/commands/admin/README.md
rename to packages/cli/src/commands/onboard/README.md
diff --git a/packages/cli/src/commands/admin/auth/config.ts b/packages/cli/src/commands/onboard/auth/config.ts
similarity index 100%
rename from packages/cli/src/commands/admin/auth/config.ts
rename to packages/cli/src/commands/onboard/auth/config.ts
diff --git a/packages/cli/src/commands/admin/auth/files.ts b/packages/cli/src/commands/onboard/auth/files.ts
similarity index 98%
rename from packages/cli/src/commands/admin/auth/files.ts
rename to packages/cli/src/commands/onboard/auth/files.ts
index 6ce58dc527..af07ef254b 100644
--- a/packages/cli/src/commands/admin/auth/files.ts
+++ b/packages/cli/src/commands/onboard/auth/files.ts
@@ -25,7 +25,7 @@ export const PATCH_FOLDER = path.join(
   ownDir,
   'src',
   'commands',
-  'admin',
+  'onboard',
   'auth',
   'patches',
 );
diff --git a/packages/cli/src/commands/admin/auth/github/index.ts b/packages/cli/src/commands/onboard/auth/github/index.ts
similarity index 100%
rename from packages/cli/src/commands/admin/auth/github/index.ts
rename to packages/cli/src/commands/onboard/auth/github/index.ts
diff --git a/packages/cli/src/commands/admin/auth/index.ts b/packages/cli/src/commands/onboard/auth/index.ts
similarity index 100%
rename from packages/cli/src/commands/admin/auth/index.ts
rename to packages/cli/src/commands/onboard/auth/index.ts
diff --git a/packages/cli/src/commands/admin/auth/patch.ts b/packages/cli/src/commands/onboard/auth/patch.ts
similarity index 100%
rename from packages/cli/src/commands/admin/auth/patch.ts
rename to packages/cli/src/commands/onboard/auth/patch.ts
diff --git a/packages/cli/src/commands/admin/auth/patches/01-github.Add-SignInPage.patch b/packages/cli/src/commands/onboard/auth/patches/01-github.Add-SignInPage.patch
similarity index 100%
rename from packages/cli/src/commands/admin/auth/patches/01-github.Add-SignInPage.patch
rename to packages/cli/src/commands/onboard/auth/patches/01-github.Add-SignInPage.patch
diff --git a/packages/cli/src/commands/admin/auth/patches/02-github.Use-signIn-resolver.patch b/packages/cli/src/commands/onboard/auth/patches/02-github.Use-signIn-resolver.patch
similarity index 100%
rename from packages/cli/src/commands/admin/auth/patches/02-github.Use-signIn-resolver.patch
rename to packages/cli/src/commands/onboard/auth/patches/02-github.Use-signIn-resolver.patch
diff --git a/packages/cli/src/commands/admin/command.ts b/packages/cli/src/commands/onboard/command.ts
similarity index 100%
rename from packages/cli/src/commands/admin/command.ts
rename to packages/cli/src/commands/onboard/command.ts
diff --git a/packages/cli/src/commands/admin/index.ts b/packages/cli/src/commands/onboard/index.ts
similarity index 100%
rename from packages/cli/src/commands/admin/index.ts
rename to packages/cli/src/commands/onboard/index.ts