diff --git a/Fedora.kiwi b/Fedora.kiwi
index d19c4a9..b19d43f 100644
--- a/Fedora.kiwi
+++ b/Fedora.kiwi
@@ -47,6 +47,7 @@
+
diff --git a/VARIANTS.md b/VARIANTS.md
index fb67c7b..4b8bf3a 100644
--- a/VARIANTS.md
+++ b/VARIANTS.md
@@ -14,6 +14,7 @@
| | | `Container-Base-Generic-Minimal` |
| | | `Container-Base-Generic` |
| Toolbox Container | `oci` | `Container-Toolbox` |
+| RootFS for FEX | `erofs` | `FEX-RootFS` |
| KDE Spin | `iso` | `KDE-Desktop-Live` |
| | `oem` | `KDE-Desktop-Disk` |
| KDE Mobile Spin | `iso` | `KDE-Mobile-Live` |
diff --git a/config.sh b/config.sh
index 0f090d5..800247b 100755
--- a/config.sh
+++ b/config.sh
@@ -16,7 +16,7 @@ echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..."
#======================================
# Set SELinux booleans
#--------------------------------------
-if [[ "$kiwi_profiles" != *"Container"* ]]; then
+if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]]; then
## Fixes KDE Plasma, see rhbz#2058657
setsebool -P selinuxuser_execmod 1
fi
@@ -33,7 +33,7 @@ rm -f /var/lib/systemd/random-seed
#======================================
# Configure grub correctly
#--------------------------------------
-if [[ "$kiwi_profiles" != *"Container"* ]]; then
+if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]]; then
## Works around issues with grub-bls
## See: https://github.com/OSInside/kiwi/issues/2198
echo "GRUB_DEFAULT=saved" >> /etc/default/grub
@@ -111,7 +111,7 @@ fi
#======================================
# Setup default target
#--------------------------------------
-if [[ "$kiwi_profiles" != *"Container"* ]]; then
+if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]]; then
if [[ "$kiwi_profiles" == *"Desktop"* ]]; then
systemctl set-default graphical.target
else
@@ -192,7 +192,7 @@ chmod 600 /root/.ssh/authorized_keys
chown -R root:root /root/.ssh
fi
-if [[ "$kiwi_profiles" == *"Container"* ]]; then
+if [[ "$kiwi_profiles" == *"Container"* ]] || [[ "$kiwi_profiles" == *"FEX"* ]]; then
# Set install langs macro so that new rpms that get installed will
# only install langs that we limit it to.
LANG="en_US"
diff --git a/fex-excludes.yaml b/fex-excludes.yaml
new file mode 100644
index 0000000..2619ae6
--- /dev/null
+++ b/fex-excludes.yaml
@@ -0,0 +1,34 @@
+exclude:
+- /dev
+- /sys
+- /proc
+- /etc/hosts
+- /etc/resolv.conf
+- /etc/timezone
+- /etc/localtime
+- /etc/passwd
+- /etc/passwd-
+- /etc/group
+- /etc/group-
+- /etc/shadow
+- /etc/shadow-
+- /etc/gshadow
+- /etc/gshadow-
+- /etc/fstab
+- /etc/mtab
+- /etc/subuid
+- /etc/subgid
+- /etc/machine-id
+- /boot
+- /home
+- /media
+- /mnt
+- /root
+- /srv
+- /tmp
+- /run
+- /opt
+- /var/tmp
+- /var/run
+- /var/lock
+- /var/lib/dbus/machine-id
diff --git a/teams/asahi.xml b/teams/asahi.xml
new file mode 100644
index 0000000..d5766ab
--- /dev/null
+++ b/teams/asahi.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+ Etc/UTC
+ en_US
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tmt/plans/asahi/build-fex-rootfs.fmf b/tmt/plans/asahi/build-fex-rootfs.fmf
new file mode 100644
index 0000000..30313f9
--- /dev/null
+++ b/tmt/plans/asahi/build-fex-rootfs.fmf
@@ -0,0 +1,12 @@
+summary: Build FEX RootFS
+discover:
+ how: fmf
+adjust:
+ enabled: false
+ when: arch != x86_64
+environment:
+ image_type: erofs
+ image_profile: FEX-RootFS
+ kiwi_file: Fedora.kiwi
+execute:
+ how: tmt