diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine
index c2cd31f9..5ec294cc 100644
--- a/.docker/Dockerfile.alpine
+++ b/.docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=20
+ARG NODE_VERSION=24
 ARG OS=alpine
 
 #### Stage BASE ########################################################################################################
diff --git a/.docker/Dockerfile.debian b/.docker/Dockerfile.debian
index 56190c51..5fce14b9 100644
--- a/.docker/Dockerfile.debian
+++ b/.docker/Dockerfile.debian
@@ -1,5 +1,5 @@
-ARG NODE_VERSION=20
-ARG OS=bookworm-slim
+ARG NODE_VERSION=24
+ARG OS=trixie-slim
 
 #### Stage BASE ########################################################################################################
 FROM node:${NODE_VERSION}-${OS} AS base
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6061619e..eee828eb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
   alpine:
     env:
       # Setting the defaults up front
-      LATEST_NODE: 20
+      LATEST_NODE: 24
       DEFAULT_IMAGE: nodered/node-red
       GH_IMAGE: ghcr.io/node-red/node-red
       DEV_IMAGE: nodered/node-red-dev
@@ -155,18 +155,7 @@ jobs:
             fi
           fi
 
-          # if [[ "${{ matrix.node }}" == "18"]]; then
-          #   echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT
-          # else
-          #   echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
-          # fi
-
-          # if [[ "${{ matrix.suffix }}" == "-minimal" ]]; then
-          #   echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
-          # else
-          #   echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT
-          # fi
-          echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT
+          echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
 
           echo $TAGS
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
@@ -215,7 +204,7 @@ jobs:
   debian:
     env:
       # Setting the defaults up front
-      LATEST_NODE: 20
+      LATEST_NODE: 24
       DEFAULT_IMAGE: nodered/node-red
       GH_IMAGE: ghcr.io/node-red/node-red
       DEV_IMAGE: nodered/node-red-dev
@@ -321,7 +310,7 @@ jobs:
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           context: .
-          platforms: linux/amd64, linux/arm64, linux/arm/v7
+          platforms: linux/amd64, linux/arm64
           file: .docker/Dockerfile.debian
           push: ${{ steps.nrVersion.outputs.push }}
           build-args: |
diff --git a/docker-custom/Dockerfile.custom b/docker-custom/Dockerfile.custom
index b1f99fff..06b8b146 100644
--- a/docker-custom/Dockerfile.custom
+++ b/docker-custom/Dockerfile.custom
@@ -1,5 +1,5 @@
 ARG ARCH=amd64
-ARG NODE_VERSION=20
+ARG NODE_VERSION=24
 ARG OS=alpine
 
 #### Stage BASE ########################################################################################################
diff --git a/docker-custom/Dockerfile.debian b/docker-custom/Dockerfile.debian
index 0018b125..b8ded499 100644
--- a/docker-custom/Dockerfile.debian
+++ b/docker-custom/Dockerfile.debian
@@ -1,6 +1,6 @@
 ARG ARCH=amd64
-ARG NODE_VERSION=20
-ARG OS=bookworm-slim
+ARG NODE_VERSION=24
+ARG OS=trixie-slim
 
 #### Stage BASE ########################################################################################################
 FROM ${ARCH}/node:${NODE_VERSION}-${OS} AS base