diff --git a/Makefile b/Makefile
index f033fde90..b31662ebc 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,13 @@ tag:
 install-aws-codegen:
 	${MAKE} -C code-generation install
 
+.PHONY: build-codegen
+build-codegen:
+	${MAKE} -C code-generation rebuild
+
 .PHONY: aws-codegen
 aws-codegen:
-	aws-service-operator-codegen process
+	./code-generation/aws-service-operator-codegen process
 
 .PHONY: k8s-codegen
 k8s-codegen:
@@ -39,4 +43,4 @@ k8s-codegen:
 codegen: aws-codegen k8s-codegen
 
 .PHONY: rebuild
-rebuild: codegen build
+rebuild: build-codegen codegen build
diff --git a/code-generation/Makefile b/code-generation/Makefile
index ec204c842..d3584e581 100644
--- a/code-generation/Makefile
+++ b/code-generation/Makefile
@@ -16,6 +16,7 @@ install-bindata:
 .PHONY: update-bindata
 update-bindata:
 	go generate ./pkg/codegen/
+	go fmt ./...
 
 .PHONY: rebuild
 rebuild: update-bindata build