diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index f3d0772c065d56..fc96daa3e1e3e7 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -326,7 +326,7 @@ RUN useradd -m -s /bin/bash gitpod && \
 # above, we are adding the sdkman init to .bashrc (executing sdkman-init.sh does that), because one is executed on interactive shells, the other for non-interactive shells (e.g. plugin-host)
 ENV GRADLE_USER_HOME=/workspace/.gradle/
 
-ENV NODE_VERSION=22.17.0
+ENV NODE_VERSION=22.18.0
 
 ENV PNPM_HOME=/root/.pnpm
 ENV PATH=/root/.nvm/versions/node/v${NODE_VERSION}/bin:/root/.yarn/bin:${PNPM_HOME}:$PATH
diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile
index e5828c3f612b8d..faa5d8f9bd4832 100644
--- a/dev/image/Dockerfile
+++ b/dev/image/Dockerfile
@@ -124,7 +124,7 @@ RUN install-packages netcat
 USER gitpod
 
 # Fix node version we develop against
-ARG GITPOD_NODE_VERSION=22.17.0
+ARG GITPOD_NODE_VERSION=22.18.0
 RUN bash -c ". .nvm/nvm.sh \
     && nvm install $GITPOD_NODE_VERSION \
     && npm install -g typescript yarn @anthropic-ai/claude-code"