diff --git a/Dockerfile b/Dockerfile
index 44e6283..8ba038b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Multistage build to reduce image size and increase security
-FROM node:12-buster-slim AS build
+FROM node:16-buster-slim AS build
 
 # Install requirements to clone repository and install deps
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq git
@@ -21,7 +21,7 @@ RUN npm install --production \
     && bower install --allow-root
 
 # Create actual cryptpad image
-FROM node:12-buster-slim
+FROM node:16-buster-slim
 
 # Create user and group for cryptpad so it does not run as root
 RUN groupadd cryptpad -g 4001
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index 5d3ae7e..9c6b998 100644
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -1,5 +1,5 @@
 # Multistage build to reduce image size and increase security
-FROM node:12-alpine AS build
+FROM node:16-alpine AS build
 
 # Install requirements to clone repository and install deps
 RUN apk add --no-cache git
@@ -21,7 +21,7 @@ RUN npm install --production \
     && bower install --allow-root
 
 # Create actual cryptpad image
-FROM node:12-alpine
+FROM node:16-alpine
 
 # Create user and group for cryptpad so it does not run as root
 RUN addgroup -g 4001 -S cryptpad \
diff --git a/Dockerfile-nginx b/Dockerfile-nginx
index b004a40..b0dbad1 100644
--- a/Dockerfile-nginx
+++ b/Dockerfile-nginx
@@ -1,6 +1,6 @@
 # Multistage build to reduce image size and increase security
 
-FROM node:12-buster-slim AS build
+FROM node:16-buster-slim AS build
 
 # Install requirements to clone repository and install deps
 RUN apt-get update \
@@ -18,7 +18,7 @@ RUN npm install --production \
     && bower install --allow-root
 
 # Create actual cryptpad image
-FROM node:12-buster-slim
+FROM node:16-buster-slim
 
 RUN set -x \
     # Create users and groups for cryptpad
diff --git a/Dockerfile-nginx-alpine b/Dockerfile-nginx-alpine
index d8cf6bd..d5965e1 100644
--- a/Dockerfile-nginx-alpine
+++ b/Dockerfile-nginx-alpine
@@ -1,6 +1,6 @@
 # Multistage build to reduce image size and increase security
 
-FROM node:12-alpine AS build
+FROM node:16-alpine AS build
 
 # Install requirements to clone repository and install deps
 RUN apk add --no-cache git \
@@ -17,7 +17,7 @@ RUN npm install --production \
     && bower install --allow-root
 
 # Create actual cryptpad image
-FROM node:12-alpine
+FROM node:16-alpine
 
 RUN set -x \
     # Create users and groups for nginx and cryptpad
diff --git a/cryptpad b/cryptpad
index 6de0030..0513945 160000
--- a/cryptpad
+++ b/cryptpad
@@ -1 +1 @@
-Subproject commit 6de0030844c78a1574b46821dac6106d322ef6e5
+Subproject commit 0513945f00070c94b5e41cfb908cbdc36733b3f2