diff --git a/Dockerfile b/Dockerfile
index 0ada6f9..18bcfba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,19 @@
-FROM node:18-slim
+FROM node:20-slim
 
 # See https://crbug.com/795759
 RUN apt-get update && apt-get install -yq libgconf-2-4
 
-# Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
-# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer
-# installs, work.
-RUN apt-get update && apt-get install -y wget --no-install-recommends \
-    && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
+# Install gnupg and ca-certificates required for adding the signing key
+RUN apt-get update && apt-get install -y gnupg ca-certificates
+
+# Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai, and a few others)
+# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer installs, work.
+RUN apt-get update && apt-get install -y wget curl --no-install-recommends \
+    && curl -fsSL https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /usr/share/keyrings/google-linux-signing-key.gpg \
+    && sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-linux-signing-key.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list' \
+    && rm -f /etc/apt/sources.list.d/google-chrome-unstable.list \
     && apt-get update \
-    && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst ttf-freefont \
+    && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf \
       --no-install-recommends \
     && rm -rf /var/lib/apt/lists/* \
     && apt-get purge --auto-remove -y curl \
@@ -30,7 +33,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
         git \
         make \
         openssl \
-        python \
+        python-is-python3 \
         rsync \
         ssh \
         wget \
@@ -72,10 +75,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
         lsb-release \
         xdg-utils \
         wget \
-    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && apt-get update \
-    && apt-get install yarn -y \
     && apt-get clean \
     && rm -r /var/lib/apt/lists/*
 
@@ -88,21 +87,17 @@ RUN chmod +x /usr/local/bin/dumb-init
 #     browser.launch({executablePath: 'google-chrome-unstable'})
 # ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
 
-RUN npm i puppeteer
+# Prepare pnpm
+ENV PNPM_HOME="/root/.local/share/pnpm"
+RUN mkdir -p ${PNPM_HOME}
+ENV PATH="$PNPM_HOME:$PATH"
 
-# Add user so we don't need --no-sandbox.
-RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \
-    && mkdir -p /home/pptruser/Downloads \
-    && chown -R pptruser:pptruser /home/pptruser \
-    && chown -R pptruser:pptruser /node_modules \
-    && chown -R pptruser:pptruser /usr/local/lib/node_modules \
-    && chown -R pptruser:pptruser /usr/local/bin
+RUN bash -c "curl -fsSL https://get.pnpm.io/install.sh | bash - \
+    && pnpm -v \
+    && pnpm config set unsafe-perm true"
 
-# Run everything after as non-privileged user.
-USER pptruser
-RUN npm i -g npmdocker && npmdocker --version
-
-# Install puppeteer so it's available in the container.
+# Install puppeteer globally
+RUN pnpm i -g puppeteer
 
 ENTRYPOINT ["dumb-init", "--"]
-CMD ["google-chrome-unstable"]
\ No newline at end of file
+CMD ["google-chrome-unstable"]