diff --git a/.gitignore b/.gitignore
index 4ac5c2e95..c42b6bf34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-# Python-generated files
+# -----------------------------
+# Python
+# -----------------------------
 __pycache__/
 *.py[oc]
 build/
@@ -8,38 +10,58 @@ wheels/
 .ruff_cache/
 .pytest_cache/
 
-# Virtual environments
-.venv
+# -----------------------------
+# Virtual Environments
+# -----------------------------
+.venv/
+env/
+venv/
+*.lock
 
-# Environment variables
+# -----------------------------
+# Environment & Config
+# -----------------------------
 .env
-*.lock
+config/iris_ai.json
+config/memory
+config/.runtime.json5
 
-# IDE
+# -----------------------------
+# IDE / Editors
+# -----------------------------
 .vscode/
+.idea/
 
-# Debug files
+# -----------------------------
+# OS Specific
+# -----------------------------
+.DS_Store
+Thumbs.db
+
+# -----------------------------
+# Logs / Debug / Temporary
+# -----------------------------
+logs/
 front_image.jpg
 turtlebot4_debug.jpg
 turtlebot.jpg
-
-# Mac specific lint
-.DS_Store
-config/iris_ai.json
+*.log
 launch.sh
 
-# AI models
-*.pt
-
-# Logs
-logs/
-
-# Data files
+# -----------------------------
+# Data / Artifacts
+# -----------------------------
 *.jsonl
+*.pt
 *.jpg
 /zenohdb
 /locations
 
-# Mode system state files
-config/memory
-config/.runtime.json5
+# -----------------------------
+# Distribution / Packaging
+# -----------------------------
+*.tar.gz
+*.zip
+*.whl
+*.egg
+MANIFEST