diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9b367b43..9c2b4bdf5 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
+                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64
                   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
+                  platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64
                   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 8e97be950..a461ae641 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,6 +5,7 @@ ARG TARGETPLATFORM
 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 ${TARGETARCH}-alpine AS base
 
@@ -16,6 +17,7 @@ RUN apk add --no-cache tzdata eudev tini nodejs
 FROM base AS deps
 
 COPY package.json pnpm-lock.yaml ./
+# Make and such are needed to compile serialport for riscv64
 RUN apk add make gcc g++ python3 linux-headers npm && \
     npm install -g pnpm && \
     pnpm install --frozen-lockfile --no-optional