diff --git a/Makefile b/Makefile
index 8e07ac8404..894a4435ce 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,8 @@ vendor:
 
 .PHONY: generate
 generate:
-	go generate ./pkg/... ./cmd/...
+	$(DOCKER_CMD) go generate ./pkg/... ./cmd/...
+	hack/goimports.sh .
 
 .PHONY: test
 test: unit
diff --git a/pkg/apis/awsproviderconfig/v1beta1/zz_generated.deepcopy.go b/pkg/apis/awsproviderconfig/v1beta1/zz_generated.deepcopy.go
index f97599f4d3..e5a6736aa3 100644
--- a/pkg/apis/awsproviderconfig/v1beta1/zz_generated.deepcopy.go
+++ b/pkg/apis/awsproviderconfig/v1beta1/zz_generated.deepcopy.go
@@ -21,7 +21,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
diff --git a/pkg/client/mock/client_generated.go b/pkg/client/mock/client_generated.go
index 11233bcb91..3314b9b9a1 100644
--- a/pkg/client/mock/client_generated.go
+++ b/pkg/client/mock/client_generated.go
@@ -5,11 +5,12 @@
 package mock
 
 import (
+	reflect "reflect"
+
 	ec2 "github.com/aws/aws-sdk-go/service/ec2"
 	elb "github.com/aws/aws-sdk-go/service/elb"
 	elbv2 "github.com/aws/aws-sdk-go/service/elbv2"
 	gomock "github.com/golang/mock/gomock"
-	reflect "reflect"
 )
 
 // MockClient is a mock of Client interface