diff --git a/packages/codemods/cli-report.md b/packages/codemods/cli-report.md
index 57d2198141..2924999eaa 100644
--- a/packages/codemods/cli-report.md
+++ b/packages/codemods/cli-report.md
@@ -13,8 +13,8 @@ Options:
 
 Commands:
   apply <codemod> [target-dirs...]
-  list
   help [command]
+  list
 ```
 
 ### `backstage-codemods apply`
diff --git a/packages/create-app/cli-report.md b/packages/create-app/cli-report.md
index 20aa695993..982661fbf5 100644
--- a/packages/create-app/cli-report.md
+++ b/packages/create-app/cli-report.md
@@ -8,9 +8,9 @@
 Usage: backstage-create-app [options]
 
 Options:
-  -V, --version
   --path [directory]
   --skip-install
   --template-path [directory]
+  -V, --version
   -h, --help
 ```
diff --git a/packages/e2e-test/cli-report.md b/packages/e2e-test/cli-report.md
index f72344f859..fb03e06280 100644
--- a/packages/e2e-test/cli-report.md
+++ b/packages/e2e-test/cli-report.md
@@ -12,8 +12,8 @@ Options:
   -h, --help
 
 Commands:
-  run [options]
   help [command]
+  run [options]
 ```
 
 ### `e2e-test run`
diff --git a/packages/repo-tools/cli-report.md b/packages/repo-tools/cli-report.md
index 672c22944a..acde92d742 100644
--- a/packages/repo-tools/cli-report.md
+++ b/packages/repo-tools/cli-report.md
@@ -13,15 +13,15 @@ Options:
 
 Commands:
   api-reports [options] [paths...]
-  type-deps
-  peer-deps [options]
   generate-catalog-info [options]
   generate-patch [options] <package>
-  knip-reports [options] [paths...]
-  package [command]
-  repo [command]
-  lint [command]
   help [command]
+  knip-reports [options] [paths...]
+  lint [command]
+  package [command]
+  peer-deps [options]
+  repo [command]
+  type-deps
 ```
 
 ### `backstage-repo-tools api-reports`
@@ -30,17 +30,17 @@ Commands:
 Usage: backstage-repo-tools api-reports [options] [paths...]
 
 Options:
-  --ci
-  --tsc
-  --docs
-  --sql-reports
-  --include <pattern>
-  --exclude <pattern>
-  -a, --allow-warnings <allowWarningsPaths>
   --allow-all-warnings
-  -o, --omit-messages <messageCodes>
+  --ci
+  --docs
+  --exclude <pattern>
+  --include <pattern>
+  --sql-reports
+  --tsc
   --validate-release-tags
+  -a, --allow-warnings <allowWarningsPaths>
   -h, --help
+  -o, --omit-messages <messageCodes>
 ```
 
 ### `backstage-repo-tools generate-catalog-info`
@@ -49,8 +49,8 @@ Options:
 Usage: backstage-repo-tools generate-catalog-info [options]
 
 Options:
-  --dry-run
   --ci
+  --dry-run
   -h, --help
 ```
 
@@ -60,11 +60,11 @@ Options:
 Usage: backstage-repo-tools generate-patch [options] <package>
 
 Options:
-  --target <target-repo>
-  --registry-url <registry-url>
   --base-version <version>
   --query <query>
+  --registry-url <registry-url>
   --skip-install
+  --target <target-repo>
   -h, --help
 ```
 
@@ -87,8 +87,8 @@ Options:
   -h, --help
 
 Commands:
-  legacy-backend-exports [paths...]
   help [command]
+  legacy-backend-exports [paths...]
 ```
 
 ### `backstage-repo-tools lint legacy-backend-exports`
@@ -109,8 +109,8 @@ Options:
   -h, --help
 
 Commands:
-  schema [command]
   help [command]
+  schema [command]
 ```
 
 ### `backstage-repo-tools package schema`
@@ -122,8 +122,8 @@ Options:
   -h, --help
 
 Commands:
-  openapi [command]
   help [command]
+  openapi [command]
 ```
 
 ### `backstage-repo-tools package schema openapi`
@@ -135,10 +135,10 @@ Options:
   -h, --help
 
 Commands:
-  init
-  generate [options]
   fuzz [options]
+  generate [options]
   help [command]
+  init
 ```
 
 ### `backstage-repo-tools package schema openapi fuzz`
@@ -147,10 +147,10 @@ Commands:
 Usage: backstage-repo-tools package schema openapi fuzz [options]
 
 Options:
-  --limit <limit>
-  --workers <workers>
   --debug
   --exclude-checks <excludeChecks>
+  --limit <limit>
+  --workers <workers>
   -h, --help
 ```
 
@@ -192,8 +192,8 @@ Options:
   -h, --help
 
 Commands:
-  schema [command]
   help [command]
+  schema [command]
 ```
 
 ### `backstage-repo-tools repo schema`
@@ -205,8 +205,8 @@ Options:
   -h, --help
 
 Commands:
-  openapi [command]
   help [command]
+  openapi [command]
 ```
 
 ### `backstage-repo-tools repo schema openapi`
@@ -218,12 +218,12 @@ Options:
   -h, --help
 
 Commands:
-  verify [paths...]
+  diff [options]
+  fuzz [options]
+  help [command]
   lint [options] [paths...]
   test [options] [paths...]
-  fuzz [options]
-  diff [options]
-  help [command]
+  verify [paths...]
 ```
 
 ### `backstage-repo-tools repo schema openapi diff`
diff --git a/packages/techdocs-cli/cli-report.md b/packages/techdocs-cli/cli-report.md
index 5b0f4c9857..4cb7988add 100644
--- a/packages/techdocs-cli/cli-report.md
+++ b/packages/techdocs-cli/cli-report.md
@@ -13,11 +13,11 @@ Options:
 
 Commands:
   generate|build [options]
+  help [command]
   migrate [options]
   publish [options]
-  serve:mkdocs [options]
   serve [options]
-  help [command]
+  serve:mkdocs [options]
 ```
 
 ### `techdocs-cli generate`
@@ -26,20 +26,20 @@ Commands:
 Usage: techdocs-cli generate|build [options]
 
 Options:
-  --source-dir <PATH>
-  --output-dir <PATH>
-  --docker-image <DOCKER_IMAGE>
-  --no-pull
-  --no-docker
-  --techdocs-ref <HOST_TYPE:URL>
-  --etag <ETAG>
-  --site-name
-  -v --verbose
-  --omitTechdocsCoreMkdocsPlugin
-  --legacyCopyReadmeMdToIndexMd
   --defaultPlugin [defaultPlugins...]
+  --docker-image <DOCKER_IMAGE>
+  --etag <ETAG>
+  --legacyCopyReadmeMdToIndexMd
+  --no-docker
+  --no-pull
+  --omitTechdocsCoreMkdocsPlugin
+  --output-dir <PATH>
   --runAsDefaultUser
+  --site-name
+  --source-dir <PATH>
+  --techdocs-ref <HOST_TYPE:URL>
   -h, --help
+  -v --verbose
 ```
 
 ### `techdocs-cli migrate`
@@ -48,21 +48,21 @@ Options:
 Usage: techdocs-cli migrate [options]
 
 Options:
-  --publisher-type <TYPE>
-  --storage-name <BUCKET/CONTAINER NAME>
-  --azureAccountName <AZURE ACCOUNT NAME>
-  --azureAccountKey <AZURE ACCOUNT KEY>
-  --awsRoleArn <AWS ROLE ARN>
   --awsEndpoint <AWS ENDPOINT>
+  --awsRoleArn <AWS ROLE ARN>
   --awsS3ForcePathStyle
+  --azureAccountKey <AZURE ACCOUNT KEY>
+  --azureAccountName <AZURE ACCOUNT NAME>
+  --concurrency <MAX CONCURRENT REQS>
+  --osAuthUrl <OPENSTACK SWIFT AUTHURL>
   --osCredentialId <OPENSTACK SWIFT APPLICATION CREDENTIAL ID>
   --osSecret <OPENSTACK SWIFT APPLICATION CREDENTIAL SECRET>
-  --osAuthUrl <OPENSTACK SWIFT AUTHURL>
   --osSwiftUrl <OPENSTACK SWIFT SWIFTURL>
+  --publisher-type <TYPE>
   --removeOriginal
-  --concurrency <MAX CONCURRENT REQS>
-  -v --verbose
+  --storage-name <BUCKET/CONTAINER NAME>
   -h, --help
+  -v --verbose
 ```
 
 ### `techdocs-cli publish`
