diff --git a/Dockerfile b/Dockerfile
index ab3ddb3..28c66b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
 # syntax=docker/dockerfile:1.4
-
 # Cargo build stage
 FROM rust:1.80-slim AS cargo-builder
-
 # Install Rust dependencies
 RUN --mount=type=cache,target=/var/cache/apt \
     --mount=type=cache,target=/usr/local/cargo/registry \
@@ -11,10 +9,8 @@ RUN --mount=type=cache,target=/var/cache/apt \
     libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev \
     libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev \
     gnome-video-effects
-
 COPY . /pake
 WORKDIR /pake/src-tauri
-
 # Build cargo packages and store cache
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
     cargo fetch && \
@@ -23,12 +19,11 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
     cp -R /usr/local/cargo/registry /cargo-cache/ && \
     cp -R /usr/local/cargo/git /cargo-cache/
     
-# Ensure the content of /cargo-cache && clean unnecessary files
+# Verify the content of /cargo-cache && clean unnecessary files
 RUN ls -la /cargo-cache/registry && ls -la /cargo-cache/git && rm -rfd /cargo-cache/registry/src
 
 # Main build stage
 FROM rust:1.80-slim AS builder
-
 # Install Rust dependencies
 RUN --mount=type=cache,target=/var/cache/apt \
     --mount=type=cache,target=/usr/local/cargo/registry \
@@ -38,20 +33,25 @@ RUN --mount=type=cache,target=/var/cache/apt \
     libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev \
     gnome-video-effects
 
-# Install Node.js 19.x
+# Install Node.js 20.x
 RUN --mount=type=cache,target=/var/cache/apt \
     curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
     apt-get update && apt-get install -y nodejs
 
-# Install pake-cli and its implicit runtime dependencies
-RUN --mount=type=cache,target=/root/.npm \
-    npm install -g pake-cli && \
-    cd /usr/lib/node_modules/pake-cli && \
-    npm install
+# Copy project files
+COPY . /pake
+WORKDIR /pake
 
-COPY --from=cargo-builder /pake/src-tauri /usr/lib/node_modules/pake-cli/src-tauri
+# Install dependencies and build pake-cli
+RUN --mount=type=cache,target=/root/.npm \
+    npm ci && \
+    npm run build
+
+# Copy Rust build artifacts
+COPY --from=cargo-builder /pake/src-tauri /pake/src-tauri
 COPY --from=cargo-builder /cargo-cache/git /usr/local/cargo/git
 COPY --from=cargo-builder /cargo-cache/registry /usr/local/cargo/registry
 
+# Set up the entrypoint
 WORKDIR /output
-ENTRYPOINT ["pake"]
+ENTRYPOINT ["node", "/pake/cli.js"]