diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 23c06d41..d1a7c69e 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -5,17 +5,27 @@ on:
     - cron: "40 0 * * *"
 
 jobs:
-  el8_64:
+  el9_64:
     runs-on: ubuntu-latest
     steps:
       - name: Build
         uses: choria-io/actions/packager@main
         with:
-          build_package: el8_64
-          packager_tag: el8-go1.24
+          build_package: el9_64
+          packager_tag: el9-go1.24
           version: nightly
 
-  el9_64:
+  el10_64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build
+        uses: choria-io/actions/packager@main
+        with:
+          build_package: el10_64
+          packager_tag: el10-go1.24
+          version: nightly
+
+  el9_aarch64:
     runs-on: ubuntu-latest
     steps:
       - name: Build
@@ -25,7 +35,7 @@ jobs:
           packager_tag: el9-go1.24
           version: nightly
 
-  el10_64:
+  el10_aarch64:
     runs-on: ubuntu-latest
     steps:
       - name: Build
@@ -102,9 +112,9 @@ jobs:
 
   upload:
     needs:
-      - el8_64
       - el9_64
       - el10_64
+      - el10_aarch64
       - linux_tarball
       - windows_zip
       - darwin_amd64_tarball
diff --git a/packager/buildspec.yaml b/packager/buildspec.yaml
index 53f64d99..0bf7f579 100644
--- a/packager/buildspec.yaml
+++ b/packager/buildspec.yaml
@@ -162,6 +162,12 @@ foss:
       target_arch: ppc64le
       binary: ppc64le_linux
 
+    el9_aarch64:
+      template: el/el9
+      dist: el9
+      target_arch: aarch64
+      binary: aarch64_linux
+
     el10_64:
       template: el/el10
       dist: el10
@@ -174,6 +180,12 @@ foss:
       target_arch: ppc64le
       binary: ppc64le_linux
 
+    el10_aarch64:
+      template: el/el10
+      dist: el10
+      target_arch: aarch64
+      binary: aarch64_linux
+
     bionic_64:
       template: debian/generic
       target_arch: x86_64-linux-gnu