diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..856dff4
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,21 @@
+# Git
+.git
+.gitignore
+
+# Flutter/Dart
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+build/
+
+# IDEs
+.idea/
+.vscode/
+*.iml
+
+# OS
+.DS_Store
+Thumbs.db
diff --git a/.gitignore b/.gitignore
index 4a5bb18..5507ab1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,7 @@ app.*.map.json
 /android/app/release
 
 # Docker
-.dockerignore
+
 
 # Hive data (local development)
 *.hive
diff --git a/Dockerfile b/Dockerfile
index ac1b04b..ed3745b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,12 @@ FROM ghcr.io/cirruslabs/flutter:stable AS builder
 
 WORKDIR /app
 
+# Safe directory configuration for git
+RUN git config --global --add safe.directory /app
+
+# Enable web support (idempotent)
+RUN flutter config --enable-web
+
 # Copy dependency files first for better caching
 COPY pubspec.yaml ./