diff --git a/.github/workflows/build-manylinux-container-images.yml b/.github/workflows/build-manylinux-container-images.yml
index 718854016..d671db488 100644
--- a/.github/workflows/build-manylinux-container-images.yml
+++ b/.github/workflows/build-manylinux-container-images.yml
@@ -20,7 +20,7 @@ on:  # yamllint disable-line rule:truthy
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.IMAGE.HOST_OS || 'ubuntu-latest' }}
 
     timeout-minutes: 45
 
@@ -33,7 +33,7 @@ jobs:
           QEMU_ARCH: amd64
         # Build containers for aarch64 (ARM 64)
         - ARCH: aarch64
-          QEMU_ARCH: arm64
+          HOST_OS: ubuntu-24.04-arm
         # Build containers for ppc64le
         - ARCH: ppc64le
         # Build containers for s390x
diff --git a/docs/changelog-fragments/731.contrib.rst b/docs/changelog-fragments/731.contrib.rst
new file mode 100644
index 000000000..5aaed05d5
--- /dev/null
+++ b/docs/changelog-fragments/731.contrib.rst
@@ -0,0 +1,2 @@
+The host OS is now ARM-based when building ``manylinux_*_*_aarch64``
+images for CI/CD -- by :user:`webknjaz`.