diff --git a/.sqlfluff b/.sqlfluff
new file mode 100644
index 0000000..7fb4ec3
--- /dev/null
+++ b/.sqlfluff
@@ -0,0 +1,2 @@
+[sqlfluff]
+dialect = postgres
diff --git a/Rakefile b/Rakefile
index 9c1cb50..9e39bb4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,7 +8,7 @@ Minitest::TestTask.create
 
 task :format do
   system("stree write **/*.rb")
-  system("pg_format -i db/**/*.sql")
+  system("sqlfluff format db")
 end
 
 task :mutate do
diff --git a/devenv.nix b/devenv.nix
index fd4be07..ed8ea7e 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -7,7 +7,7 @@
   packages = [
     pkgs.postgresql_18
     pkgs.postgresql_18.pg_config
-    pkgs.pgformatter
+    pkgs.sqlfluff
     pkgs.jq
     pkgs.libyaml
   ];