diff --git a/Dockerfile b/Dockerfile
index 38bbc83..57d02ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,16 +3,14 @@
 FROM node:18-bullseye AS dev
 
 RUN apt-get update -y \
-    && apt-get install -y --no-install-recommends \
-        git bash g++ make \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN npm install -g pnpm
+    && apt-get install -y --no-install-recommends git \
+    && rm -rf /var/lib/apt/lists/* \
+    # NOTE: yarn > 1.22.19 breaks yarn-install invoked by pnpm
+    && npm install -g pnpm@8.6.0 yarn@1.22.19 --force \
+    && git config --global --add safe.directory /code
 
 WORKDIR /code
 
-RUN git config --global --add safe.directory /code
-
 # -------------------------- Nginx - Builder --------------------------------
 FROM dev AS nginx-build