diff --git a/cmd_generate.go b/cmd_generate.go
index a1140c8..e48c760 100644
--- a/cmd_generate.go
+++ b/cmd_generate.go
@@ -96,5 +96,10 @@ func (g *generateCmd) Execute(_ context.Context, _ *flag.FlagSet, _ ...interface
 		}
 	}
 
+	if err := generation.FmtTemplates(g.outputLocation); err != nil {
+		slog.Error("Error formatting templates", slog.String("outputLocation", g.outputLocation), slog.String("error", err.Error()))
+		return subcommands.ExitFailure
+	}
+
 	return subcommands.ExitSuccess
 }
diff --git a/pkg/generation/templates.go b/pkg/generation/templates.go
index 454cade..3756e20 100644
--- a/pkg/generation/templates.go
+++ b/pkg/generation/templates.go
@@ -107,3 +107,10 @@ func InstallGoimports() error {
 	cmd.Stderr = os.Stderr
 	return cmd.Run()
 }
+
+func FmtTemplates(outputLoc string) error {
+	cmd := exec.Command("goimports", "-w", outputLoc)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}