diff --git a/Justfile b/Justfile
index fce2930..d8718b9 100644
--- a/Justfile
+++ b/Justfile
@@ -28,7 +28,8 @@ lint:
 # Format code
 fmt:
     just --unstable --fmt
-    golangci-lint fmt
+    git ls-files | grep '\.go$' | xargs gosimports -local github.com/block -w
+    go fmt ./...
     go mod tidy
 
 # ============================================================================