diff --git a/cmd/list.go b/cmd/list.go
index 40b4ced..812b998 100644
--- a/cmd/list.go
+++ b/cmd/list.go
@@ -25,13 +25,10 @@ func runList(_ *cli.Context) error {
 	}
 
 	wr := tabwriter.NewWriter(os.Stdout, 0, 8, 0, '\t', 0)
-
-	fmt.Println("Templates")
 	for _, t := range reg.Templates {
-		if _, err := fmt.Fprintf(wr, "%s\t%s@%s\t%s", t.Name, t.Repository, t.Branch, t.Created); err != nil {
+		if _, err := fmt.Fprintf(wr, "%s\t%s@%s\t%s\n", t.Name, t.Repository, t.Branch, t.Created); err != nil {
 			return err
 		}
 	}
-	fmt.Println()
-	return nil
+	return wr.Flush()
 }
diff --git a/cmd/source.go b/cmd/source.go
index ac52533..efb532f 100644
--- a/cmd/source.go
+++ b/cmd/source.go
@@ -55,15 +55,12 @@ func runSourceList(_ *cli.Context) error {
 	}
 
 	wr := tabwriter.NewWriter(os.Stdout, 0, 8, 0, '\t', 0)
-
-	fmt.Println("Sources")
 	for _, s := range reg.Sources {
-		if _, err := fmt.Fprintf(wr, "%s\t%s", s.Name, s.URL); err != nil {
+		if _, err := fmt.Fprintf(wr, "%s\t%s\n", s.Name, s.URL); err != nil {
 			return err
 		}
 	}
-	fmt.Println()
-	return nil
+	return wr.Flush()
 }
 
 func runSourceAdd(ctx *cli.Context) error {