diff --git a/services/matrix-calendar-bot/Dockerfile b/services/matrix-calendar-bot/Dockerfile
index 4d6eb8a26..23d108502 100644
--- a/services/matrix-calendar-bot/Dockerfile
+++ b/services/matrix-calendar-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-calendar-bot ./services/matrix-calendar-bot
 # Install all dependencies
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-calendar-bot/package.json ./services/ma
 # Install production dependencies only
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data
 
diff --git a/services/matrix-clock-bot/Dockerfile b/services/matrix-clock-bot/Dockerfile
index deb4d78eb..e86835e0a 100644
--- a/services/matrix-clock-bot/Dockerfile
+++ b/services/matrix-clock-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-clock-bot ./services/matrix-clock-bot
 # Install all dependencies
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-clock-bot/package.json ./services/matri
 # Install production dependencies only
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data
 
diff --git a/services/matrix-mana-bot/Dockerfile b/services/matrix-mana-bot/Dockerfile
index 4e45bce03..092389a1c 100644
--- a/services/matrix-mana-bot/Dockerfile
+++ b/services/matrix-mana-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-mana-bot ./services/matrix-mana-bot
 # Install all dependencies (--ignore-scripts to skip root postinstall hooks)
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-mana-bot/package.json ./services/matrix
 # Install production dependencies only (--ignore-scripts to skip root postinstall hooks)
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data
 
diff --git a/services/matrix-nutriphi-bot/Dockerfile b/services/matrix-nutriphi-bot/Dockerfile
index bd6f0ffb5..94ffef8cc 100644
--- a/services/matrix-nutriphi-bot/Dockerfile
+++ b/services/matrix-nutriphi-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-nutriphi-bot ./services/matrix-nutriphi-bot
 # Install all dependencies
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-nutriphi-bot/package.json ./services/ma
 # Install production dependencies only
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data
 
diff --git a/services/matrix-ollama-bot/Dockerfile b/services/matrix-ollama-bot/Dockerfile
index 2f0710765..680872e3d 100644
--- a/services/matrix-ollama-bot/Dockerfile
+++ b/services/matrix-ollama-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-ollama-bot ./services/matrix-ollama-bot
 # Install all dependencies
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-ollama-bot/package.json ./services/matr
 # Install production dependencies only
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data
 
diff --git a/services/matrix-project-doc-bot/Dockerfile b/services/matrix-project-doc-bot/Dockerfile
index a3765371c..fd8d7b4c8 100644
--- a/services/matrix-project-doc-bot/Dockerfile
+++ b/services/matrix-project-doc-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-project-doc-bot ./services/matrix-project-doc-bot
 # Install all dependencies
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-project-doc-bot/package.json ./services
 # Install production dependencies only
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data
 
diff --git a/services/matrix-stats-bot/Dockerfile b/services/matrix-stats-bot/Dockerfile
index 2183efab8..73070748a 100644
--- a/services/matrix-stats-bot/Dockerfile
+++ b/services/matrix-stats-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-stats-bot ./services/matrix-stats-bot
 # Install all dependencies
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-stats-bot/package.json ./services/matri
 # Install production dependencies only
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data
 
diff --git a/services/matrix-todo-bot/Dockerfile b/services/matrix-todo-bot/Dockerfile
index 8f03306ed..20580171a 100644
--- a/services/matrix-todo-bot/Dockerfile
+++ b/services/matrix-todo-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-todo-bot ./services/matrix-todo-bot
 # Install all dependencies
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-todo-bot/package.json ./services/matrix
 # Install production dependencies only
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data
 
diff --git a/services/matrix-tts-bot/Dockerfile b/services/matrix-tts-bot/Dockerfile
index 8e2e820d2..efd308c5a 100644
--- a/services/matrix-tts-bot/Dockerfile
+++ b/services/matrix-tts-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-tts-bot ./services/matrix-tts-bot
 # Install all dependencies
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-tts-bot/package.json ./services/matrix-
 # Install production dependencies only
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data
 
diff --git a/services/matrix-zitare-bot/Dockerfile b/services/matrix-zitare-bot/Dockerfile
index dc7e29113..89a5caad8 100644
--- a/services/matrix-zitare-bot/Dockerfile
+++ b/services/matrix-zitare-bot/Dockerfile
@@ -19,6 +19,9 @@ COPY services/matrix-zitare-bot ./services/matrix-zitare-bot
 # Install all dependencies
 RUN pnpm install --frozen-lockfile --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Build shared packages first (in dependency order)
 RUN pnpm --filter @manacore/bot-services build
 RUN pnpm --filter @manacore/matrix-bot-common build
@@ -50,6 +53,9 @@ COPY --from=builder /app/services/matrix-zitare-bot/package.json ./services/matr
 # Install production dependencies only
 RUN pnpm install --frozen-lockfile --prod --ignore-scripts
 
+# Rebuild native modules to ensure platform-specific binaries are selected
+RUN pnpm rebuild @matrix-org/matrix-sdk-crypto-nodejs || true
+
 # Create data directory
 RUN mkdir -p /app/data