@@ -71,25 +71,25 @@ Options:
 Usage: techdocs-cli publish [options]
 
 Options:
-  --publisher-type <TYPE>
-  --storage-name <BUCKET/CONTAINER NAME>
-  --entity <NAMESPACE/KIND/NAME>
-  --legacyUseCaseSensitiveTripletPaths
-  --azureAccountName <AZURE ACCOUNT NAME>
-  --azureAccountKey <AZURE ACCOUNT KEY>
-  --awsRoleArn <AWS ROLE ARN>
-  --awsEndpoint <AWS ENDPOINT>
-  --awsProxy <HTTPS Proxy>
-  --awsS3sse <AWS SSE>
-  --awsS3ForcePathStyle
   --awsBucketRootPath <AWS BUCKET ROOT PATH>
+  --awsEndpoint <AWS ENDPOINT>
   --awsMaxAttempts <AWS MAX ATTEMPTS>
+  --awsProxy <HTTPS Proxy>
+  --awsRoleArn <AWS ROLE ARN>
+  --awsS3ForcePathStyle
+  --awsS3sse <AWS SSE>
+  --azureAccountKey <AZURE ACCOUNT KEY>
+  --azureAccountName <AZURE ACCOUNT NAME>
+  --directory <PATH>
+  --entity <NAMESPACE/KIND/NAME>
+  --gcsBucketRootPath <GCS BUCKET ROOT PATH>
+  --legacyUseCaseSensitiveTripletPaths
+  --osAuthUrl <OPENSTACK SWIFT AUTHURL>
   --osCredentialId <OPENSTACK SWIFT APPLICATION CREDENTIAL ID>
   --osSecret <OPENSTACK SWIFT APPLICATION CREDENTIAL SECRET>
-  --osAuthUrl <OPENSTACK SWIFT AUTHURL>
   --osSwiftUrl <OPENSTACK SWIFT SWIFTURL>
-  --gcsBucketRootPath <GCS BUCKET ROOT PATH>
-  --directory <PATH>
+  --publisher-type <TYPE>
+  --storage-name <BUCKET/CONTAINER NAME>
   -h, --help
 ```
 
@@ -99,20 +99,20 @@ Options:
 Usage: techdocs-cli serve [options]
 
 Options:
-  -i, --docker-image <DOCKER_IMAGE>
   --docker-entrypoint <DOCKER_ENTRYPOINT>
   --docker-option <DOCKER_OPTION...>
-  --no-docker
-  --site-name
-  --mkdocs-port <PORT>
-  -v --verbose
-  --preview-app-bundle-path <PATH_TO_BUNDLE>
-  --preview-app-port <PORT>
-  -c, --mkdocs-config-file-name <FILENAME>
   --mkdocs-parameter-clean
   --mkdocs-parameter-dirtyreload
   --mkdocs-parameter-strict
+  --mkdocs-port <PORT>
+  --no-docker
+  --preview-app-bundle-path <PATH_TO_BUNDLE>
+  --preview-app-port <PORT>
+  --site-name
+  -c, --mkdocs-config-file-name <FILENAME>
   -h, --help
+  -i, --docker-image <DOCKER_IMAGE>
+  -v --verbose
 ```
 
 ### `techdocs-cli serve:mkdocs`
@@ -121,12 +121,12 @@ Options:
 Usage: techdocs-cli serve:mkdocs [options]
 
 Options:
-  -i, --docker-image <DOCKER_IMAGE>
   --docker-entrypoint <DOCKER_ENTRYPOINT>
   --docker-option <DOCKER_OPTION...>
   --no-docker
   --site-name
+  -h, --help
+  -i, --docker-image <DOCKER_IMAGE>
   -p, --port <PORT>
   -v --verbose
-  -h, --help
 ```