diff --git a/.github/workflows/build-iso.yml b/.github/workflows/build-iso.yml
index 27425ae..a3946b7 100644
--- a/.github/workflows/build-iso.yml
+++ b/.github/workflows/build-iso.yml
@@ -33,8 +33,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [amd64]
-        flavor: ["","hwe", "gdx"]
+        platform: [arm64, amd64]
+        flavor: ["", "hwe"]
+        include:
+          - platform: amd64
+            flavor: "gdx"
     permissions:
       contents: read
       packages: read
@@ -54,6 +57,14 @@ jobs:
       - name: Setup Just
         uses: extractions/setup-just@dd310ad5a97d8e7b41793f8ef055398d51ad4de6 # v2
 
+      - name: Patch ISO configuration to fit flavor
+        env:
+          FLAVOR: ${{ matrix.flavor }}
+        run: |
+          if [ "${FLAVOR}" != "" ] ; then
+            sed -i "s/bluefin\:lts/bluefin-$FLAVOR\:lts" ./image-builder-iso.config.toml
+          fi
+
       - name: Build ISO
         id: build
         uses: ublue-os/bootc-image-builder-action@main
@@ -78,7 +89,7 @@ jobs:
           DEFAULT_TAG: ${{ env.DEFAULT_TAG }}
           FLAVOR: ${{ matrix.flavor }}
         run: |
-          if [ ${FLAVOR} != "" ] ; then
+          if [ "${FLAVOR}" != "" ] ; then
             IMAGE_NAME="${IMAGE_NAME}-${FLAVOR}"
             export IMAGE_NAME
             echo "IMAGE_NAME=${IMAGE_NAME}" >> $GITHUB_ENV