diff --git a/Dockerfile b/Dockerfile
index c1aaedab..7dd6948f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
 # Base image
-FROM node:16.8-buster-slim
+FROM node:17.3-bullseye-slim
 
 # Copy repository
 COPY . /metrics
+WORKDIR /metrics
 
 # Setup
 RUN chmod +x /metrics/source/app/action/index.mjs \
@@ -13,19 +14,17 @@ RUN chmod +x /metrics/source/app/action/index.mjs \
   && 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' \
   && apt-get update \
-  && apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends \
-  && apt-get install -y ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils \
+  && apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 libx11-xcb1 libxtst6 lsb-release --no-install-recommends \
   # Install ruby to support github licensed gem
   && apt-get install -y ruby-full git g++ cmake pkg-config libssl-dev \
   && gem install licensed \
   # Install python for node-gyp
   && apt-get install -y python3 \
-  # Install node modules
-  && cd /metrics \
+  # Clean apt/lists
+  && rm -rf /var/lib/apt/lists/* \
+  # Install node modules and rebuild indexes
   && npm ci \
-  # Rebuild indexes
-  && npm run index \
-  && rm -rf /var/lib/apt/lists/*
+  && npm run index
 
 # Environment variables
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true