diff --git a/.dockerignore b/.dockerignore
index 1b9e201..416e1ab 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -14,7 +14,6 @@ dist/
 .next/
 
 # Development and cache files
-.git/
 .gitignore
 **/.DS_Store
 *.log
diff --git a/apps/aqua/Dockerfile b/apps/aqua/Dockerfile
index 1c2b1ce..cdc0a29 100644
--- a/apps/aqua/Dockerfile
+++ b/apps/aqua/Dockerfile
@@ -32,6 +32,17 @@ RUN echo "DEBUG Before copy: TARGETPLATFORM=$TARGETPLATFORM TARGETARCH=$TARGETAR
 
 COPY ./ .
 
+# Setup lexicons and install dependencies
+RUN ./scripts/setup-lexicons.sh
+
+# Install Node.js and pnpm for lexicon generation
+RUN apt-get update && apt-get install -y nodejs npm && rm -rf /var/lib/apt/lists/*
+RUN npm install -g pnpm
+
+# Install dependencies and generate lexicons
+RUN pnpm install
+RUN pnpm lex:gen --rust-only
+
 # Install cross-compilation toolchains
 RUN rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
 
diff --git a/services/cadet/Dockerfile b/services/cadet/Dockerfile
index 336a88c..c668ff7 100644
--- a/services/cadet/Dockerfile
+++ b/services/cadet/Dockerfile
@@ -32,6 +32,17 @@ RUN echo "DEBUG Before copy: TARGETPLATFORM=$TARGETPLATFORM TARGETARCH=$TARGETAR
 
 COPY ./ .
 
+# Setup lexicons and install dependencies
+RUN ./scripts/setup-lexicons.sh
+
+# Install Node.js and pnpm for lexicon generation
+RUN apt-get update && apt-get install -y nodejs npm && rm -rf /var/lib/apt/lists/*
+RUN npm install -g pnpm
+
+# Install dependencies and generate lexicons
+RUN pnpm install
+RUN pnpm lex:gen --rust-only
+
 # Install cross-compilation toolchains
 RUN rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu