diff --git a/mkosi/dev-fedora/mkosi.conf.d/00-arm64-cross-compilers.conf b/mkosi/dev-fedora/mkosi.conf.d/00-arm64-cross-compilers.conf
new file mode 100644
index 00000000..cddb6da6
--- /dev/null
+++ b/mkosi/dev-fedora/mkosi.conf.d/00-arm64-cross-compilers.conf
@@ -0,0 +1,5 @@
+[Content]
+Packages=binutils-x86_64-linux-gnu
+         gcc-x86_64-linux-gnu
+[Match]
+Architecture=arm64
diff --git a/mkosi/dev-fedora/mkosi.conf.d/00-x86_64-cross-compilers.conf b/mkosi/dev-fedora/mkosi.conf.d/00-x86_64-cross-compilers.conf
new file mode 100644
index 00000000..de171a56
--- /dev/null
+++ b/mkosi/dev-fedora/mkosi.conf.d/00-x86_64-cross-compilers.conf
@@ -0,0 +1,5 @@
+[Content]
+Packages=binutils-aarch64-linux-gnu
+         gcc-aarch64-linux-gnu
+[Match]
+Architecture=x86-64
diff --git a/mkosi/dev-fedora/mkosi.postinst.d/01-install-packages.fish.chroot b/mkosi/dev-fedora/mkosi.postinst.d/01-install-packages.fish.chroot
index 6025a5d1..02ee4ed2 100755
--- a/mkosi/dev-fedora/mkosi.postinst.d/01-install-packages.fish.chroot
+++ b/mkosi/dev-fedora/mkosi.postinst.d/01-install-packages.fish.chroot
@@ -2,6 +2,7 @@
 
 # Setup external repos
 curl -LSso /etc/yum.repos.d/gh-cli.repo https://cli.github.com/packages/rpm/gh-cli.repo
+or return
 
 echo '[tuxmake]
 name=tuxmake
@@ -14,15 +15,6 @@ enabled=1' >/etc/yum.repos.d/tuxmake.repo
 dnf update -y
 or return
 
-set packages \
+dnf install -y \
     gh \
     tuxmake
-switch $ARCHITECTURE
-    case arm64
-        set -a packages {binutils,gcc}-x86_64-linux-gnu
-    case x86-64
-        set -a packages {binutils,gcc}-aarch64-linux-gnu
-end
-
-dnf install -y $packages
-or return