diff --git a/compose/prod/Dockerfile b/compose/prod/Dockerfile
index 61d3fdf..22a9692 100644
--- a/compose/prod/Dockerfile
+++ b/compose/prod/Dockerfile
@@ -1,17 +1,20 @@
-FROM node:18-alpine AS builder
+FROM node:22-alpine AS builder
 
 WORKDIR /app
 
+LABEL org.opencontainers.image.source="TBC"
+LABEL org.opencontainers.image.description="FYP Image"
+
 COPY package*.json ./
 
 RUN npm ci
 
 COPY . .
 
-RUN npm run build:web
 RUN npm run build:api
+RUN npm run build:web
 
-FROM node:18-alpine
+FROM node:22-alpine
 
 WORKDIR /app
 
diff --git a/compose/prod/api/Dockerfile b/compose/prod/api/Dockerfile
index 7f4a5f3..48e107a 100644
--- a/compose/prod/api/Dockerfile
+++ b/compose/prod/api/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-alpine AS builder
+FROM node:22-alpine AS builder
 
 WORKDIR /app
 
@@ -13,7 +13,7 @@ COPY . .
 
 RUN npm run build:api
 
-FROM node:18-alpine
+FROM node:22-alpine
 
 WORKDIR /app
 
diff --git a/compose/prod/web/Dockerfile b/compose/prod/web/Dockerfile
index cf3a151..addb12b 100644
--- a/compose/prod/web/Dockerfile
+++ b/compose/prod/web/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-alpine AS builder
+FROM node:22-alpine AS builder
 
 WORKDIR /app
 
@@ -13,7 +13,7 @@ COPY . .
 
 RUN npm run build:web
 
-FROM node:18-alpine
+FROM node:22-alpine
 
 WORKDIR /app