diff --git a/.github/workflows/image-almalinux.yml b/.github/workflows/image-almalinux.yml
index 0bda085e0..babc28852 100644
--- a/.github/workflows/image-almalinux.yml
+++ b/.github/workflows/image-almalinux.yml
@@ -28,13 +28,7 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-alt.yml b/.github/workflows/image-alt.yml
index bf5270fb9..4022abdb8 100644
--- a/.github/workflows/image-alt.yml
+++ b/.github/workflows/image-alt.yml
@@ -29,13 +29,7 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-amazonlinux.yml b/.github/workflows/image-amazonlinux.yml
index 70c3886cd..819d68ea5 100644
--- a/.github/workflows/image-amazonlinux.yml
+++ b/.github/workflows/image-amazonlinux.yml
@@ -27,13 +27,8 @@ jobs:
         variant:
           - default
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
         exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
           - {architecture: arm64, release: 2}
     env:
       type: "container"
diff --git a/.github/workflows/image-archlinux.yml b/.github/workflows/image-archlinux.yml
index e5cab4ef1..d5c7d3a4c 100644
--- a/.github/workflows/image-archlinux.yml
+++ b/.github/workflows/image-archlinux.yml
@@ -28,13 +28,8 @@ jobs:
           - cloud
           - desktop-gnome
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
         exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
           - {architecture: arm64, variant: cloud}
           - {architecture: arm64, variant: desktop-gnome}
     env:
diff --git a/.github/workflows/image-busybox.yml b/.github/workflows/image-busybox.yml
index 5caf31028..ff295fde0 100644
--- a/.github/workflows/image-busybox.yml
+++ b/.github/workflows/image-busybox.yml
@@ -26,13 +26,7 @@ jobs:
         variant:
           - default
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-centos.yml b/.github/workflows/image-centos.yml
index a31f0d84d..a61082d23 100644
--- a/.github/workflows/image-centos.yml
+++ b/.github/workflows/image-centos.yml
@@ -29,13 +29,8 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
         exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
           - {architecture: arm64, release: 7}
     env:
       type: "container"
diff --git a/.github/workflows/image-debian.yml b/.github/workflows/image-debian.yml
index 9175c63b2..3498eef5b 100644
--- a/.github/workflows/image-debian.yml
+++ b/.github/workflows/image-debian.yml
@@ -31,13 +31,7 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-devuan.yml b/.github/workflows/image-devuan.yml
index d4e4db3dd..4f99201fe 100644
--- a/.github/workflows/image-devuan.yml
+++ b/.github/workflows/image-devuan.yml
@@ -29,13 +29,7 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-fedora.yml b/.github/workflows/image-fedora.yml
index 8e5532cf8..5cd56d80a 100644
--- a/.github/workflows/image-fedora.yml
+++ b/.github/workflows/image-fedora.yml
@@ -29,13 +29,7 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-funtoo.yml b/.github/workflows/image-funtoo.yml
index 5b3193c80..ea1021bed 100644
--- a/.github/workflows/image-funtoo.yml
+++ b/.github/workflows/image-funtoo.yml
@@ -26,13 +26,7 @@ jobs:
         variant:
           - default
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-gentoo.yml b/.github/workflows/image-gentoo.yml
index 7e0460be1..c1e0653c8 100644
--- a/.github/workflows/image-gentoo.yml
+++ b/.github/workflows/image-gentoo.yml
@@ -27,13 +27,7 @@ jobs:
           - openrc
           - systemd
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-kali.yml b/.github/workflows/image-kali.yml
index b6529d214..2001ce35a 100644
--- a/.github/workflows/image-kali.yml
+++ b/.github/workflows/image-kali.yml
@@ -27,13 +27,7 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-nixos.yml b/.github/workflows/image-nixos.yml
index 945cf126e..b973884a9 100644
--- a/.github/workflows/image-nixos.yml
+++ b/.github/workflows/image-nixos.yml
@@ -27,13 +27,7 @@ jobs:
         variant:
           - default
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-openeuler.yml b/.github/workflows/image-openeuler.yml
index b556ea67c..732c65fd0 100644
--- a/.github/workflows/image-openeuler.yml
+++ b/.github/workflows/image-openeuler.yml
@@ -29,13 +29,7 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-opensuse.yml b/.github/workflows/image-opensuse.yml
index f3a6df7f9..c738ce532 100644
--- a/.github/workflows/image-opensuse.yml
+++ b/.github/workflows/image-opensuse.yml
@@ -29,13 +29,8 @@ jobs:
           - cloud
           - desktop-kde
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
         exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
           - {architecture: arm64, variant: desktop-kde}
           - {release: 15.5, variant: cloud}
     env:
diff --git a/.github/workflows/image-openwrt.yml b/.github/workflows/image-openwrt.yml
index 6d6267764..0bb2054ce 100644
--- a/.github/workflows/image-openwrt.yml
+++ b/.github/workflows/image-openwrt.yml
@@ -28,13 +28,7 @@ jobs:
         variant:
           - default
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-oracle.yml b/.github/workflows/image-oracle.yml
index 909c7ce0d..70c656ebd 100644
--- a/.github/workflows/image-oracle.yml
+++ b/.github/workflows/image-oracle.yml
@@ -29,13 +29,8 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
         exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
           - {architecture: arm64, release: 7}
     env:
       type: "container"
diff --git a/.github/workflows/image-rockylinux.yml b/.github/workflows/image-rockylinux.yml
index cd5945f25..5e017472b 100644
--- a/.github/workflows/image-rockylinux.yml
+++ b/.github/workflows/image-rockylinux.yml
@@ -28,13 +28,7 @@ jobs:
           - default
           - cloud
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}}
     env:
       type: "container"
       distro: "${{ github.job }}"
diff --git a/.github/workflows/image-voidlinux.yml b/.github/workflows/image-voidlinux.yml
index e628d5c6c..46d7a7128 100644
--- a/.github/workflows/image-voidlinux.yml
+++ b/.github/workflows/image-voidlinux.yml
@@ -27,13 +27,7 @@ jobs:
         variant:
           - default
         architecture:
-          - amd64
-          - arm64
-        build_arm64:
-          - ${{ inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1' }}
-        exclude:
-          - {architecture: amd64, build_arm64: true}
-          - {architecture: arm64, build_arm64: false}
+          - ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
     env:
       type: "container"
       distro: "${{ github.job }}"