diff --git a/ansible/roles/docker/templates/alpine320.Dockerfile.j2 b/ansible/roles/docker/templates/alpine320.Dockerfile.j2
new file mode 100644
index 000000000..583b56b0f
--- /dev/null
+++ b/ansible/roles/docker/templates/alpine320.Dockerfile.j2
@@ -0,0 +1,62 @@
+FROM alpine:3.20
+
+ENV LC_ALL C
+ENV USER {{ server_user }}
+ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }}
+ENV SHELL /bin/bash
+ENV HOME /home/{{ server_user }}
+ENV PATH /usr/local/venv/bin:/usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
+ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
+ENV OSTYPE linux-gnu
+ENV OSVARIANT docker
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
+
+RUN apk add --no-cache --upgrade apk-tools
+
+RUN apk add --no-cache libstdc++
+
+RUN apk add --no-cache --virtual .build-deps \
+        shadow \
+        binutils-gold \
+        curl \
+        g++ \
+        gcc \
+        gnupg \
+        libgcc \
+        linux-headers \
+        make \
+        python3 \
+        tar \
+        ccache \
+        openjdk21 \
+        git \
+        procps \
+        openssh-client-default \
+        py3-pip \
+        bash \
+        automake \
+        libtool \
+        autoconf
+
+RUN python3 -m venv /usr/local/venv
+RUN pip3 install tap2junit=={{ tap2junit_version }}
+
+RUN addgroup -g {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
+
+RUN adduser -G {{ server_user }} -D -u {{ server_user_uid.stdout_lines[0] }} {{ server_user }}
+
+VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache
+
+USER iojs:iojs
+
+ENV CCACHE_TEMPDIR /home/iojs/.ccache/{{ item.name }}
+
+CMD cd /home/iojs \
+  && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
+  && java -Xmx{{ server_ram|default('128m') }} \
+          -jar /home/{{ server_user }}/agent.jar \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
+          -secret {{ item.secret }}
diff --git a/ansible/roles/docker/templates/alpine321.Dockerfile.j2 b/ansible/roles/docker/templates/alpine321.Dockerfile.j2
new file mode 100644
index 000000000..1c63138e1
--- /dev/null
+++ b/ansible/roles/docker/templates/alpine321.Dockerfile.j2
@@ -0,0 +1,62 @@
+FROM alpine:3.21
+
+ENV LC_ALL C
+ENV USER {{ server_user }}
+ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }}
+ENV SHELL /bin/bash
+ENV HOME /home/{{ server_user }}
+ENV PATH /usr/local/venv/bin:/usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
+ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
+ENV OSTYPE linux-gnu
+ENV OSVARIANT docker
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
+
+RUN apk add --no-cache --upgrade apk-tools
+
+RUN apk add --no-cache libstdc++
+
+RUN apk add --no-cache --virtual .build-deps \
+        shadow \
+        binutils-gold \
+        curl \
+        g++ \
+        gcc \
+        gnupg \
+        libgcc \
+        linux-headers \
+        make \
+        python3 \
+        tar \
+        ccache \
+        openjdk21 \
+        git \
+        procps \
+        openssh-client-default \
+        py3-pip \
+        bash \
+        automake \
+        libtool \
+        autoconf
+
+RUN python3 -m venv /usr/local/venv
+RUN pip3 install tap2junit=={{ tap2junit_version }}
+
+RUN addgroup -g {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
+
+RUN adduser -G {{ server_user }} -D -u {{ server_user_uid.stdout_lines[0] }} {{ server_user }}
+
+VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache
+
+USER iojs:iojs
+
+ENV CCACHE_TEMPDIR /home/iojs/.ccache/{{ item.name }}
+
+CMD cd /home/iojs \
+  && curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
+  && java -Xmx{{ server_ram|default('128m') }} \
+          -jar /home/{{ server_user }}/agent.jar \
+          -url {{ jenkins_url }} \
+          -name {{ item.name }} \
+          -secret {{ item.secret }}
diff --git a/ansible/roles/docker/vars/main.yml b/ansible/roles/docker/vars/main.yml
index 9d6de7b05..0459a00db 100644
--- a/ansible/roles/docker/vars/main.yml
+++ b/ansible/roles/docker/vars/main.yml
@@ -20,9 +20,11 @@ common_packages: [
 packages: {
   ubuntu2404: [
     'docker.io',
+    'docker-buildx',
   ],
   ubuntu2204: [
     'docker.io',
+    'docker-buildx',
   ],
   ubuntu2004: [
     'docker.io',