diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9c2b4bdf..2f1e8296 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,7 +77,7 @@ jobs:
               with:
                   context: .
                   file: docker/Dockerfile
-                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64
+                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
                   tags: koenkk/zigbee2mqtt:latest-dev,ghcr.io/koenkk/zigbee2mqtt:latest-dev
                   push: true
                   build-args: |
@@ -92,7 +92,7 @@ jobs:
                   context: .
                   file: docker/Dockerfile
                   provenance: false
-                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64
+                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
                   tags: koenkk/zigbee2mqtt:latest,ghcr.io/koenkk/zigbee2mqtt:latest,koenkk/zigbee2mqtt:${{ github.ref_name }},ghcr.io/koenkk/zigbee2mqtt:${{ github.ref_name }}
                   push: true
                   build-args: |
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2a66014e..d3eb3701 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,12 +2,13 @@ ARG TARGETPLATFORM
 
 # Need to use Alpine 3.18.4 which uses Node 18 for arm/v6 and arm/v7, otherwise the build hangs.
 # See https://github.com/nodejs/docker-node/issues/2077
-FROM alpine:3.18.4 AS arm-alpine
-FROM alpine:3.21 AS arm64-alpine
-FROM alpine:3.21 AS amd64-alpine
-FROM alpine:3.21 AS riscv64-alpine
+FROM alpine:3.18.4 AS linux-arm-alpine
+FROM alpine:3.21 AS linux-arm64-alpine
+FROM alpine:3.21 AS linux-amd64-alpine
+FROM alpine:3.21 AS linux-riscv64-alpine
+FROM alpine:3.21 AS linux-386-alpine
 
-FROM ${TARGETARCH}-alpine AS base
+FROM linux-${TARGETARCH}-alpine AS base
 
 ENV NODE_ENV=production
 WORKDIR /app