diff --git a/Makefile b/Makefile
index f7459b7c..13ab16d6 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,8 @@ ruby:
 	openapi-generator-cli generate -i tmp/compiled.yaml -g ruby -o clients/ruby -c ./openapi-generator/ruby_lang.yaml
 go:
 	openapi-generator-cli generate -i tmp/compiled.yaml -g go -o clients/go -c ./openapi-generator/go_lang.yaml
+	go install golang.org/x/tools/cmd/goimports@latest
+	goimports -w clients/go
 	cd clients/go && go mod tidy
 typescript:
 	openapi-generator-cli generate -i tmp/compiled.yaml -g typescript-fetch -o clients/typescript -c ./openapi-generator/typescript_lang.yaml