diff --git a/Makefile b/Makefile
index 6166b3295b..631db87974 100644
--- a/Makefile
+++ b/Makefile
@@ -58,10 +58,10 @@ clean-gen:
 
 .PHONY: cli-docs
 cli-docs:
-	@rm -rf docs/docs/ref/cli/commands
-	@mkdir -p docs/docs/ref/cli/commands
-	@echo 'label: Commands' > docs/docs/ref/cli/commands/_category_.yml
-	@echo 'position: 20' >> docs/docs/ref/cli/commands/_category_.yml
+	@rm -rf docs/docs/ref/cli
+	@mkdir -p docs/docs/ref/cli
+	@echo 'label: Minder CLI' > docs/docs/ref/cli/_category_.yml
+	@echo 'position: 20' >> docs/docs/ref/cli/_category_.yml
 	@go run -tags '$(BUILDTAGS)' cmd/cli/main.go docs
 
 .PHONY: build
diff --git a/cmd/cli/app/docs/docs.go b/cmd/cli/app/docs/docs.go
index 16696c37fc..3ed6376917 100644
--- a/cmd/cli/app/docs/docs.go
+++ b/cmd/cli/app/docs/docs.go
@@ -51,7 +51,7 @@ var DocsCmd = &cobra.Command{
 			return fmt.Sprintf("---\ntitle: %s\n---\n", cmdString)
 		}
 		identity := func(s string) string { return s }
-		err := doc.GenMarkdownTreeCustom(app.RootCmd, "./docs/docs/ref/cli/commands", prefix, identity)
+		err := doc.GenMarkdownTreeCustom(app.RootCmd, "./docs/docs/ref/cli", prefix, identity)
 		if err != nil {
 			panic(err)
 		}
