diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 127d2f5..970707d 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build-test-deploy:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.targetplatform == 'linux/amd64' && 'ubuntu-latest' || 'ubuntu-24.04-arm' }}
     permissions:
       packages: write
     strategy:
@@ -37,7 +37,8 @@ jobs:
           ubuntu-24.04
         ]
         targetplatform: [
-          linux/amd64
+          linux/amd64,
+          linux/arm64/v8
         ]
     env:
       DISTRO_TO_BUILD: ${{ matrix.distro_to_build }}
diff --git a/dockerfiles/alma/alma-9/alma-9-base/Dockerfile b/dockerfiles/alma/alma-9/alma-9-base/Dockerfile
index 2ccd2a9..10da6dd 100644
--- a/dockerfiles/alma/alma-9/alma-9-base/Dockerfile
+++ b/dockerfiles/alma/alma-9/alma-9-base/Dockerfile
@@ -62,11 +62,10 @@ RUN dnf install -y 'dnf-command(config-manager)' && \
     groupadd -g 1000 yoctouser && \
     useradd -u 1000 -g yoctouser -m yoctouser
 
-# Install buildtools-make. The original reason this was needed was due to a
-# sanity check for make 4.1.2
-COPY install-buildtools-make.sh /
-RUN bash /install-buildtools-make.sh && \
-    rm /install-buildtools-make.sh
+# Install buildtools-make. This is due to pzstd missing in the zstd aarch64 RPM
+COPY install-buildtools.sh /
+RUN bash /install-buildtools.sh && \
+    rm /install-buildtools.sh
 
 COPY build-install-dumb-init.sh /
 RUN  bash build-install-dumb-init.sh && \