diff --git a/.dockerignore b/.dockerignore
index 72f1915..d1d7a22 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,9 @@
+.git
+node_modules
+.DS_Store
 bin/
-chatd
 data.db
 .env
-.git
 *.test
 *.out
 debug.log
diff --git a/.gitignore b/.gitignore
index e3ce31c..a6fb1aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,28 @@
+# OS
+.DS_Store
+Thumbs.db
+
+# Editors
+*.swp
+*.swo
+*~
+*.bak
+.idea/
+.vscode/
+*.sublime-*
+
+# Node
+node_modules/
+
+# Environment / secrets
+.env
+.env.*
+*.pem
+*.key
+
+# Build artifacts
 /chatd
 /bin/
-data.db
-.env
 *.exe
 *.dll
 *.so
@@ -9,6 +30,9 @@ data.db
 *.test
 *.out
 vendor/
+
+# Project
+data.db
 debug.log
-web/node_modules/
 chat-cli
+web/node_modules/