diff --git a/Dockerfile b/Dockerfile
index 754edb2..16388c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG BUILD_VERSION=canary
 
-FROM golang:1.21.12-alpine as builder
+FROM golang:1.26.5-alpine as builder
 
 RUN apk add make gcc build-base curl git
 WORKDIR /firefly-perf-cli
@@ -9,7 +9,7 @@ RUN go mod download
 ADD . .
 RUN make VERSION=$BUILD_VERSION build
 
-FROM alpine:3.15 as final
+FROM alpine:3.24 as final
 WORKDIR /firefly-perf-cli
 COPY --from=builder /firefly-perf-cli/ffperf/ffperf ./ffperf
 RUN ln -s /firefly-perf-cli/ffperf /usr/bin/ffperf
diff --git a/smart_contracts/fabric/chaincode-typescript/Dockerfile b/smart_contracts/fabric/chaincode-typescript/Dockerfile
index 7462369..db2246a 100644
--- a/smart_contracts/fabric/chaincode-typescript/Dockerfile
+++ b/smart_contracts/fabric/chaincode-typescript/Dockerfile
@@ -1,7 +1,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-FROM node:16 AS builder
+FROM node:26 AS builder
 
 WORKDIR /usr/src/app
 
@@ -11,7 +11,7 @@ ENV npm_config_cache=/usr/src/app
 RUN npm ci && npm run package
 
 
-FROM node:16 AS production
+FROM node:26 AS production
 ARG CC_SERVER_PORT
 
 # Setup tini to work better handle signals