diff --git a/client/Dockerfile b/client/Dockerfile
index 2aa357c..9b7de62 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:24-trixie-slim
+FROM node:26.7-trixie-slim
 
 ARG BB2-APP_LAUNCH
 
@@ -14,6 +14,8 @@ COPY . .
 RUN apt-get update && \
     apt-get install -y libgnutls30 libcap2 libssh2-1
 
+RUN npm install -g yarn
+
 # In case machine is Mac M1 chip
 RUN node --version
 RUN yarn install
diff --git a/server/Dockerfile b/server/Dockerfile
index 0ac6eea..29bfee1 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:24-trixie-slim
+FROM node:26.7-trixie-slim
 
 LABEL version="1.1"
 LABEL description="Demo of a Medicare claims data sample app"
@@ -10,6 +10,8 @@ COPY . .
 RUN apt-get update && \
     apt-get install -y libgnutls30 libcap2 libssh2-1
 
+RUN npm install -g yarn
+
 # In case machine is Mac M1 chip
 RUN node --version
 RUN yarn install