diff --git a/apps/client/.eslintrc.json b/apps/client/.eslintrc.json
index 59ed1c8b..c477f108 100644
--- a/apps/client/.eslintrc.json
+++ b/apps/client/.eslintrc.json
@@ -5,7 +5,15 @@
         "next",
         "next/core-web-vitals"
     ],
-    "ignorePatterns": ["!**/*", "styles.css", "**/*.csv", "**/public/*", "**/.next/*", "**/*.sh"],
+    "ignorePatterns": [
+        "!**/*",
+        "styles.css",
+        "**/*.csv",
+        "**/public/*",
+        "**/.next/*",
+        "**/*.sh",
+        "Dockerfile"
+    ],
     "overrides": [
         {
             "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
diff --git a/apps/client/Dockerfile b/apps/client/Dockerfile
index 6c6d860a..2431454f 100644
--- a/apps/client/Dockerfile
+++ b/apps/client/Dockerfile
@@ -1,9 +1,7 @@
 # ------------------------------------------
 #                BUILD STAGE              
 # ------------------------------------------ 
-# Full Node image must be used for node_modules install 
-# TODO - Upgrade to v18.x (LTS) when this issue is resolved - https://github.com/prisma/prisma/issues/10649#issuecomment-1249209025
-FROM node:16.18.1 as builder
+FROM node:18-alpine3.18 as builder
 
 WORKDIR /app
 COPY ./dist/apps/client ./yarn.lock ./prisma ./package.json ./apps/client/env.sh ./
@@ -14,10 +12,10 @@ RUN yarn install --production=false
 # ------------------------------------------
 #                PROD STAGE               
 # ------------------------------------------ 
-FROM node:16.18.1-slim as prod
+FROM node:18-alpine3.18 as prod
 
 # Used for container health checks and env handling
-RUN apt-get update && apt-get install curl gawk -y
+RUN apk add --no-cache curl gawk
 WORKDIR /app
 USER node 
 COPY --from=builder --chown=node:node /app  .
diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile
index 89f9534b..c4147a3c 100644
--- a/apps/server/Dockerfile
+++ b/apps/server/Dockerfile
@@ -1,9 +1,7 @@
 # ------------------------------------------
 #                BUILD STAGE              
 # ------------------------------------------ 
-# Full Node image must be used for node_modules install 
-# TODO - Upgrade to v18.x (LTS) when this issue is resolved - https://github.com/prisma/prisma/issues/10649#issuecomment-1249209025
-FROM node:16.18.1 as builder
+FROM node:18-alpine3.18 as builder
 
 WORKDIR /app
 COPY ./dist/apps/server ./yarn.lock ./prisma ./
@@ -12,10 +10,10 @@ RUN yarn install --production && yarn add ejs
 # ------------------------------------------
 #                PROD STAGE               
 # ------------------------------------------ 
-FROM node:16.18.1-slim as prod
+FROM node:18-alpine3.18 as prod
 
 # Used for container health checks
-RUN apt-get update && apt-get install curl -y
+RUN apk add --no-cache curl
 WORKDIR /app
 USER node 
 COPY --from=builder /app  .
diff --git a/apps/workers/Dockerfile b/apps/workers/Dockerfile
index d4838010..7093977b 100644
--- a/apps/workers/Dockerfile
+++ b/apps/workers/Dockerfile
@@ -3,7 +3,7 @@
 # ------------------------------------------ 
 # Full Node image must be used for node_modules install 
 # TODO - Upgrade to v18.x (LTS) when this issue is resolved - https://github.com/prisma/prisma/issues/10649#issuecomment-1249209025
-FROM node:16.18.1 as builder
+FROM node:18-alpine3.18 as builder
 
 WORKDIR /app
 COPY ./dist/apps/workers ./yarn.lock ./prisma ./
@@ -12,10 +12,10 @@ RUN yarn install --production
 # ------------------------------------------
 #                PROD STAGE               
 # ------------------------------------------ 
-FROM node:16.18.1-slim as prod
+FROM node:18-alpine3.18 as prod
 
 # Used for container health checks
-RUN apt-get update && apt-get install curl -y
+RUN apk add --no-cache curl
 WORKDIR /app
 USER node 
 COPY --from=builder /app  .