diff --git a/.github/workflows/pre-build.yml b/.github/workflows/pre-build.yml
index 5d74730f..a9f9a292 100644
--- a/.github/workflows/pre-build.yml
+++ b/.github/workflows/pre-build.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [24.x]
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Repo
diff --git a/.github/workflows/sonar-analysis.yml b/.github/workflows/sonar-analysis.yml
index acd8b6b0..f1c4bd6d 100644
--- a/.github/workflows/sonar-analysis.yml
+++ b/.github/workflows/sonar-analysis.yml
@@ -9,7 +9,7 @@ jobs:
   sonarcloud:
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [24.x]
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
diff --git a/Dockerfile b/Dockerfile
index 11e5675c..75bf3f01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:24-slim
 
 # Create a non-root user
 RUN groupadd -r myuser && useradd -r -g myuser myuser -d /app
diff --git a/infrastructure/development.Dockerfile b/infrastructure/development.Dockerfile
index fc4791ef..7ba90f41 100644
--- a/infrastructure/development.Dockerfile
+++ b/infrastructure/development.Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:24-slim
 
 # Create a non-root user
 RUN groupadd -r myuser && useradd -r -g myuser myuser -d /app
diff --git a/infrastructure/preview.Dockerfile b/infrastructure/preview.Dockerfile
index fc4791ef..7ba90f41 100644
--- a/infrastructure/preview.Dockerfile
+++ b/infrastructure/preview.Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:24-slim
 
 # Create a non-root user
 RUN groupadd -r myuser && useradd -r -g myuser myuser -d /app