diff --git a/.dockerignore b/.dockerignore
index d465134d..eec0f9fd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,13 +1,27 @@
-web/node_modules
-web/dist
-.git
-.github
-build/
-tmp/
-memos
+# Build and local output
+/build/
+/bin/
+/tmp/
+/memos
+/memos.exe
+coverage.out
+/.pnpm-store/
+/.worktrees/
+
+# Not used by the image build
+/web/
+/docs/
+/.github/
 *.md
-.gitignore
-.golangci.yaml
-.dockerignore
-docs/
-.DS_Store
\ No newline at end of file
+/.gitignore
+/.dockerignore
+/.golangci.yaml
+
+# Local metadata and secrets
+/.git/
+/.env
+/.env.*
+/.idea/
+/.vscode/
+/.claude/
+**/.DS_Store
diff --git a/.gitignore b/.gitignore
index 6b0f2799..1cfc6e0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,24 @@
-# temp folder
-tmp
+# Generated output
+/build/
+/bin/
+/tmp/
+/memos
+/memos.exe
+coverage.out
+# Frontend bundles: web/dist from `pnpm build`, and
+# server/router/frontend/dist from `pnpm release`, which go:embed bakes
+# into the binary.
+dist/
 
-# Frontend asset
-web/dist
-
-# Build artifacts
-build/
-bin/
-memos
-
-.DS_Store
-
-# Jetbrains
-.idea
-
-# Docker Compose Environment File
+# Local development files
 .env
-
-dist
-
-# VSCode settings
-.vscode
-
-# Git worktrees
-.worktrees/
-
-# Local pnpm store (project-scoped, created when --config.store-dir is set
-# without an existing store; contains a symlink back to the workspace).
+.env.*
+!.env.example
+.DS_Store
+.idea/
+.vscode/
+/.worktrees/
+# Project-scoped pnpm store, created under whichever directory pnpm runs in
+# when --config.store-dir is set without an existing store; it contains a
+# symlink back to the workspace.
 .pnpm-store/
-
-# Frontend test coverage output (Vitest + @vitest/coverage-v8).
-web/coverage/
diff --git a/web/.gitignore b/web/.gitignore
index 0e8b17df..9ff3962c 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -1,7 +1,7 @@
-node_modules
-.pnpm-store
-.DS_Store
-dist
-dist-ssr
+# Generated output
+node_modules/
+coverage/
+/src/types/proto/store/
+
+# Machine-local overrides (Vite convention: .env.local, .env.*.local, ...)
 *.local
-src/types/proto/store