diff --git a/opal-task/cmd/completion.go b/opal-task/cmd/completion.go
index 7f29d16..e5a6f30 100644
--- a/opal-task/cmd/completion.go
+++ b/opal-task/cmd/completion.go
@@ -20,9 +20,16 @@ Bash:
   $ echo 'source <(opal completion bash)' >> ~/.bashrc
 
 Zsh:
-  $ source <(opal completion zsh)
-  # To load on startup, add to ~/.zshrc:
-  $ echo 'source <(opal completion zsh)' >> ~/.zshrc
+  # Option 1: Write to a directory in your $fpath
+  $ opal completion zsh > "${fpath[1]}/_opal"
+  # Then restart your shell or run: compinit
+
+  # Option 2: Write to a custom directory and add it to fpath
+  $ mkdir -p ~/.zsh/completions
+  $ opal completion zsh > ~/.zsh/completions/_opal
+  # Add to ~/.zshrc (before compinit):
+  #   fpath=(~/.zsh/completions $fpath)
+  #   autoload -Uz compinit && compinit
 
 Fish:
   $ opal completion fish | source
@@ -33,7 +40,7 @@ Fish:
 	Run: func(cmd *cobra.Command, args []string) {
 		switch args[0] {
 		case "bash":
-			rootCmd.GenBashCompletion(os.Stdout)
+			rootCmd.GenBashCompletionV2(os.Stdout, true)
 		case "zsh":
 			rootCmd.GenZshCompletion(os.Stdout)
 		case "fish":