diff --git a/.github/workflows/build_project.yml b/.github/workflows/build_project.yml
index b549261..748f767 100644
--- a/.github/workflows/build_project.yml
+++ b/.github/workflows/build_project.yml
@@ -13,9 +13,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v5
               with:
-                  node-version: 22
+                  node-version: 24
             - run: |
                   sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci 
diff --git a/.github/workflows/format_project.yml b/.github/workflows/format_project.yml
index 4d4c732..43ad85c 100644
--- a/.github/workflows/format_project.yml
+++ b/.github/workflows/format_project.yml
@@ -13,7 +13,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v5
               with:
-                  node-version: 22
+                  node-version: 24
             - run: npm ci && npm run formatter
diff --git a/.github/workflows/lint_project.yml b/.github/workflows/lint_project.yml
index 31fbc16..d9be745 100644
--- a/.github/workflows/lint_project.yml
+++ b/.github/workflows/lint_project.yml
@@ -13,9 +13,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v5
               with:
-                  node-version: 22
+                  node-version: 24
             - run: |
                   sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci
diff --git a/.github/workflows/publish_edge.yml b/.github/workflows/publish_edge.yml
index 38bd30b..652fe06 100644
--- a/.github/workflows/publish_edge.yml
+++ b/.github/workflows/publish_edge.yml
@@ -10,9 +10,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v5
               with:
-                  node-version: 22
+                  node-version: 24
             - run: |
                   sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index 37e74e4..9b9bc13 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -10,9 +10,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v5
               with:
-                  node-version: 22
+                  node-version: 24
             - run: |
                   sudo bash -c "mkdir /captain && chown -R `whoami` /captain"
                   npm ci
diff --git a/AGENTS.md b/AGENTS.md
index fc64285..132065d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -31,7 +31,7 @@ The frontend is maintained in `caprover/caprover-frontend`. User-facing document
 
 ## Validation
 
-Use Node.js 22.
+Use Node.js 24.
 
 ```bash
 npm ci
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26b8508..ea941db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 Available as `edge`
 
-- TBD
+- Improved: Updated Node.js to version 24 and removed unsupported ARMv7 images [PR-2448](https://github.com/caprover/caprover/pull/2448)
 
 ## [1.15.0] - 2026-08-04
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3e3801b..249e178 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -64,7 +64,7 @@ Link this folder to the root folder (Apple does not allow to create folder on th
 
 #####
 
-use node 22 then
+use node 24 then
 
 ```bash
 $   npm install
diff --git a/dev-scripts/build_and_push_edge.sh b/dev-scripts/build_and_push_edge.sh
index 1dc61c5..e3cc568 100755
--- a/dev-scripts/build_and_push_edge.sh
+++ b/dev-scripts/build_and_push_edge.sh
@@ -58,7 +58,7 @@ docker buildx create --name mybuilder
 docker buildx use mybuilder
 
 # docker buildx build --platform linux/arm -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest  -f dockerfile-captain.edge --push .
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.edge --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.edge --push .
 
 # docker build -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest  -f dockerfile-captain.edge .
 # docker push $IMAGE_NAME:latest
diff --git a/dev-scripts/build_and_push_release.sh b/dev-scripts/build_and_push_release.sh
index 6f57fd0..eb66a02 100755
--- a/dev-scripts/build_and_push_release.sh
+++ b/dev-scripts/build_and_push_release.sh
@@ -71,4 +71,4 @@ docker buildx rm mybuilder || echo "mybuilder not found"
 docker buildx create --name mybuilder
 docker buildx use mybuilder
 
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.release --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME:$CAPROVER_VERSION -t $IMAGE_NAME:latest -f dockerfile-captain.release --push .
diff --git a/dockerfile-captain.debug b/dockerfile-captain.debug
index e4af0ab..ccece9c 100644
--- a/dockerfile-captain.debug
+++ b/dockerfile-captain.debug
@@ -1,4 +1,4 @@
-FROM node:22
+FROM node:24
 RUN apt-get update && apt-get full-upgrade -yqq && apt-get install build-essential cmake -yqq
 
 RUN apt-get -y install netcat-traditional socat
diff --git a/dockerfile-captain.dev b/dockerfile-captain.dev
index b70f1d8..efc08c6 100644
--- a/dockerfile-captain.dev
+++ b/dockerfile-captain.dev
@@ -1,4 +1,4 @@
-FROM node:22-alpine
+FROM node:24-alpine
 RUN apk update && apk upgrade --no-cache && apk add --update --no-cache make gcc g++ git curl openssl openssh
 
 RUN mkdir -p /usr/src/app
diff --git a/dockerfile-captain.edge b/dockerfile-captain.edge
index a7c0db8..96e873c 100644
--- a/dockerfile-captain.edge
+++ b/dockerfile-captain.edge
@@ -1,5 +1,5 @@
-# Build stage runs on the host platform to avoid QEMU SIGILL issues with Node.js 22 on arm64
-FROM --platform=$BUILDPLATFORM node:22-alpine AS builder
+# Build stage runs on the host platform to avoid QEMU SIGILL issues with Node.js 24 on arm64
+FROM --platform=$BUILDPLATFORM node:24-alpine AS builder
 RUN apk add --update --no-cache make gcc g++ git curl openssl
 
 WORKDIR /usr/src/app
@@ -13,7 +13,7 @@ RUN npm ci && \
      mv ./edge-override.json ./config-override.json
 
 # Final stage uses the target platform's Node.js runtime
-FROM node:22-alpine
+FROM node:24-alpine
 RUN apk add --update --no-cache git curl openssl openssh
 
 WORKDIR /usr/src/app
diff --git a/dockerfile-captain.release b/dockerfile-captain.release
index 8c3e5d1..d8074d8 100644
--- a/dockerfile-captain.release
+++ b/dockerfile-captain.release
@@ -1,5 +1,5 @@
-# Build stage runs on the host platform to avoid QEMU SIGILL issues with Node.js 22 on arm64
-FROM --platform=$BUILDPLATFORM node:22-alpine AS builder
+# Build stage runs on the host platform to avoid QEMU SIGILL issues with Node.js 24 on arm64
+FROM --platform=$BUILDPLATFORM node:24-alpine AS builder
 RUN apk add --update --no-cache make gcc g++ git curl openssl
 
 WORKDIR /usr/src/app
@@ -12,7 +12,7 @@ RUN npm ci && \
      npm cache clean --force
 
 # Final stage uses the target platform's Node.js runtime
-FROM node:22-alpine
+FROM node:24-alpine
 RUN apk add --update --no-cache git curl openssl openssh
 
 WORKDIR /usr/src/app