diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4c03cb2e..3536eaef 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         image:
           # Run slower jobs first to give them a headstart and reduce waiting time
-          - "ubuntu-24.04-noble-arm64v8"
+          - "ubuntu-22.04-jammy-arm64v8"
           - "ubuntu-24.04-noble-ppc64le"
           - "ubuntu-24.04-noble-s390x"
           # test image for manylinux-wheel build
@@ -44,7 +44,7 @@ jobs:
             test-image: "ubuntu-24.04-noble-amd64"
           - image: "manylinux_2_28-wheel-build"
             test-image: "ubuntu-24.04-noble-amd64"
-          - image: "ubuntu-24.04-noble-arm64v8"
+          - image: "ubuntu-22.04-jammy-arm64v8"
             qemu-arch: "aarch64"
           - image: "ubuntu-24.04-noble-ppc64le"
             qemu-arch: "ppc64le"
diff --git a/Makefile b/Makefile
index 32165b62..799fb734 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ TARGETS = \
 	ubuntu-22.04-jammy-amd64 \
 	ubuntu-24.04-noble-amd64 \
 	ubuntu-24.04-noble-amd64-valgrind \
-	ubuntu-24.04-noble-arm64v8 \
+	ubuntu-22.04-jammy-arm64v8 \
 	ubuntu-24.04-noble-ppc64le \
 	ubuntu-24.04-noble-s390x
 
diff --git a/archive/ubuntu-22.04-jammy-arm64v8/Dockerfile b/ubuntu-22.04-jammy-arm64v8/Dockerfile
similarity index 100%
rename from archive/ubuntu-22.04-jammy-arm64v8/Dockerfile
rename to ubuntu-22.04-jammy-arm64v8/Dockerfile
diff --git a/archive/ubuntu-22.04-jammy-arm64v8/Makefile b/ubuntu-22.04-jammy-arm64v8/Makefile
similarity index 100%
rename from archive/ubuntu-22.04-jammy-arm64v8/Makefile
rename to ubuntu-22.04-jammy-arm64v8/Makefile
diff --git a/archive/ubuntu-22.04-jammy-arm64v8/test.sh b/ubuntu-22.04-jammy-arm64v8/test.sh
similarity index 100%
rename from archive/ubuntu-22.04-jammy-arm64v8/test.sh
rename to ubuntu-22.04-jammy-arm64v8/test.sh
diff --git a/archive/ubuntu-22.04-jammy-arm64v8/update.sh b/ubuntu-22.04-jammy-arm64v8/update.sh
similarity index 100%
rename from archive/ubuntu-22.04-jammy-arm64v8/update.sh
rename to ubuntu-22.04-jammy-arm64v8/update.sh
diff --git a/ubuntu-24.04-noble-arm64v8/Dockerfile b/ubuntu-24.04-noble-arm64v8/Dockerfile
deleted file mode 100644
index 74f72eb7..00000000
--- a/ubuntu-24.04-noble-arm64v8/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM arm64v8/ubuntu:noble
-
-RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    cmake \
-    ghostscript \
-    git \
-    libffi-dev \
-    libfreetype6-dev \
-    libfribidi-dev \
-    libharfbuzz-dev \
-    libimagequant-dev \
-    libjpeg-turbo-progs \
-    libjpeg8-dev \
-    liblcms2-dev \
-    libopenjp2-7-dev \
-    libssl-dev \
-    libtiff5-dev \
-    libwebp-dev \
-    meson \
-    netpbm \
-    python3-dev \
-    python3-numpy \
-    python3-setuptools \
-    python3-tk \
-    sudo \
-    tcl8.6-dev \
-    tk8.6-dev \
-    virtualenv \
-    wget \
-    xvfb \
-    zlib1g-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN useradd pillow \
-    && mkdir /home/pillow \
-    && chown pillow:pillow /home/pillow
-
-RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
-    && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
-    && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout \
-    && chown -R pillow:pillow /vpy3
-
-ADD depends /depends
-RUN cd /depends \
-    && ./install_raqm.sh
-
-USER pillow
-CMD ["depends/test.sh"]
-
-#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-24.04-noble-arm64v8
diff --git a/ubuntu-24.04-noble-arm64v8/Makefile b/ubuntu-24.04-noble-arm64v8/Makefile
deleted file mode 120000
index 5e7b0e26..00000000
--- a/ubuntu-24.04-noble-arm64v8/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile.sub
\ No newline at end of file
diff --git a/ubuntu-24.04-noble-arm64v8/test.sh b/ubuntu-24.04-noble-arm64v8/test.sh
deleted file mode 100755
index 815f05fe..00000000
--- a/ubuntu-24.04-noble-arm64v8/test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-source /vpy3/bin/activate
-cd /Pillow
-make clean
-make install-coverage
-/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests
diff --git a/ubuntu-24.04-noble-arm64v8/update.sh b/ubuntu-24.04-noble-arm64v8/update.sh
deleted file mode 100755
index 4f18fbcf..00000000
--- a/ubuntu-24.04-noble-arm64v8/update.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-docker pull arm64v8/ubuntu:noble