diff --git a/Makefile b/Makefile
index 6a3a5f6..3709877 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ OUT_DIR := ./out
 TESTS_DIR := ./tests
 
 GO_FILES := $(shell find . -type f \( -iname '*.go' \))
+GO_MODULE := github.com/pushbits/server
 
 PB_BUILD_VERSION ?= $(shell git describe --tags)
 ifeq ($(PB_BUILD_VERSION),)
@@ -21,17 +22,18 @@ clean:
 
 .PHONY: test
 test:
-	stdout=$$(gofumpt -l . 2>&1); if [ "$$stdout" ]; then exit 1; fi
+	if [ -n "$$(gofumpt -l $(GO_FILES))" ]; then echo "Code is not properly formatted"; exit 1; fi
+	if [ -n "$$(goimports -l -local $(GO_MODULE) $(GO_FILES))" ]; then echo "Imports are not properly formatted"; exit 1; fi
 	go vet ./...
 	misspell -error $(GO_FILES)
 	gocyclo -over 10 $(GO_FILES)
 	staticcheck ./...
-	errcheck -exclude errcheck_excludes.txt ./...
+	errcheck -ignoregenerated -exclude errcheck_excludes.txt ./...
 	gocritic check -disable='#experimental,#opinionated' -@ifElseChain.minThreshold 3 ./...
 	revive -set_exit_status -exclude ./docs ./...
 	nilaway ./...
 	go test -v -cover ./...
-	gosec -exclude-dir=tests ./...
+	gosec -exclude-generated -exclude-dir=tests ./...
 	govulncheck ./...
 	@printf '\n%s\n' "> Test successful"
 
@@ -45,6 +47,7 @@ setup:
 	go install github.com/securego/gosec/v2/cmd/gosec@latest
 	go install github.com/swaggo/swag/cmd/swag@latest
 	go install go.uber.org/nilaway/cmd/nilaway@latest
+	go install golang.org/x/tools/cmd/goimports@latest
 	go install golang.org/x/vuln/cmd/govulncheck@latest
 	go install honnef.co/go/tools/cmd/staticcheck@latest
 	go install mvdan.cc/gofumpt@latest
diff --git a/internal/api/alertmanager/handler.go b/internal/api/alertmanager/handler.go
index 337a5ad..80b6f25 100644
--- a/internal/api/alertmanager/handler.go
+++ b/internal/api/alertmanager/handler.go
@@ -6,6 +6,7 @@ import (
 	"net/url"
 
 	"github.com/gin-gonic/gin"
+
 	"github.com/pushbits/server/internal/api"
 	"github.com/pushbits/server/internal/authentication"
 	"github.com/pushbits/server/internal/log"
diff --git a/internal/api/api_test.go b/internal/api/api_test.go
index 7d8d6fe..9030ec2 100644
--- a/internal/api/api_test.go
+++ b/internal/api/api_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
+
 	"github.com/pushbits/server/internal/authentication/credentials"
 	"github.com/pushbits/server/internal/configuration"
 	"github.com/pushbits/server/internal/database"
diff --git a/internal/api/application_test.go b/internal/api/application_test.go
index 1dd101c..28f7f95 100644
--- a/internal/api/application_test.go
+++ b/internal/api/application_test.go
@@ -6,10 +6,11 @@ import (
 	"io"
 	"testing"
 
-	"github.com/pushbits/server/internal/model"
-	"github.com/pushbits/server/tests"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/pushbits/server/internal/model"
+	"github.com/pushbits/server/tests"
 )
 
 // Collect all created applications to check & delete them later
diff --git a/internal/api/context_test.go b/internal/api/context_test.go
index a7a077a..4325e8f 100644
--- a/internal/api/context_test.go
+++ b/internal/api/context_test.go
@@ -3,12 +3,13 @@ package api
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/pushbits/server/internal/log"
 	"github.com/pushbits/server/internal/model"
 	"github.com/pushbits/server/tests"
 	"github.com/pushbits/server/tests/mockups"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestApi_getID(t *testing.T) {
diff --git a/internal/api/health_test.go b/internal/api/health_test.go
index 1b147d7..2f283c2 100644
--- a/internal/api/health_test.go
+++ b/internal/api/health_test.go
@@ -3,8 +3,9 @@ package api
 import (
 	"testing"
 
-	"github.com/pushbits/server/tests"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/pushbits/server/tests"
 )
 
 func TestApi_Health(t *testing.T) {
diff --git a/internal/api/notification_test.go b/internal/api/notification_test.go
index 71f4182..4c33756 100644
--- a/internal/api/notification_test.go
+++ b/internal/api/notification_test.go
@@ -5,10 +5,11 @@ import (
 	"io"
 	"testing"
 
-	"github.com/pushbits/server/internal/model"
-	"github.com/pushbits/server/tests"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/pushbits/server/internal/model"
+	"github.com/pushbits/server/tests"
 )
 
 func TestApi_CreateNotification(t *testing.T) {
diff --git a/internal/api/user_test.go b/internal/api/user_test.go
index 9d65690..7875d69 100644
--- a/internal/api/user_test.go
+++ b/internal/api/user_test.go
@@ -6,10 +6,11 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/pushbits/server/internal/model"
-	"github.com/pushbits/server/tests"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/pushbits/server/internal/model"
+	"github.com/pushbits/server/tests"
 )
 
 func TestApi_CreateUser(t *testing.T) {
diff --git a/internal/api/util_test.go b/internal/api/util_test.go
index 079c0da..3dc6d8a 100644
--- a/internal/api/util_test.go
+++ b/internal/api/util_test.go
@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/pushbits/server/tests"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/pushbits/server/tests"
 )
 
 func TestApi_SuccessOrAbort(t *testing.T) {
diff --git a/internal/configuration/configuration.go b/internal/configuration/configuration.go
index 1a6a247..ec7fbef 100644
--- a/internal/configuration/configuration.go
+++ b/internal/configuration/configuration.go
@@ -3,6 +3,7 @@ package configuration
 
 import (
 	"github.com/jinzhu/configor"
+
 	"github.com/pushbits/server/internal/log"
 	"github.com/pushbits/server/internal/pberrors"
 )
diff --git a/internal/configuration/configuration_test.go b/internal/configuration/configuration_test.go
index b279005..ba30b50 100644
--- a/internal/configuration/configuration_test.go
+++ b/internal/configuration/configuration_test.go
@@ -7,10 +7,11 @@ import (
 	"testing"
 
 	"github.com/jinzhu/configor"
-	"github.com/pushbits/server/internal/log"
-	"github.com/pushbits/server/internal/pberrors"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v2"
+
+	"github.com/pushbits/server/internal/log"
+	"github.com/pushbits/server/internal/pberrors"
 )
 
 type Pair struct {
diff --git a/internal/runner/runner.go b/internal/runner/runner.go
index 05befb3..a945fcb 100644
--- a/internal/runner/runner.go
+++ b/internal/runner/runner.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/gin-gonic/gin"
+
 	"github.com/pushbits/server/internal/configuration"
 )