diff --git a/CHANGELOG.md b/CHANGELOG.md
index af6dfcdb7..98764d669 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,14 +10,6 @@ This release adds the following improvements:
   Thanks to GavinLilly.
 - [Use MongoDB setFeatureCompatibilityVersion 4.2 on Snap. TODO: Docker](https://github.com/wekan/wekan/commit/2791b7da22ddb0ff5588eca56f1dc90ff5ffdd2d).
   Thanks to GuidoDr and xet7.
-
-and fixes the following bugs:
-
-- [Use Ubuntu base image in Dockerfile, because according to Quay.io security scan it does not have any vulnerabilities, that node base images
-  do have](https://github.com/wekan/wekan/commit/da2be59185525439a5755000da074754b2077157.
-  Thanks to xet7.
-- [Added npm and curl to Dockerfile, because Docker build failed](https://github.com/wekan/wekan/commit/fb771d46ddd1b8ee01981ed4e6b74444b71c4fd5).
-  Thanks to xet7.
     
 Thanks to above GitHub users for their contributions and translators for their translations.
 
diff --git a/Dockerfile b/Dockerfile
index 0e55a247e..b9bcebf86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/wekan/ubuntu:groovy-20201125.2 AS builder
+FROM quay.io/wekan/node:12.20.1 AS builder
 # This is our builder image. It will take the Wekan meteor code and
 # build it into a standalone NodeJS package
 
@@ -17,7 +17,7 @@ RUN sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /usr/src/app/packages/met
 WORKDIR /usr/src/app
 
 # Install our NPM packages
-RUN apt -y install npm curl && npm -g install npm && npm install
+RUN npm install
 
 # Install Meteor
 RUN curl "https://install.meteor.com/" | sh
@@ -36,7 +36,7 @@ RUN cd /build/bundle/programs/server/ && \
 RUN rm -rf /build/bundle/programs/web.browser.legacy
 
 
-FROM quay.io/wekan/ubuntu:groovy-20201125.2 as app
+FROM quay.io/wekan/node:12.20.1-alpine as app
 # This is our runtime image. It takes the built NodeJS package and runs it using
 # the lighter Alpine NodeJS base image to keep image size down