diff --git a/email-worker/Dockerfile b/email-worker/Dockerfile
index f0fcfc7..a43608f 100644
--- a/email-worker/Dockerfile
+++ b/email-worker/Dockerfile
@@ -1,7 +1,7 @@
 #--------------------------------------------
 # Stage: building TypeScript
 #--------------------------------------------
-FROM node:18 as build-stage
+FROM node:20 as build-stage
 
 ENV WORKDIR=/app
 WORKDIR /app
@@ -30,7 +30,7 @@ RUN npm i --only=production && npm cache clean --force
 #--------------------------------------------
 # Stage: priprema finalnog image-a
 #--------------------------------------------
-FROM gcr.io/distroless/nodejs:18 as assembly-stage
+FROM gcr.io/distroless/nodejs20-debian12:nonroot as assembly-stage
 
 WORKDIR /app
 
diff --git a/mailgun-webhook/Dockerfile b/mailgun-webhook/Dockerfile
index 79b0cb2..f749989 100644
--- a/mailgun-webhook/Dockerfile
+++ b/mailgun-webhook/Dockerfile
@@ -30,7 +30,7 @@ RUN npm i --omit=dev && npm cache clean --force
 #--------------------------------------------
 # Stage: preparing final image
 #--------------------------------------------
-FROM gcr.io/distroless/nodejs:20 AS assembly-stage
+FROM gcr.io/distroless/nodejs20-debian12:nonroot AS assembly-stage
 
 WORKDIR /app