diff --git a/internal/cmd/pipeline/list.go b/internal/cmd/pipeline/list.go
index 3571ea6..c388c2f 100644
--- a/internal/cmd/pipeline/list.go
+++ b/internal/cmd/pipeline/list.go
@@ -35,7 +35,7 @@ func NewCmdList(streams *iostreams.IOStreams) *cobra.Command {
 		Long: `List pipelines in a Bitbucket repository.
 
 By default, this shows the most recent pipelines. Use the --status flag to filter
-by pipeline status (PENDING, IN_PROGRESS, COMPLETED, FAILED, etc.).`,
+by pipeline status (PENDING, IN_PROGRESS, COMPLETED, SUCCESSFUL, FAILED, STOPPED, EXPIRED).`,
 		Example: `  # List recent pipelines
   bb pipeline list
 
diff --git a/internal/cmd/workspace/list.go b/internal/cmd/workspace/list.go
index bfb0ae1..a05ad2e 100644
--- a/internal/cmd/workspace/list.go
+++ b/internal/cmd/workspace/list.go
@@ -54,6 +54,10 @@ You can filter by your role in the workspace (owner, collaborator, or member).`,
 	cmd.Flags().IntVarP(&opts.Limit, "limit", "l", 30, "Maximum number of workspaces to list")
 	cmd.Flags().BoolVar(&opts.JSON, "json", false, "Output in JSON format")
 
+	_ = cmd.RegisterFlagCompletionFunc("role", cmdutil.StaticFlagCompletion([]string{
+		"owner", "collaborator", "member",
+	}))
+
 	return cmd
 }