diff --git a/docs/docs/ref/cli/commands/_category_.yml b/docs/docs/ref/cli/commands/_category_.yml
deleted file mode 100644
index 0ccebb0fb4..0000000000
--- a/docs/docs/ref/cli/commands/_category_.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: Commands
-position: 20
diff --git a/docs/docs/ref/cli/commands/minder.md b/docs/docs/ref/cli/minder.md
similarity index 92%
rename from docs/docs/ref/cli/commands/minder.md
rename to docs/docs/ref/cli/minder.md
index ce6682b19d..680b67d325 100644
--- a/docs/docs/ref/cli/commands/minder.md
+++ b/docs/docs/ref/cli/minder.md
@@ -14,13 +14,13 @@ https://docs.stacklok.com/minder
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
   -h, --help                     help for minder
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_artifact.md b/docs/docs/ref/cli/minder_artifact.md
similarity index 89%
rename from docs/docs/ref/cli/commands/minder_artifact.md
rename to docs/docs/ref/cli/minder_artifact.md
index a3e23f0988..06b16af7f7 100644
--- a/docs/docs/ref/cli/commands/minder_artifact.md
+++ b/docs/docs/ref/cli/minder_artifact.md
@@ -23,12 +23,12 @@ minder artifact [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_artifact_get.md b/docs/docs/ref/cli/minder_artifact_get.md
similarity index 89%
rename from docs/docs/ref/cli/commands/minder_artifact_get.md
rename to docs/docs/ref/cli/minder_artifact_get.md
index 671e0aecae..eb5365b36d 100644
--- a/docs/docs/ref/cli/commands/minder_artifact_get.md
+++ b/docs/docs/ref/cli/minder_artifact_get.md
@@ -26,12 +26,12 @@ minder artifact get [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_artifact_list.md b/docs/docs/ref/cli/minder_artifact_list.md
similarity index 84%
rename from docs/docs/ref/cli/commands/minder_artifact_list.md
rename to docs/docs/ref/cli/minder_artifact_list.md
index 6652eeabdc..c01cacdc53 100644
--- a/docs/docs/ref/cli/commands/minder_artifact_list.md
+++ b/docs/docs/ref/cli/minder_artifact_list.md
@@ -19,19 +19,19 @@ minder artifact list [flags]
   -h, --help                help for list
   -f, --output string       Output format (json or yaml)
   -g, --project-id string   ID of the project for repo registration
-  -n, --provider string     Name for the provider to enroll
+  -p, --provider string     Name for the provider to enroll
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_auth.md b/docs/docs/ref/cli/minder_auth.md
similarity index 91%
rename from docs/docs/ref/cli/commands/minder_auth.md
rename to docs/docs/ref/cli/minder_auth.md
index 00f93918c6..ec522ab0d3 100644
--- a/docs/docs/ref/cli/commands/minder_auth.md
+++ b/docs/docs/ref/cli/minder_auth.md
@@ -24,12 +24,12 @@ minder auth [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_auth_delete.md b/docs/docs/ref/cli/minder_auth_delete.md
similarity index 87%
rename from docs/docs/ref/cli/commands/minder_auth_delete.md
rename to docs/docs/ref/cli/minder_auth_delete.md
index df91a50cc7..ce88b7fd30 100644
--- a/docs/docs/ref/cli/commands/minder_auth_delete.md
+++ b/docs/docs/ref/cli/minder_auth_delete.md
@@ -23,12 +23,12 @@ minder auth delete [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_auth_login.md b/docs/docs/ref/cli/minder_auth_login.md
similarity index 88%
rename from docs/docs/ref/cli/commands/minder_auth_login.md
rename to docs/docs/ref/cli/minder_auth_login.md
index 8f66c1127e..4f1b418a0e 100644
--- a/docs/docs/ref/cli/commands/minder_auth_login.md
+++ b/docs/docs/ref/cli/minder_auth_login.md
@@ -24,12 +24,12 @@ minder auth login [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_auth_logout.md b/docs/docs/ref/cli/minder_auth_logout.md
similarity index 88%
rename from docs/docs/ref/cli/commands/minder_auth_logout.md
rename to docs/docs/ref/cli/minder_auth_logout.md
index 003e9dec06..acc1c99e07 100644
--- a/docs/docs/ref/cli/commands/minder_auth_logout.md
+++ b/docs/docs/ref/cli/minder_auth_logout.md
@@ -23,12 +23,12 @@ minder auth logout [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_auth_revoke_provider.md b/docs/docs/ref/cli/minder_auth_revoke_provider.md
similarity index 84%
rename from docs/docs/ref/cli/commands/minder_auth_revoke_provider.md
rename to docs/docs/ref/cli/minder_auth_revoke_provider.md
index da4d27346d..95efed7b02 100644
--- a/docs/docs/ref/cli/commands/minder_auth_revoke_provider.md
+++ b/docs/docs/ref/cli/minder_auth_revoke_provider.md
@@ -19,19 +19,19 @@ minder auth revoke_provider [flags]
   -a, --all                 Revoke all tokens
   -h, --help                help for revoke_provider
   -g, --project-id string   ID of the project for repo registration
-  -n, --provider string     Name for the provider to revoke tokens for
+  -p, --provider string     Name for the provider to revoke tokens for
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_auth_whoami.md b/docs/docs/ref/cli/minder_auth_whoami.md
similarity index 87%
rename from docs/docs/ref/cli/commands/minder_auth_whoami.md
rename to docs/docs/ref/cli/minder_auth_whoami.md
index 8349b6d97d..ee389032fb 100644
--- a/docs/docs/ref/cli/commands/minder_auth_whoami.md
+++ b/docs/docs/ref/cli/minder_auth_whoami.md
@@ -23,12 +23,12 @@ minder auth whoami [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_completion.md b/docs/docs/ref/cli/minder_completion.md
similarity index 91%
rename from docs/docs/ref/cli/commands/minder_completion.md
rename to docs/docs/ref/cli/minder_completion.md
index da055b6339..d8518f3938 100644
--- a/docs/docs/ref/cli/commands/minder_completion.md
+++ b/docs/docs/ref/cli/minder_completion.md
@@ -21,12 +21,12 @@ See each sub-command's help for details on how to use the generated script.
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_completion_bash.md b/docs/docs/ref/cli/minder_completion_bash.md
similarity index 92%
rename from docs/docs/ref/cli/commands/minder_completion_bash.md
rename to docs/docs/ref/cli/minder_completion_bash.md
index 9d353925d7..d10e068112 100644
--- a/docs/docs/ref/cli/commands/minder_completion_bash.md
+++ b/docs/docs/ref/cli/minder_completion_bash.md
@@ -44,12 +44,12 @@ minder completion bash
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_completion_fish.md b/docs/docs/ref/cli/minder_completion_fish.md
similarity index 91%
rename from docs/docs/ref/cli/commands/minder_completion_fish.md
rename to docs/docs/ref/cli/minder_completion_fish.md
index 71c9351e83..c372d93d91 100644
--- a/docs/docs/ref/cli/commands/minder_completion_fish.md
+++ b/docs/docs/ref/cli/minder_completion_fish.md
@@ -35,12 +35,12 @@ minder completion fish [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_completion_powershell.md b/docs/docs/ref/cli/minder_completion_powershell.md
similarity index 90%
rename from docs/docs/ref/cli/commands/minder_completion_powershell.md
rename to docs/docs/ref/cli/minder_completion_powershell.md
index 4e9256161c..261e8c7254 100644
--- a/docs/docs/ref/cli/commands/minder_completion_powershell.md
+++ b/docs/docs/ref/cli/minder_completion_powershell.md
@@ -32,12 +32,12 @@ minder completion powershell [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_completion_zsh.md b/docs/docs/ref/cli/minder_completion_zsh.md
similarity index 92%
rename from docs/docs/ref/cli/commands/minder_completion_zsh.md
rename to docs/docs/ref/cli/minder_completion_zsh.md
index 32d932b5ac..626cc5bee4 100644
--- a/docs/docs/ref/cli/commands/minder_completion_zsh.md
+++ b/docs/docs/ref/cli/minder_completion_zsh.md
@@ -46,12 +46,12 @@ minder completion zsh [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_docs.md b/docs/docs/ref/cli/minder_docs.md
similarity index 86%
rename from docs/docs/ref/cli/commands/minder_docs.md
rename to docs/docs/ref/cli/minder_docs.md
index 2a67d85979..ad4250b6fa 100644
--- a/docs/docs/ref/cli/commands/minder_docs.md
+++ b/docs/docs/ref/cli/minder_docs.md
@@ -23,12 +23,12 @@ minder docs [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_profile.md b/docs/docs/ref/cli/minder_profile.md
similarity index 91%
rename from docs/docs/ref/cli/commands/minder_profile.md
rename to docs/docs/ref/cli/minder_profile.md
index 2bc0c833c2..04933702cb 100644
--- a/docs/docs/ref/cli/commands/minder_profile.md
+++ b/docs/docs/ref/cli/minder_profile.md
@@ -24,12 +24,12 @@ minder profile [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_profile_create.md b/docs/docs/ref/cli/minder_profile_create.md
similarity index 89%
rename from docs/docs/ref/cli/commands/minder_profile_create.md
rename to docs/docs/ref/cli/minder_profile_create.md
index 2f20104913..b0ecf530bb 100644
--- a/docs/docs/ref/cli/commands/minder_profile_create.md
+++ b/docs/docs/ref/cli/minder_profile_create.md
@@ -26,12 +26,12 @@ minder profile create [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_profile_delete.md b/docs/docs/ref/cli/minder_profile_delete.md
similarity index 89%
rename from docs/docs/ref/cli/commands/minder_profile_delete.md
rename to docs/docs/ref/cli/minder_profile_delete.md
index 709772b78f..9ac40caefc 100644
--- a/docs/docs/ref/cli/commands/minder_profile_delete.md
+++ b/docs/docs/ref/cli/minder_profile_delete.md
@@ -26,12 +26,12 @@ minder profile delete [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_profile_get.md b/docs/docs/ref/cli/minder_profile_get.md
similarity index 90%
rename from docs/docs/ref/cli/commands/minder_profile_get.md
rename to docs/docs/ref/cli/minder_profile_get.md
index d349885d52..31a07bca5c 100644
--- a/docs/docs/ref/cli/commands/minder_profile_get.md
+++ b/docs/docs/ref/cli/minder_profile_get.md
@@ -27,12 +27,12 @@ minder profile get [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_profile_list.md b/docs/docs/ref/cli/minder_profile_list.md
similarity index 89%
rename from docs/docs/ref/cli/commands/minder_profile_list.md
rename to docs/docs/ref/cli/minder_profile_list.md
index 71c06c4e84..991d79197c 100644
--- a/docs/docs/ref/cli/commands/minder_profile_list.md
+++ b/docs/docs/ref/cli/minder_profile_list.md
@@ -26,12 +26,12 @@ minder profile list [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_profile_status.md b/docs/docs/ref/cli/minder_profile_status.md
similarity index 90%
rename from docs/docs/ref/cli/commands/minder_profile_status.md
rename to docs/docs/ref/cli/minder_profile_status.md
index 7340e2021b..d3a717f7e5 100644
--- a/docs/docs/ref/cli/commands/minder_profile_status.md
+++ b/docs/docs/ref/cli/minder_profile_status.md
@@ -24,12 +24,12 @@ minder profile_status [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_profile_status_get.md b/docs/docs/ref/cli/minder_profile_status_get.md
similarity index 92%
rename from docs/docs/ref/cli/commands/minder_profile_status_get.md
rename to docs/docs/ref/cli/minder_profile_status_get.md
index 32a8dbaecd..8c72490023 100644
--- a/docs/docs/ref/cli/commands/minder_profile_status_get.md
+++ b/docs/docs/ref/cli/minder_profile_status_get.md
@@ -30,12 +30,12 @@ minder profile_status get [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_profile_status_list.md b/docs/docs/ref/cli/minder_profile_status_list.md
similarity index 92%
rename from docs/docs/ref/cli/commands/minder_profile_status_list.md
rename to docs/docs/ref/cli/minder_profile_status_list.md
index 2d43a8331e..c0047d59e6 100644
--- a/docs/docs/ref/cli/commands/minder_profile_status_list.md
+++ b/docs/docs/ref/cli/minder_profile_status_list.md
@@ -30,12 +30,12 @@ minder profile_status list [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_provider.md b/docs/docs/ref/cli/minder_provider.md
similarity index 88%
rename from docs/docs/ref/cli/commands/minder_provider.md
rename to docs/docs/ref/cli/minder_provider.md
index 3a38eef411..706512ee1f 100644
--- a/docs/docs/ref/cli/commands/minder_provider.md
+++ b/docs/docs/ref/cli/minder_provider.md
@@ -23,12 +23,12 @@ minder provider [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_provider_enroll.md b/docs/docs/ref/cli/minder_provider_enroll.md
similarity index 87%
rename from docs/docs/ref/cli/commands/minder_provider_enroll.md
rename to docs/docs/ref/cli/minder_provider_enroll.md
index d12d090957..fb94863e49 100644
--- a/docs/docs/ref/cli/commands/minder_provider_enroll.md
+++ b/docs/docs/ref/cli/minder_provider_enroll.md
@@ -21,7 +21,7 @@ minder provider enroll [flags]
   -h, --help                help for enroll
   -o, --owner string        Owner to filter on for provider resources
   -g, --project-id string   ID of the project for enrolling the provider
-  -n, --provider string     Name for the provider to enroll
+  -p, --provider string     Name for the provider to enroll
   -t, --token string        Personal Access Token (PAT) to use for enrollment
 ```
 
@@ -29,12 +29,12 @@ minder provider enroll [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_repo.md b/docs/docs/ref/cli/minder_repo.md
similarity index 90%
rename from docs/docs/ref/cli/commands/minder_repo.md
rename to docs/docs/ref/cli/minder_repo.md
index edf6633763..92b21b8f83 100644
--- a/docs/docs/ref/cli/commands/minder_repo.md
+++ b/docs/docs/ref/cli/minder_repo.md
@@ -24,12 +24,12 @@ minder repo [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_repo_delete.md b/docs/docs/ref/cli/minder_repo_delete.md
similarity index 90%
rename from docs/docs/ref/cli/commands/minder_repo_delete.md
rename to docs/docs/ref/cli/minder_repo_delete.md
index ec6eeb61c4..fbd456ee85 100644
--- a/docs/docs/ref/cli/commands/minder_repo_delete.md
+++ b/docs/docs/ref/cli/minder_repo_delete.md
@@ -28,12 +28,12 @@ minder repo delete [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_repo_get.md b/docs/docs/ref/cli/minder_repo_get.md
similarity index 90%
rename from docs/docs/ref/cli/commands/minder_repo_get.md
rename to docs/docs/ref/cli/minder_repo_get.md
index 39f0da8ebd..5e51f4b084 100644
--- a/docs/docs/ref/cli/commands/minder_repo_get.md
+++ b/docs/docs/ref/cli/minder_repo_get.md
@@ -28,12 +28,12 @@ minder repo get [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_repo_list.md b/docs/docs/ref/cli/minder_repo_list.md
similarity index 84%
rename from docs/docs/ref/cli/commands/minder_repo_list.md
rename to docs/docs/ref/cli/minder_repo_list.md
index f5a0fac354..250325df69 100644
--- a/docs/docs/ref/cli/commands/minder_repo_list.md
+++ b/docs/docs/ref/cli/minder_repo_list.md
@@ -19,19 +19,19 @@ minder repo list [flags]
   -h, --help                help for list
   -f, --output string       Output format (json or yaml)
   -g, --project-id string   ID of the project for repo registration
-  -n, --provider string     Name for the provider to enroll
+  -p, --provider string     Name for the provider to enroll
 ```
 
 ### Options inherited from parent commands
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_repo_register.md b/docs/docs/ref/cli/minder_repo_register.md
similarity index 85%
rename from docs/docs/ref/cli/commands/minder_repo_register.md
rename to docs/docs/ref/cli/minder_repo_register.md
index 7ba35fd07f..a6b996772e 100644
--- a/docs/docs/ref/cli/commands/minder_repo_register.md
+++ b/docs/docs/ref/cli/minder_repo_register.md
@@ -18,7 +18,7 @@ minder repo register [flags]
 ```
   -h, --help                help for register
   -g, --project-id string   ID of the project for repo registration
-  -n, --provider string     Name for the provider to enroll
+  -p, --provider string     Name for the provider to enroll
       --repo string         List of repositories to register, i.e owner/repo,owner/repo
 ```
 
@@ -26,12 +26,12 @@ minder repo register [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_rule_type.md b/docs/docs/ref/cli/minder_rule_type.md
similarity index 92%
rename from docs/docs/ref/cli/commands/minder_rule_type.md
rename to docs/docs/ref/cli/minder_rule_type.md
index 8149d5a999..8256543bc5 100644
--- a/docs/docs/ref/cli/commands/minder_rule_type.md
+++ b/docs/docs/ref/cli/minder_rule_type.md
@@ -24,12 +24,12 @@ minder rule_type [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_rule_type_apply.md b/docs/docs/ref/cli/minder_rule_type_apply.md
similarity index 90%
rename from docs/docs/ref/cli/commands/minder_rule_type_apply.md
rename to docs/docs/ref/cli/minder_rule_type_apply.md
index e5f42764d0..d220924081 100644
--- a/docs/docs/ref/cli/commands/minder_rule_type_apply.md
+++ b/docs/docs/ref/cli/minder_rule_type_apply.md
@@ -25,12 +25,12 @@ minder rule_type apply [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_rule_type_create.md b/docs/docs/ref/cli/minder_rule_type_create.md
similarity index 90%
rename from docs/docs/ref/cli/commands/minder_rule_type_create.md
rename to docs/docs/ref/cli/minder_rule_type_create.md
index b98083e62f..36bf18dc77 100644
--- a/docs/docs/ref/cli/commands/minder_rule_type_create.md
+++ b/docs/docs/ref/cli/minder_rule_type_create.md
@@ -25,12 +25,12 @@ minder rule_type create [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_rule_type_delete.md b/docs/docs/ref/cli/minder_rule_type_delete.md
similarity index 89%
rename from docs/docs/ref/cli/commands/minder_rule_type_delete.md
rename to docs/docs/ref/cli/minder_rule_type_delete.md
index faf043e6f4..35f09a6f48 100644
--- a/docs/docs/ref/cli/commands/minder_rule_type_delete.md
+++ b/docs/docs/ref/cli/minder_rule_type_delete.md
@@ -27,12 +27,12 @@ minder rule_type delete [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_rule_type_get.md b/docs/docs/ref/cli/minder_rule_type_get.md
similarity index 90%
rename from docs/docs/ref/cli/commands/minder_rule_type_get.md
rename to docs/docs/ref/cli/minder_rule_type_get.md
index 131b005dac..c7f89f2056 100644
--- a/docs/docs/ref/cli/commands/minder_rule_type_get.md
+++ b/docs/docs/ref/cli/minder_rule_type_get.md
@@ -27,12 +27,12 @@ minder rule_type get [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_rule_type_list.md b/docs/docs/ref/cli/minder_rule_type_list.md
similarity index 89%
rename from docs/docs/ref/cli/commands/minder_rule_type_list.md
rename to docs/docs/ref/cli/minder_rule_type_list.md
index eaab8ec4a1..d10e27951a 100644
--- a/docs/docs/ref/cli/commands/minder_rule_type_list.md
+++ b/docs/docs/ref/cli/minder_rule_type_list.md
@@ -26,12 +26,12 @@ minder rule_type list [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_rule_type_update.md b/docs/docs/ref/cli/minder_rule_type_update.md
similarity index 89%
rename from docs/docs/ref/cli/commands/minder_rule_type_update.md
rename to docs/docs/ref/cli/minder_rule_type_update.md
index 6ef2f95c6e..beff4949a6 100644
--- a/docs/docs/ref/cli/commands/minder_rule_type_update.md
+++ b/docs/docs/ref/cli/minder_rule_type_update.md
@@ -25,12 +25,12 @@ minder rule_type update [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO
diff --git a/docs/docs/ref/cli/commands/minder_version.md b/docs/docs/ref/cli/minder_version.md
similarity index 87%
rename from docs/docs/ref/cli/commands/minder_version.md
rename to docs/docs/ref/cli/minder_version.md
index 85217f09b7..925f7b6018 100644
--- a/docs/docs/ref/cli/commands/minder_version.md
+++ b/docs/docs/ref/cli/minder_version.md
@@ -23,12 +23,12 @@ minder version [flags]
 
 ```
       --config string            Config file (default is $PWD/config.yaml)
-      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-host string         Server host (default "staging.stacklok.dev")
       --grpc-insecure            Allow establishing insecure connections
       --grpc-port int            Server port (default 443)
       --identity-client string   Identity server client ID (default "minder-cli")
       --identity-realm string    Identity server realm (default "stacklok")
-      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+      --identity-url string      Identity server issuer URL (default "https://auth.staging.stacklok.dev")
 ```
 
 ### SEE ALSO