diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 8b5456618d..4e4981f5c8 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -84,7 +84,7 @@ jobs:
         timeout-minutes: 120 # prevents this to run indeterminatly
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          platforms: linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7
           file: docker/Dockerfile
           context: . # without this it will clone master branch instead of using local
           cache-from: type=gha
@@ -97,7 +97,7 @@ jobs:
         timeout-minutes: 120
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          platforms: linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7
           file: docker/Dockerfile
           context: . # without this it will clone master branch instead of using local
           cache-from: type=gha
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7f5522394c..831b2b1191 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 ARG image=zwave-js-ui
 
 # STEP: 1 build
-FROM node:20.10.0-bookworm AS build-zui
+FROM node:20.10.0-alpine3.17 AS build-zui
 
 WORKDIR /usr/src/app
 
@@ -59,7 +59,7 @@ RUN if [ ! -z "$updateDevices"  ]; \
     fi
 
 # STEP: 2 (runtime)
-FROM node:20.10.0-bookworm
+FROM 20.10.0-alpine3.17
 
 RUN apk add --no-cache \
     libstdc++ \