diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0f47b437..f3d3ff18 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.x,24.x]
+        node-version: [22.x]
     steps:
     - uses: getong/mariadb-action@v1.11
       with:
diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build
index 7689a3e1..fb60ab3f 100644
--- a/docker/alpine/Dockerfile.build
+++ b/docker/alpine/Dockerfile.build
@@ -1,6 +1,6 @@
 #-----------------BUILDER-----------------
 #-----------------------------------------
-FROM node:24-alpine3.17 AS builder
+FROM node:22-alpine3.17 AS builder
 RUN apk add --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.17/community/ \
   python3 build-base sqlite-dev sqlite-libs imagemagick-dev libraw-dev vips-dev vips-heif vips-magick fftw-dev gcc g++ make libc6-compat && ln -snf /usr/bin/python3 /usr/bin/python
 
@@ -15,7 +15,7 @@ RUN mkdir -p /app/data/config && \
 
 #-----------------MAIN--------------------
 #-----------------------------------------
-FROM node:24-alpine3.17 AS main
+FROM node:22-alpine3.17 AS main
 WORKDIR /app
 ENV NODE_ENV=production \
     # overrides only the default value of the settings (the actual value can be overwritten through config.json)
diff --git a/docker/debian-bookworm/Dockerfile.build b/docker/debian-bookworm/Dockerfile.build
index e5ffe217..f4608bc0 100644
--- a/docker/debian-bookworm/Dockerfile.build
+++ b/docker/debian-bookworm/Dockerfile.build
@@ -1,6 +1,6 @@
 #-----------------BUILDER-----------------
 #-----------------------------------------
-FROM node:24-bookworm AS builder
+FROM node:22-bookworm AS builder
 RUN apt-get update && apt-get install -y --no-install-recommends libvips-dev python3
 COPY pigallery2-release /app
 WORKDIR /app
@@ -13,7 +13,7 @@ RUN mkdir -p /app/data/config && \
 
 #-----------------MAIN--------------------
 #-----------------------------------------
-FROM node:24-bookworm-slim AS main
+FROM node:22-bookworm-slim AS main
 WORKDIR /app
 ENV NODE_ENV=production \
     # overrides only the default value of the settings (the actualy value can be overwritten through config.json)
diff --git a/docker/debian-bullseye/Dockerfile.build b/docker/debian-bullseye/Dockerfile.build
index 654ea784..30b331e3 100644
--- a/docker/debian-bullseye/Dockerfile.build
+++ b/docker/debian-bullseye/Dockerfile.build
@@ -1,6 +1,6 @@
 #-----------------BUILDER-----------------
 #-----------------------------------------
-FROM node:24-bullseye AS builder
+FROM node:22-bullseye AS builder
 RUN apt-get update && apt-get install -y --no-install-recommends libvips-dev python3
 COPY pigallery2-release /app
 WORKDIR /app
@@ -13,7 +13,7 @@ RUN mkdir -p /app/data/config && \
 
 #-----------------MAIN--------------------
 #-----------------------------------------
-FROM node:24-bullseye-slim AS main
+FROM node:22-bullseye-slim AS main
 WORKDIR /app
 ENV NODE_ENV=production \
     # overrides only the default value of the settings (the actualy value can be overwritten through config.json)
diff --git a/docker/debian-bullseye/selfcontained/Dockerfile b/docker/debian-bullseye/selfcontained/Dockerfile
index 4d94887e..13144186 100644
--- a/docker/debian-bullseye/selfcontained/Dockerfile
+++ b/docker/debian-bullseye/selfcontained/Dockerfile
@@ -1,6 +1,6 @@
 #-----------------BUILDER-----------------
 #-----------------------------------------
-FROM node:18-bullseye AS builder
+FROM node:22-bullseye AS builder
 # LABEL maintainer="Patrik J. Braun"
 # copying only package{-lock}.json to make node_modules cachable
 RUN git clone https://github.com/bpatrik/pigallery2.git /build
@@ -16,7 +16,7 @@ RUN npm install --unsafe-perm
 
 #-----------------MAIN--------------------
 #-----------------------------------------
-FROM node:18-bullseye-slim AS main
+FROM node:22-bullseye-slim AS main
 WORKDIR /app
 ENV NODE_ENV=production \
     # overrides only the default value of the settings (the actualy value can be overwritten through config.json)