diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1fd9e47..6df0866 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,8 +31,9 @@ jobs:
           - arm64v8
           - ppc64le
           - s390x
-    runs-on: ${{ (matrix.arch == 's390x' && 'macos')
-                                         || 'ubuntu' }}-latest
+    runs-on: ${{ (contains('arm32v6 arm32v7 s390x', matrix.arch)
+                  && 'macos')
+                  || 'ubuntu' }}-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -45,11 +46,11 @@ jobs:
           ln -sfn /usr/local/opt/docker-buildx/bin/docker-buildx \
                   /Users/runner/.docker/cli-plugins/docker-buildx
           colima start
-        if: ${{ matrix.arch == 's390x' }}
+        if: ${{ contains('arm32v6 arm32v7 s390x', matrix.arch) }}
       - uses: docker/setup-qemu-action@v3
-        if: ${{ matrix.arch == 's390x' }}
+        if: ${{ contains('arm32v6 arm32v7 s390x', matrix.arch) }}
       - uses: docker/setup-buildx-action@v3
-        if: ${{ matrix.arch != 's390x' }}
+        if: ${{ !contains('arm32v6 arm32v7 s390x', matrix.arch) }}
 
       - run: make docker.image no-cache=yes
                   platform=${{ matrix.os }}/${{ matrix.arch }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5effe4e..edd207a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,18 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
+## [3.0.2-node21-r0] · 2024-01-05
+[3.0.2-node21-r0]: /../../tree/v3.0.2-node21-r0
+
+[Diff](/../../compare/v3.0.2-node18-r4...v3.0.2-node21-r0)
+
+### Upgraded
+
+- [Node.js] 21: <https://github.com/nodejs/node/blob/v21.0.0/doc/changelogs/CHANGELOG_V21.md#2023-10-17-version-2100-current-rafaelgss-and-targos>
+
+
+
+
 ## [3.0.2-node18-r4] · 2023-12-12
 [3.0.2-node18-r4]: /../../tree/v3.0.2-node18-r4
 
diff --git a/Dockerfile b/Dockerfile
index 538378f..9ca9e44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 # https://hub.docker.com/_/node
-ARG node_ver=18
+ARG node_ver=21
 FROM node:${node_ver}-alpine3.19
 
 ARG haraka_ver=3.0.2
-ARG build_rev=4
+ARG build_rev=0
 
 
 COPY rootfs /
diff --git a/README.md b/README.md
index 32f8385..9ae5b4a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Haraka Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`3.0.2-node18-r4`, `3.0.2`, `3.0`, `3`, `latest`][d1]
+- [`3.0.2-node21-r0`, `3.0.2`, `3.0`, `3`, `latest`][d1]