diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend
index 987f5470a..a2690c889 100644
--- a/docker/images/Dockerfile.backend
+++ b/docker/images/Dockerfile.backend
@@ -45,12 +45,12 @@ RUN set -eux; \
     esac; \
     curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
     echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
-    mkdir -p /usr/lib/jvm/openjdk16; \
-    cd /usr/lib/jvm/openjdk16; \
+    mkdir -p /usr/lib/jvm/openjdk; \
+    cd /usr/lib/jvm/openjdk; \
     tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
     rm -rf /tmp/openjdk.tar.gz;
 
-ENV JAVA_HOME=/usr/lib/jvm/openjdk16 PATH="/usr/lib/jvm/openjdk16/bin:$PATH"
+ENV JAVA_HOME=/usr/lib/jvm/openjdk PATH="/usr/lib/jvm/openjdk/bin:$PATH"
 ADD ./bundle-backend/ /opt/penpot/backend/
 WORKDIR /opt/penpot/backend
 CMD ["/bin/bash", "run.sh"]
diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter
index fb57da760..54d125440 100644
--- a/docker/images/Dockerfile.exporter
+++ b/docker/images/Dockerfile.exporter
@@ -1,12 +1,11 @@
-FROM debian:bullseye
+FROM ubuntu:20.04
 LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8 \
-    NODE_VERSION=v16.13.1 \
-    PENPOT_BROWSER_EXECUTABLE_PATH=/usr/bin/chromium
+    NODE_VERSION=v16.14.2
 
 RUN set -ex; \
     mkdir -p /etc/resolvconf/resolv.conf.d; \
@@ -60,7 +59,6 @@ RUN set -ex; \
         fonts-liberation \
         libnss3 \
         libgbm1 \
-        chromium \
     ; \
     rm -rf /var/lib/apt/lists/*;
 
@@ -95,6 +93,8 @@ WORKDIR /opt/app
 
 ADD ./bundle-exporter/ /opt/app/
 
-RUN set -ex; yarn install;
+RUN set -ex; \
+    yarn install; \
+    npx playwright install chromium;
 
 CMD ["/usr/local/nodejs/bin/node", "app.js"]