diff --git a/Dockerfile b/Dockerfile
index 36856fc..8c010ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,12 +17,18 @@ COPY src-tauri/ ./
 RUN cargo build --release --bin codeg-server --no-default-features
 
 # Stage 3: Runtime
-FROM debian:bookworm-slim
+FROM node:22-bookworm-slim
 RUN apt-get update && apt-get install -y \
     libsqlite3-0 \
     git \
     openssh-client \
     ca-certificates \
+    curl \
+    python3 \
+    python3-pip \
+    gcc \
+    g++ \
+    make \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=backend /app/src-tauri/target/release/codeg-server /usr/local/bin/codeg-server
diff --git a/Dockerfile.ci b/Dockerfile.ci
index bf3598f..9ab6364 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,6 +1,6 @@
 # CI-only Dockerfile: uses pre-built binaries from build-server job
 # For local builds, use the standard Dockerfile instead
-FROM debian:bookworm-slim
+FROM node:22-bookworm-slim
 
 ARG TARGETARCH
 
@@ -9,6 +9,12 @@ RUN apt-get update && apt-get install -y \
     git \
     openssh-client \
     ca-certificates \
+    curl \
+    python3 \
+    python3-pip \
+    gcc \
+    g++ \
+    make \
     && rm -rf /var/lib/apt/lists/*
 
 COPY dist/${TARGETARCH}/codeg-server /usr/local/bin/codeg-server
diff --git a/src-tauri/capabilities/desktop.json b/src-tauri/capabilities/desktop.json
index d42ecf2..0abee9c 100644
--- a/src-tauri/capabilities/desktop.json
+++ b/src-tauri/capabilities/desktop.json
@@ -9,6 +9,9 @@
     "welcome",
     "folder-*",
     "commit-*",
+    "merge-*",
+    "stash-*",
+    "push-*",
     "settings",
     "project-boot"
   ],