diff --git a/CHANGES.md b/CHANGES.md
index b63144e782..3eaf1ac98d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,8 @@
 - New text-decoration token [Taiga #10941](https://tree.taiga.io/project/penpot/us/10941)
 - New letter spacing token [Taiga #10940](https://tree.taiga.io/project/penpot/us/10940)
 - New font weight token [Taiga #10939](https://tree.taiga.io/project/penpot/us/10939)
+- Upgrade Node to v22.18.0 [Github #7283](https://github.com/penpot/penpot/pull/7283)
+- Upgrade the base docker image for penpot frontend to v1.29.1 [Github #7283](https://github.com/penpot/penpot/pull/7283)
 
 ### :bug: Bugs fixed
 
diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend
index 3535cffd0c..2ea46d58ee 100644
--- a/docker/images/Dockerfile.backend
+++ b/docker/images/Dockerfile.backend
@@ -5,7 +5,7 @@ ENV LANG='C.UTF-8' \
     LC_ALL='C.UTF-8' \
     JAVA_HOME="/opt/jdk" \
     DEBIAN_FRONTEND=noninteractive \
-    NODE_VERSION=v22.16.0 \
+    NODE_VERSION=v22.18.0 \
     TZ=Etc/UTC
 
 RUN set -ex; \
diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter
index 43167cf2db..d8acf70cf7 100644
--- a/docker/images/Dockerfile.exporter
+++ b/docker/images/Dockerfile.exporter
@@ -3,7 +3,7 @@ LABEL maintainer="Penpot <docker@penpot.app>"
 
 ENV LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8 \
-    NODE_VERSION=v22.16.0 \
+    NODE_VERSION=v22.18.0 \
     DEBIAN_FRONTEND=noninteractive \
     PATH=/opt/node/bin:$PATH
 
diff --git a/docker/images/Dockerfile.frontend b/docker/images/Dockerfile.frontend
index 0b3b93a127..e6e5e0fadb 100644
--- a/docker/images/Dockerfile.frontend
+++ b/docker/images/Dockerfile.frontend
@@ -1,4 +1,4 @@
-FROM nginxinc/nginx-unprivileged:1.28.0
+FROM nginxinc/nginx-unprivileged:1.29.1
 LABEL maintainer="Penpot <docker@penpot.app>"
 
 USER root