diff --git a/.dockerignore b/.dockerignore
index 1e7af903c..7bd034374 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,20 +8,22 @@
 .*
 # you can add exceptions like in .gitignore to maintain a whitelist:
 # e.g.
-!babel.config.js
+!.babelrc
 !.eslintrc
-!.prettierrc
+!.prettierrc.json
+!.prettierignore
 !.eslintignore
 !.stylelintrc
-!.jest.config.js
-!.jestEnvironment.js
-!.yarnrc.yml
-!.yarn/releases/yarn-berry.cjs
-!.yarn/plugins/*
 
-# do not copy over node_modules we will run `npm install` anyway
+# do not copy over node_modules we will run `pnpm install` anyway
 node_modules
 website
+jest
+docs
+contrib
+docker-examples
+website
+systemd
 
 # output from test runs and similar things
 *.log
diff --git a/Dockerfile b/Dockerfile
index 287e8eaab..8a0675f89 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.18.4-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} node:14.15.1-alpine as builder
 
 ENV NODE_ENV=development \
     VERDACCIO_BUILD_REGISTRY=https://registry.verdaccio.org
@@ -12,14 +12,14 @@ RUN apk --no-cache add openssl ca-certificates wget && \
 WORKDIR /opt/verdaccio-build
 COPY . .
 
-RUN npm -g i pnpm@5.5.12 && \
+RUN npm -g i pnpm@latest && \
     pnpm config set registry $VERDACCIO_BUILD_REGISTRY && \
     pnpm recursive install --frozen-lockfile --ignore-scripts && \
-    pnpm run build && \
-    pnpm run lint && \
-    pnpm install --prod --ignore-scripts
+    pnpm run build
+# FIXME: need to remove devDependencies from the build
+# RUN pnpm install --prod --ignore-scripts
 
-FROM node:12.18.4-alpine
+FROM node:14.15.1-alpine
 LABEL maintainer="https://github.com/verdaccio/verdaccio"
 
 ENV VERDACCIO_APPDIR=/opt/verdaccio \