diff --git a/cmd/helm/flags.go b/cmd/helm/flags.go
index 32d5b891b..467abbd6e 100644
--- a/cmd/helm/flags.go
+++ b/cmd/helm/flags.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -51,7 +52,8 @@ func addChartPathOptionsFlags(f *pflag.FlagSet, c *action.ChartPathOptions) {
 // bindOutputFlag will add the output flag to the given command and bind the
 // value to the given format pointer
 func bindOutputFlag(cmd *cobra.Command, varRef *output.Format) {
-	cmd.Flags().VarP(newOutputValue(output.Table, varRef), outputFlag, "o", fmt.Sprintf("prints the output in the specified format. Allowed values: %s, %s, %s", output.Table, output.JSON, output.YAML))
+	cmd.Flags().VarP(newOutputValue(output.Table, varRef), outputFlag, "o",
+		fmt.Sprintf("prints the output in the specified format. Allowed values: %s", strings.Join(output.Formats(), ", ")))
 	// Setup shell completion for the flag
 	cmd.MarkFlagCustom(outputFlag, "__helm_output_options")
 }
diff --git a/cmd/helm/root.go b/cmd/helm/root.go
index 678409a52..d40d9fa95 100644
--- a/cmd/helm/root.go
+++ b/cmd/helm/root.go
@@ -17,13 +17,16 @@ limitations under the License.
 package main // import "helm.sh/helm/v3/cmd/helm"
 
 import (
+	"fmt"
 	"io"
+	"strings"
 
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v3/cmd/helm/require"
 	"helm.sh/helm/v3/internal/experimental/registry"
 	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/cli/output"
 )
 
 const (
@@ -92,7 +95,7 @@ __helm_get_namespaces()
 __helm_output_options()
 {
     __helm_debug "${FUNCNAME[0]}: c is $c words[c] is ${words[c]}"
-    COMPREPLY+=( $( compgen -W "table json yaml" -- "$cur" ) )
+    COMPREPLY+=( $( compgen -W "%[1]s" -- "$cur" ) )
 }
 
 __helm_binary_name()
@@ -209,7 +212,7 @@ func newRootCmd(actionConfig *action.Configuration, out io.Writer, args []string
 		Long:                   globalUsage,
 		SilenceUsage:           true,
 		Args:                   require.NoArgs,
-		BashCompletionFunction: bashCompletionFunc,
+		BashCompletionFunction: fmt.Sprintf(bashCompletionFunc, strings.Join(output.Formats(), " ")),
 	}
 	flags := cmd.PersistentFlags()
 
diff --git a/pkg/cli/output/output.go b/pkg/cli/output/output.go
index da9ee63a8..e4eb046fc 100644
--- a/pkg/cli/output/output.go
+++ b/pkg/cli/output/output.go
@@ -35,10 +35,15 @@ const (
 	YAML  Format = "yaml"
 )
 
+// Formats returns a list of the string representation of the supported formats
+func Formats() []string {
+	return []string{Table.String(), JSON.String(), YAML.String()}
+}
+
 // ErrInvalidFormatType is returned when an unsupported format type is used
 var ErrInvalidFormatType = fmt.Errorf("invalid format type")
 
-// String returns the string reprsentation of the Format
+// String returns the string representation of the Format
 func (o Format) String() string {
 	return string(o)
 }