diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0ceceb0a..bb9dcfb03 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,9 +36,9 @@ jobs:
       - name: Check codegen is up to date
         run: |
           sqlc generate
-          go generate ./internal/repository/...
-          git diff --exit-code -- internal/repository/
-          git status --porcelain -- internal/repository/ | grep -q . && echo "untracked files in internal/repository/" && exit 1 || true
+          go generate ./...
+          git diff --exit-code
+          git status --porcelain | grep -q . && echo "untracked files code gen files" && exit 1 || true
 
       - name: Install frontend dependencies
         working-directory: ./frontend
diff --git a/Makefile b/Makefile
index ca59093c7..714ceb07c 100644
--- a/Makefile
+++ b/Makefile
@@ -93,8 +93,7 @@ sql:
 
 # Go gen
 generate:
-	go run ./gen
-	go generate ./internal/repository/...
+	go generate ./...
 
 # Docker image
 docker:
diff --git a/gen/gen.go b/gen/docs/gen.go
similarity index 100%
rename from gen/gen.go
rename to gen/docs/gen.go
diff --git a/gen/gen_env.go b/gen/docs/gen_env.go
similarity index 100%
rename from gen/gen_env.go
rename to gen/docs/gen_env.go
diff --git a/gen/gen_md.go b/gen/docs/gen_md.go
similarity index 100%
rename from gen/gen_md.go
rename to gen/docs/gen_md.go
diff --git a/gen/sqlc-wrapper/sqlc_wrapper.go b/gen/sqlc_wrapper/sqlc_wrapper.go
similarity index 99%
rename from gen/sqlc-wrapper/sqlc_wrapper.go
rename to gen/sqlc_wrapper/sqlc_wrapper.go
index a7a75eb46..b62e9f430 100644
--- a/gen/sqlc-wrapper/sqlc_wrapper.go
+++ b/gen/sqlc_wrapper/sqlc_wrapper.go
@@ -1,4 +1,4 @@
-// gen/sqlc-wrapper generates store.go wrapper files for each sqlc driver package under
+// gen/sqlc_wrapper generates store.go wrapper files for each sqlc driver package under
 // internal/repository/<driver>/. Run via:
 //
 //	go generate ./internal/repository/...
@@ -32,7 +32,7 @@ import (
 var storeSrc string
 
 func main() {
-	fmt.Println("sqlc-wrapper: generating store.go files for sqlc driver packages...")
+	fmt.Println("sqlc_wrapper: generating store.go files for sqlc driver packages...")
 	if err := run(); err != nil {
 		log.Fatal(err)
 	}
diff --git a/gen/sqlc-wrapper/store.tmpl b/gen/sqlc_wrapper/store.tmpl
similarity index 100%
rename from gen/sqlc-wrapper/store.tmpl
rename to gen/sqlc_wrapper/store.tmpl
diff --git a/generate.go b/generate.go
new file mode 100644
index 000000000..b05623434
--- /dev/null
+++ b/generate.go
@@ -0,0 +1,3 @@
+package tinyauth
+
+//go:generate go run github.com/tinyauthapp/tinyauth/gen/docs
diff --git a/internal/repository/postgres/generate.go b/internal/repository/postgres/generate.go
index dcd23be9a..21c85a505 100644
--- a/internal/repository/postgres/generate.go
+++ b/internal/repository/postgres/generate.go
@@ -1,3 +1,3 @@
 package postgres
 
-//go:generate go run github.com/tinyauthapp/tinyauth/gen/sqlc-wrapper -pkg github.com/tinyauthapp/tinyauth/internal/repository/postgres
+//go:generate go run github.com/tinyauthapp/tinyauth/gen/sqlc_wrapper -pkg github.com/tinyauthapp/tinyauth/internal/repository/postgres
diff --git a/internal/repository/sqlite/generate.go b/internal/repository/sqlite/generate.go
index ed695567a..b16fb27d7 100644
--- a/internal/repository/sqlite/generate.go
+++ b/internal/repository/sqlite/generate.go
@@ -1,3 +1,3 @@
 package sqlite
 
-//go:generate go run github.com/tinyauthapp/tinyauth/gen/sqlc-wrapper -pkg github.com/tinyauthapp/tinyauth/internal/repository/sqlite
+//go:generate go run github.com/tinyauthapp/tinyauth/gen/sqlc_wrapper -pkg github.com/tinyauthapp/tinyauth/internal/repository/sqlite