diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 80df167..15d33aa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,4 +40,6 @@ jobs:
         uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel: true
+          flag-name: go-${{ matrix.go-version }}
           path-to-lcov: coverage.lcov
diff --git a/.golangci.yml b/.golangci.yml
index 1050b7c..51159db 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,12 +4,19 @@ run:
 
 formatters:
   enable:
+    - gci
     - gofmt
     - gofumpt
     - goimports
   settings:
     gofumpt:
       extra-rules: true
+    gci:
+      sections:
+        - standard
+        - default
+        - blank
+        - dot
   exclusions:
     generated: lax
 
diff --git a/Makefile b/Makefile
index 039ca0f..6c1f79a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Format all files
 fmt:
 	@echo "==> Formatting source"
-	@gofmt -s -w $(shell find . -type f -name '*.go' -not -path "./vendor/*")
+	@golangci-lint fmt ./...
 	@echo "==> Done"
 .PHONY: fmt