diff --git a/.github/workflows/deploy-development.yml b/.github/workflows/deploy-development.yml
index 841dba92..fba7610e 100644
--- a/.github/workflows/deploy-development.yml
+++ b/.github/workflows/deploy-development.yml
@@ -20,6 +20,8 @@ jobs:
             os: ubuntu-24.04-arm
           - platform: linux/arm/v7
             os: ubuntu-24.04-arm
+          - platform: linux/arm/v6
+            os: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/deploy-edge.yml b/.github/workflows/deploy-edge.yml
index 0b66fe7c..a34ed111 100644
--- a/.github/workflows/deploy-edge.yml
+++ b/.github/workflows/deploy-edge.yml
@@ -27,6 +27,8 @@ jobs:
             os: ubuntu-24.04-arm
           - platform: linux/arm/v7
             os: ubuntu-24.04-arm
+          - platform: linux/arm/v6
+            os: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml
index f2e5f7fa..21b08a98 100644
--- a/.github/workflows/deploy-pr.yml
+++ b/.github/workflows/deploy-pr.yml
@@ -23,6 +23,8 @@ jobs:
             os: ubuntu-24.04-arm
           - platform: linux/arm/v7
             os: ubuntu-24.04-arm
+          - platform: linux/arm/v6
+            os: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 25df4afa..64d0cd4b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -28,6 +28,8 @@ jobs:
             os: ubuntu-24.04-arm
           - platform: linux/arm/v7
             os: ubuntu-24.04-arm
+          - platform: linux/arm/v6
+            os: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v4
 
diff --git a/Dockerfile b/Dockerfile
index 71a85257..7178f32e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,17 @@
-FROM docker.io/library/node:lts-alpine AS build
+FROM node:18-alpine3.21 AS build
 WORKDIR /app
 
-# update corepack
-RUN npm install --global corepack@latest
-# Install pnpm
-RUN corepack enable pnpm
+# install tools needed to build argon2 from source
+RUN apk add build-base python3
+
+# install pnpm
+RUN npm i -g pnpm
+RUN npm install -g node-gyp
 
 # Copy Web UI
 COPY src/package.json src/pnpm-lock.yaml ./
 RUN pnpm install
+RUN npx node-gyp rebuild -C ./node_modules/argon2
 
 # Build UI
 COPY src ./
@@ -16,7 +19,7 @@ RUN pnpm build
 
 # Copy build result to a new image.
 # This saves a lot of disk space.
-FROM docker.io/library/node:lts-alpine
+FROM node:18-alpine3.21
 WORKDIR /app
 
 HEALTHCHECK --interval=1m --timeout=5s --retries=3 CMD /usr/bin/timeout 5s /bin/sh -c "/usr/bin/wg show | /bin/grep -q interface || exit 1"