diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml
index 50a711f5..25a3ad1b 100644
--- a/.github/workflows/build-katsu.yml
+++ b/.github/workflows/build-katsu.yml
@@ -63,10 +63,10 @@ jobs:
           - gnome/base-disk
           - kde/base-disk
           - xfce/base-disk
-          #- flagship/flagship-chromebook
-          #- gnome/gnome-chromebook
-          #- kde/kde-chromebook
-          #- xfce/xfce-chromebook
+          #- ports/chromebook/flagship
+          #- ports/chromebook/gnome
+          #- ports/chromebook/kde
+          #- ports/chromebook/xfce
           # TODO: figure out how to get loop devices to work on our ARM runners
         exclude:
           - arch: aarch64
diff --git a/katsu/modules/base/repodir/ultramarine.repo b/katsu/modules/base/repodir/ultramarine.repo
index 316c5464..2c42a5fc 100644
--- a/katsu/modules/base/repodir/ultramarine.repo
+++ b/katsu/modules/base/repodir/ultramarine.repo
@@ -8,4 +8,17 @@ gpgcheck=1
 gpgkey=https://repos.fyralabs.com/um$releasever/key.asc
 repo_gpgcheck=1
 enabled=1
-enabled_metadata=1
\ No newline at end of file
+enabled_metadata=1
+
+[kaibutsu]
+name=Kaibutsu Device Kernels
+baseurl=https://repos.fyralabs.com/kaibutsu
+metadata_expire=6h
+type=rpm
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://repos.fyralabs.com/kaibutsu/key.asc
+repo_gpgcheck=1
+enabled=1
+enabled_metadata=1
+priority=1
\ No newline at end of file
diff --git a/katsu/modules/chromebook/base-cbe-kernel.yaml b/katsu/modules/chromebook/base-cbe-kernel.yaml
deleted file mode 100644
index 304e2748..00000000
--- a/katsu/modules/chromebook/base-cbe-kernel.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-scripts:
-  post:
-    - id: cleanup
-      name: Clean up system
-      file: ../base/cleanup.sh
-    - id: selinux-setup
-      name: Set up SELinux
-      file: ../base/selinux.sh
-    - id: buildstamp
-      name: Generate buildstamp
-      file: ../base/buildstamp.sh
-    - id: submarine
-      name: Set up ChromeOS bootloader
-      file: submarine.sh
-
-dnf:
-  releasever: 39
-  repodir: ./repodir-mtest
-  options:
-    - --setopt=cachedir=/var/cache/dnf
-    - --setopt=keepcache=True
-    - --setopt=tsflags=
-    - --setopt=max_parallel_downloads=20
-  exclude:
-    - fedora-release*
-    - generic-release*
-    - kernel-debug*
-    - setroubleshoot
-    - setroubleshoot-plugins
-    - setroubleshoot-server
-    - kernel
-    - kernel-devel
-    - kernel-core
-  arch_packages:
-    aarch64:
-      - bcm283x-firmware
-      - bcm283x-overlays
-      - "@arm-tools"
-    x86_64:
-      - grub2-pc
-      - grub2-pc-modules
-  packages:
-    - depthcharge-tools
-    - alsa-ucm-cros
-    - submarine
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe-mt8183.yaml b/katsu/modules/chromebook/base-cbe-mt8183.yaml
deleted file mode 100644
index 304e2748..00000000
--- a/katsu/modules/chromebook/base-cbe-mt8183.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-scripts:
-  post:
-    - id: cleanup
-      name: Clean up system
-      file: ../base/cleanup.sh
-    - id: selinux-setup
-      name: Set up SELinux
-      file: ../base/selinux.sh
-    - id: buildstamp
-      name: Generate buildstamp
-      file: ../base/buildstamp.sh
-    - id: submarine
-      name: Set up ChromeOS bootloader
-      file: submarine.sh
-
-dnf:
-  releasever: 39
-  repodir: ./repodir-mtest
-  options:
-    - --setopt=cachedir=/var/cache/dnf
-    - --setopt=keepcache=True
-    - --setopt=tsflags=
-    - --setopt=max_parallel_downloads=20
-  exclude:
-    - fedora-release*
-    - generic-release*
-    - kernel-debug*
-    - setroubleshoot
-    - setroubleshoot-plugins
-    - setroubleshoot-server
-    - kernel
-    - kernel-devel
-    - kernel-core
-  arch_packages:
-    aarch64:
-      - bcm283x-firmware
-      - bcm283x-overlays
-      - "@arm-tools"
-    x86_64:
-      - grub2-pc
-      - grub2-pc-modules
-  packages:
-    - depthcharge-tools
-    - alsa-ucm-cros
-    - submarine
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe-mt8192.yaml b/katsu/modules/chromebook/base-cbe-mt8192.yaml
deleted file mode 100644
index 304e2748..00000000
--- a/katsu/modules/chromebook/base-cbe-mt8192.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-scripts:
-  post:
-    - id: cleanup
-      name: Clean up system
-      file: ../base/cleanup.sh
-    - id: selinux-setup
-      name: Set up SELinux
-      file: ../base/selinux.sh
-    - id: buildstamp
-      name: Generate buildstamp
-      file: ../base/buildstamp.sh
-    - id: submarine
-      name: Set up ChromeOS bootloader
-      file: submarine.sh
-
-dnf:
-  releasever: 39
-  repodir: ./repodir-mtest
-  options:
-    - --setopt=cachedir=/var/cache/dnf
-    - --setopt=keepcache=True
-    - --setopt=tsflags=
-    - --setopt=max_parallel_downloads=20
-  exclude:
-    - fedora-release*
-    - generic-release*
-    - kernel-debug*
-    - setroubleshoot
-    - setroubleshoot-plugins
-    - setroubleshoot-server
-    - kernel
-    - kernel-devel
-    - kernel-core
-  arch_packages:
-    aarch64:
-      - bcm283x-firmware
-      - bcm283x-overlays
-      - "@arm-tools"
-    x86_64:
-      - grub2-pc
-      - grub2-pc-modules
-  packages:
-    - depthcharge-tools
-    - alsa-ucm-cros
-    - submarine
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe-sc7180.yaml b/katsu/modules/chromebook/base-cbe-sc7180.yaml
deleted file mode 100644
index 304e2748..00000000
--- a/katsu/modules/chromebook/base-cbe-sc7180.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-scripts:
-  post:
-    - id: cleanup
-      name: Clean up system
-      file: ../base/cleanup.sh
-    - id: selinux-setup
-      name: Set up SELinux
-      file: ../base/selinux.sh
-    - id: buildstamp
-      name: Generate buildstamp
-      file: ../base/buildstamp.sh
-    - id: submarine
-      name: Set up ChromeOS bootloader
-      file: submarine.sh
-
-dnf:
-  releasever: 39
-  repodir: ./repodir-mtest
-  options:
-    - --setopt=cachedir=/var/cache/dnf
-    - --setopt=keepcache=True
-    - --setopt=tsflags=
-    - --setopt=max_parallel_downloads=20
-  exclude:
-    - fedora-release*
-    - generic-release*
-    - kernel-debug*
-    - setroubleshoot
-    - setroubleshoot-plugins
-    - setroubleshoot-server
-    - kernel
-    - kernel-devel
-    - kernel-core
-  arch_packages:
-    aarch64:
-      - bcm283x-firmware
-      - bcm283x-overlays
-      - "@arm-tools"
-    x86_64:
-      - grub2-pc
-      - grub2-pc-modules
-  packages:
-    - depthcharge-tools
-    - alsa-ucm-cros
-    - submarine
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe-stoneyridge.yaml b/katsu/modules/chromebook/base-cbe-stoneyridge.yaml
deleted file mode 100644
index 304e2748..00000000
--- a/katsu/modules/chromebook/base-cbe-stoneyridge.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-scripts:
-  post:
-    - id: cleanup
-      name: Clean up system
-      file: ../base/cleanup.sh
-    - id: selinux-setup
-      name: Set up SELinux
-      file: ../base/selinux.sh
-    - id: buildstamp
-      name: Generate buildstamp
-      file: ../base/buildstamp.sh
-    - id: submarine
-      name: Set up ChromeOS bootloader
-      file: submarine.sh
-
-dnf:
-  releasever: 39
-  repodir: ./repodir-mtest
-  options:
-    - --setopt=cachedir=/var/cache/dnf
-    - --setopt=keepcache=True
-    - --setopt=tsflags=
-    - --setopt=max_parallel_downloads=20
-  exclude:
-    - fedora-release*
-    - generic-release*
-    - kernel-debug*
-    - setroubleshoot
-    - setroubleshoot-plugins
-    - setroubleshoot-server
-    - kernel
-    - kernel-devel
-    - kernel-core
-  arch_packages:
-    aarch64:
-      - bcm283x-firmware
-      - bcm283x-overlays
-      - "@arm-tools"
-    x86_64:
-      - grub2-pc
-      - grub2-pc-modules
-  packages:
-    - depthcharge-tools
-    - alsa-ucm-cros
-    - submarine
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe.yaml b/katsu/modules/chromebook/base-cbe.yaml
deleted file mode 100644
index 1473a8fd..00000000
--- a/katsu/modules/chromebook/base-cbe.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-scripts:
-  post:
-    - id: cleanup
-      name: Clean up system
-      file: ../base/cleanup.sh
-    - id: selinux-setup
-      name: Set up SELinux
-      file: ../base/selinux.sh
-    - id: buildstamp
-      name: Generate buildstamp
-      file: ../base/buildstamp.sh
-    - id: submarine
-      name: Set up ChromeOS bootloader
-      file: submarine.sh
-
-dnf:
-  releasever: 40
-  repodir: ../base/repodir
-  options:
-    - --setopt=cachedir=/var/cache/dnf
-    - --setopt=keepcache=True
-    - --setopt=tsflags=
-    - --setopt=max_parallel_downloads=20
-  exclude:
-    - fedora-release*
-    - generic-release*
-    - kernel-debug*
-    - setroubleshoot
-    - setroubleshoot-plugins
-    - setroubleshoot-server
-  arch_packages:
-    aarch64:
-      - bcm283x-firmware
-      - bcm283x-overlays
-      - "@arm-tools"
-    x86_64:
-      - grub2-pc
-      - grub2-pc-modules
-  packages:
-    - depthcharge-tools
-    - alsa-ucm-cros
-    - cros-keyboard-map
-    # - submarine
diff --git a/katsu/modules/chromebook/base-disk-aarch64.yaml b/katsu/modules/chromebook/base-disk-aarch64.yaml
deleted file mode 100644
index 0c00aa59..00000000
--- a/katsu/modules/chromebook/base-disk-aarch64.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-builder: dnf
-distro: Ultramarine Linux 40
-
-# users:
-#   - username: ultramarine
-#     # plaintext password: ultramarine
-#     password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
-#     groups:
-#       - wheel
-
-import:
-  - base.yaml
-  - base-disk.yaml
-
-scripts:
-  post:
-    - id: grub
-      name: Set up GRUB
-      file: grub-setup.sh
-
-disk:
-  size: 8GB
-  partitions:
-    - label: EFI
-      type: esp
-      size: 512MB
-      filesystem: efi
-      mountpoint: /boot/efi
-
-    - label: boot
-      type: xbootldr
-      size: 1GB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      flags:
-        - grow-fs
-      type: root
-      # size: 2.5MB
-      filesystem: ext4
-      mountpoint: /
-
-dnf:
-  releasever: 40
-  arch: aarch64
diff --git a/katsu/modules/chromebook/base-disk-cbe-x86_64.yaml b/katsu/modules/chromebook/base-disk-cbe-x86_64.yaml
deleted file mode 100644
index 7f49d3f1..00000000
--- a/katsu/modules/chromebook/base-disk-cbe-x86_64.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-builder: dnf
-distro: Ultramarine Linux CBE 40
-
-# users:
-#   - username: ultramarine
-#     # plaintext password: ultramarine
-#     password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
-#     groups:
-#       - wheel
-
-import:
-  - base-cbe.yaml
-  - ../base/base-disk.yaml
-
-scripts:
-  post:
-    - id: grub
-      name: Set up GRUB
-      file: ../base/grub-setup.sh
-
-disk:
-  size: 14GB
-  partitions:
-    - label: submarine
-      type: linux-generic
-      size: 16MB
-      filesystem: efi
-      mountpoint: /mnt
-
-    - label: boot
-      type: xbootldr
-      size: 1GB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      flags:
-        - grow-fs
-      type: root
-      # size: 2.5MB
-      filesystem: ext4
-      mountpoint: /
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/chromebook/live-cbe-kernel.yaml b/katsu/modules/chromebook/live-cbe-kernel.yaml
deleted file mode 100644
index 4a016066..00000000
--- a/katsu/modules/chromebook/live-cbe-kernel.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-builder: dnf
-
-# users:
-#   - username: ultramarine
-#     # plaintext password: ultramarine
-#     password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
-#     groups:
-#       - wheel
-
-scripts:
-  post:
-    - id: grub
-      name: Set up GRUB
-      file: ../base/grub-setup.sh
-
-disk:
-  size: 14GB
-  partitions:
-    - label: submarine
-      type: linux-generic
-      size: 64MB
-      filesystem: efi
-      mountpoint: /mnt
-
-    - label: boot
-      type: xbootldr
-      size: 1GB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      flags:
-        - grow-fs
-      type: root
-      # size: 2.5MB
-      filesystem: ext4
-      mountpoint: /
-
-dnf:
-  releasever: 39
-    - fcoe-utils
-    - device-mapper-multipath
-    - gnome-boxes
-    - deepin-wallpapers
-    - initial-setup-gui
-    - initial-setup
-  packages:
-    - python3-umstellar
-    - glibc-all-langpacks
-    - dracut-config-generic
-    - dracut-live
-    - dracut-config-generic
-    - dracut-network
-    - anaconda-dracut
-    - dracut-squash
-    - anaconda-live
-    - "@anaconda-tools"
-    - libblockdev-nvdimm
-    - isomd5sum
-    - orca
-    - espeak-ng
-    - speech-dispatcher-espeak-ng
-    - julietaula-montserrat-fonts
-    - ultramarine-backgrounds
-    - initscripts
-    - chkconfig
-    - gjs
-    - util-linux-user
-    - livesys-scripts
-    - rsync
-    - htop
-    - vim
-    - nano
-    # for drivers and other stuff
-    - kernel-chromebook
-    - kernel-chromebook-devel
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe-mt8183.yaml b/katsu/modules/chromebook/live-cbe-mt8183.yaml
deleted file mode 100644
index 5682a7a3..00000000
--- a/katsu/modules/chromebook/live-cbe-mt8183.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-builder: dnf
-
-# users:
-#   - username: ultramarine
-#     # plaintext password: ultramarine
-#     password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
-#     groups:
-#       - wheel
-
-scripts:
-  post:
-    - id: grub
-      name: Set up GRUB
-      file: ../base/grub-setup.sh
-
-disk:
-  size: 14GB
-  partitions:
-    - label: submarine
-      type: linux-generic
-      size: 64MB
-      filesystem: efi
-      mountpoint: /mnt
-
-    - label: boot
-      type: xbootldr
-      size: 1GB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      flags:
-        - grow-fs
-      type: root
-      # size: 2.5MB
-      filesystem: ext4
-      mountpoint: /
-
-dnf:
-  releasever: 39
-    - fcoe-utils
-    - device-mapper-multipath
-    - gnome-boxes
-    - deepin-wallpapers
-    - initial-setup-gui
-    - initial-setup
-  packages:
-    - python3-umstellar
-    - glibc-all-langpacks
-    - dracut-config-generic
-    - dracut-live
-    - dracut-config-generic
-    - dracut-network
-    - anaconda-dracut
-    - dracut-squash
-    - anaconda-live
-    - "@anaconda-tools"
-    - libblockdev-nvdimm
-    - isomd5sum
-    - orca
-    - espeak-ng
-    - speech-dispatcher-espeak-ng
-    - julietaula-montserrat-fonts
-    - ultramarine-backgrounds
-    - initscripts
-    - chkconfig
-    - gjs
-    - util-linux-user
-    - livesys-scripts
-    - rsync
-    - htop
-    - vim
-    - nano
-    # for drivers and other stuff
-    - kernel-mt8183
-    - kernel-mt8183-devel
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe-mt8192.yaml b/katsu/modules/chromebook/live-cbe-mt8192.yaml
deleted file mode 100644
index eacdbab9..00000000
--- a/katsu/modules/chromebook/live-cbe-mt8192.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-builder: dnf
-
-# users:
-#   - username: ultramarine
-#     # plaintext password: ultramarine
-#     password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
-#     groups:
-#       - wheel
-
-scripts:
-  post:
-    - id: grub
-      name: Set up GRUB
-      file: ../base/grub-setup.sh
-
-disk:
-  size: 14GB
-  partitions:
-    - label: submarine
-      type: linux-generic
-      size: 64MB
-      filesystem: efi
-      mountpoint: /mnt
-
-    - label: boot
-      type: xbootldr
-      size: 1GB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      flags:
-        - grow-fs
-      type: root
-      # size: 2.5MB
-      filesystem: ext4
-      mountpoint: /
-
-dnf:
-  releasever: 39
-    - fcoe-utils
-    - device-mapper-multipath
-    - gnome-boxes
-    - deepin-wallpapers
-    - initial-setup-gui
-    - initial-setup
-  packages:
-    - python3-umstellar
-    - glibc-all-langpacks
-    - dracut-config-generic
-    - dracut-live
-    - dracut-config-generic
-    - dracut-network
-    - anaconda-dracut
-    - dracut-squash
-    - anaconda-live
-    - "@anaconda-tools"
-    - libblockdev-nvdimm
-    - isomd5sum
-    - orca
-    - espeak-ng
-    - speech-dispatcher-espeak-ng
-    - julietaula-montserrat-fonts
-    - ultramarine-backgrounds
-    - initscripts
-    - chkconfig
-    - gjs
-    - util-linux-user
-    - livesys-scripts
-    - rsync
-    - htop
-    - vim
-    - nano
-    # for drivers and other stuff
-    - kernel-mt8192
-    - kernel-mt8192-devel
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe-sc7180.yaml b/katsu/modules/chromebook/live-cbe-sc7180.yaml
deleted file mode 100644
index 645ced09..00000000
--- a/katsu/modules/chromebook/live-cbe-sc7180.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-builder: dnf
-
-# users:
-#   - username: ultramarine
-#     # plaintext password: ultramarine
-#     password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
-#     groups:
-#       - wheel
-scripts:
-  post:
-    - id: grub
-      name: Set up GRUB
-      file: ../base/grub-setup.sh
-
-disk:
-  size: 14GB
-  partitions:
-    - label: submarine
-      type: linux-generic
-      size: 64MB
-      filesystem: efi
-      mountpoint: /mnt
-
-    - label: boot
-      type: xbootldr
-      size: 1GB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      flags:
-        - grow-fs
-      type: root
-      # size: 2.5MB
-      filesystem: ext4
-      mountpoint: /
-
-dnf:
-  releasever: 39 - fcoe-utils - device-mapper-multipath - gnome-boxes - deepin-wallpapers - initial-setup-gui - initial-setup
-  packages:
-    - python3-umstellar
-    - glibc-all-langpacks
-    - dracut-config-generic
-    - dracut-live
-    - dracut-config-generic
-    - dracut-network
-    - anaconda-dracut
-    - dracut-squash
-    - anaconda-live
-    - "@anaconda-tools"
-    - libblockdev-nvdimm
-    - isomd5sum
-    - orca
-    - espeak-ng
-    - speech-dispatcher-espeak-ng
-    - julietaula-montserrat-fonts
-    - ultramarine-backgrounds
-    - initscripts
-    - chkconfig
-    - gjs
-    - util-linux-user
-    - livesys-scripts
-    - rsync
-    - htop
-    - vim
-    - nano
-    # for drivers and other stuff
-    - kernel-sc7180
-    - kernel-sc7180-devel
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe-stoneyridge.yaml b/katsu/modules/chromebook/live-cbe-stoneyridge.yaml
deleted file mode 100644
index 618a5dff..00000000
--- a/katsu/modules/chromebook/live-cbe-stoneyridge.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-builder: dnf
-
-# users:
-#   - username: ultramarine
-#     # plaintext password: ultramarine
-#     password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
-#     groups:
-#       - wheel
-scripts:
-  post:
-    - id: grub
-      name: Set up GRUB
-      file: ../base/grub-setup.sh
-
-disk:
-  size: 14GB
-  partitions:
-    - label: submarine
-      type: linux-generic
-      size: 64MB
-      filesystem: efi
-      mountpoint: /mnt
-
-    - label: boot
-      type: xbootldr
-      size: 1GB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      flags:
-        - grow-fs
-      type: root
-      # size: 2.5MB
-      filesystem: ext4
-      mountpoint: /
-
-dnf:
-  releasever: 39 - fcoe-utils - device-mapper-multipath - gnome-boxes - deepin-wallpapers - initial-setup-gui - initial-setup
-  packages:
-    - python3-umstellar
-    - glibc-all-langpacks
-    - dracut-config-generic
-    - dracut-live
-    - dracut-config-generic
-    - dracut-network
-    - anaconda-dracut
-    - dracut-squash
-    - anaconda-live
-    - "@anaconda-tools"
-    - libblockdev-nvdimm
-    - isomd5sum
-    - orca
-    - espeak-ng
-    - speech-dispatcher-espeak-ng
-    - julietaula-montserrat-fonts
-    - ultramarine-backgrounds
-    - initscripts
-    - chkconfig
-    - gjs
-    - util-linux-user
-    - livesys-scripts
-    - rsync
-    - htop
-    - vim
-    - nano
-    # for drivers and other stuff
-    - kernel-stoneyridge
-    - kernel-stoneyridge-devel
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe.yaml b/katsu/modules/chromebook/live-cbe.yaml
deleted file mode 100644
index ddce9fc8..00000000
--- a/katsu/modules/chromebook/live-cbe.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-builder: dnf
-
-# users:
-#   - username: ultramarine
-#     # plaintext password: ultramarine
-#     password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
-#     groups:
-#       - wheel
-scripts:
-  post:
-    - id: grub
-      name: Set up GRUB
-      file: ../base/grub-setup.sh
-
-disk:
-  size: 14GB
-  partitions:
-    - label: submarine
-      type: linux-generic
-      size: 16MB
-      filesystem: efi
-      mountpoint: /mnt
-
-    - label: boot
-      type: xbootldr
-      size: 1GB
-      filesystem: ext4
-      mountpoint: /boot
-
-    - label: root
-      flags:
-        - grow-fs
-      type: root
-      # size: 2.5MB
-      filesystem: ext4
-      mountpoint: /
-
-dnf:
-  releasever: 40 - fcoe-utils - device-mapper-multipath - gnome-boxes - deepin-wallpapers - initial-setup-gui - initial-setup
-  packages:
-    - python3-umstellar
-    - glibc-all-langpacks
-    - dracut-config-generic
-    - dracut-live
-    - dracut-config-generic
-    - dracut-network
-    - anaconda-dracut
-    - dracut-squash
-    - anaconda-live
-    - "@anaconda-tools"
-    - libblockdev-nvdimm
-    - isomd5sum
-    - orca
-    - espeak-ng
-    - speech-dispatcher-espeak-ng
-    - julietaula-montserrat-fonts
-    - ultramarine-backgrounds
-    - initscripts
-    - chkconfig
-    - gjs
-    - util-linux-user
-    - livesys-scripts
-    - rsync
-    - htop
-    - vim
-    - nano
-    - kernel-chromebook
-    #- cros-keyboard-map
-    # for drivers and other stuff
-    - kernel
-    - kernel-devel-matched
-    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/repodir-mtest/fedora-cisco-openh264.repo b/katsu/modules/chromebook/repodir-mtest/fedora-cisco-openh264.repo
deleted file mode 100644
index 02150d97..00000000
--- a/katsu/modules/chromebook/repodir-mtest/fedora-cisco-openh264.repo
+++ /dev/null
@@ -1,22 +0,0 @@
-[fedora-cisco-openh264]
-name=Fedora $releasever openh264 (From Cisco) - $basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch
-type=rpm
-enabled=1
-metadata_expire=14d
-repo_gpgcheck=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=True
-
-[fedora-cisco-openh264-debuginfo]
-name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-debug-$releasever&arch=$basearch
-type=rpm
-enabled=0
-metadata_expire=14d
-repo_gpgcheck=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=True
-
diff --git a/katsu/modules/chromebook/repodir-mtest/fedora-updates.repo b/katsu/modules/chromebook/repodir-mtest/fedora-updates.repo
deleted file mode 100644
index 9d9f2fd4..00000000
--- a/katsu/modules/chromebook/repodir-mtest/fedora-updates.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-enabled=1
-countme=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-debuginfo]
-name=Fedora $releasever - $basearch - Updates - Debug
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-source]
-name=Fedora $releasever - Updates Source
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/katsu/modules/chromebook/repodir-mtest/fedora.repo b/katsu/modules/chromebook/repodir-mtest/fedora.repo
deleted file mode 100644
index f9bfbb17..00000000
--- a/katsu/modules/chromebook/repodir-mtest/fedora.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=1
-countme=1
-metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-debuginfo]
-name=Fedora $releasever - $basearch - Debug
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-source]
-name=Fedora $releasever - Source
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/katsu/modules/chromebook/repodir-mtest/mtest.repo b/katsu/modules/chromebook/repodir-mtest/mtest.repo
deleted file mode 100644
index 3170d52b..00000000
--- a/katsu/modules/chromebook/repodir-mtest/mtest.repo
+++ /dev/null
@@ -1,12 +0,0 @@
-[mtest]
-name=mtest
-baseurl=https://repos.fyralabs.com/mtest
-metadata_expire=6h
-type=rpm
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://repos.fyralabs.com/mtest/key.asc
-repo_gpgcheck=1
-enabled=1
-enabled_metadata=1
-priority=1
\ No newline at end of file
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-tainted.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-tainted.repo
deleted file mode 100644
index 906bf6fd..00000000
--- a/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-tainted.repo
+++ /dev/null
@@ -1,33 +0,0 @@
-[rpmfusion-free-tainted]
-name=RPM Fusion for Fedora $releasever - Free tainted
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
-enabled=1
-metadata_expire=6h
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-tainted-debuginfo]
-name=RPM Fusion for Fedora $releasever - Free tainted - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=6h
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-tainted-source]
-name=RPM Fusion for Fedora $releasever - Free tainted - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=6h
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-updates.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-updates.repo
deleted file mode 100644
index 14059315..00000000
--- a/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-updates.repo
+++ /dev/null
@@ -1,31 +0,0 @@
-[rpmfusion-free-updates]
-name=RPM Fusion for Fedora $releasever - Free - Updates
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-updates-debuginfo]
-name=RPM Fusion for Fedora $releasever - Free - Updates Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-updates-source]
-name=RPM Fusion for Fedora $releasever - Free - Updates Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-free.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-free.repo
deleted file mode 100644
index e65aa5bc..00000000
--- a/katsu/modules/chromebook/repodir-mtest/rpmfusion-free.repo
+++ /dev/null
@@ -1,33 +0,0 @@
-[rpmfusion-free]
-name=RPM Fusion for Fedora $releasever - Free
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
-enabled=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-debuginfo]
-name=RPM Fusion for Fedora $releasever - Free - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
-[rpmfusion-free-source]
-name=RPM Fusion for Fedora $releasever - Free - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-tainted.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-tainted.repo
deleted file mode 100644
index ee408aa7..00000000
--- a/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-tainted.repo
+++ /dev/null
@@ -1,33 +0,0 @@
-[rpmfusion-nonfree-tainted]
-name=RPM Fusion for Fedora $releasever - Nonfree tainted
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
-enabled=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-tainted-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree tainted - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-tainted-source]
-name=RPM Fusion for Fedora $releasever - Nonfree tainted - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-updates.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-updates.repo
deleted file mode 100644
index 6d4d8251..00000000
--- a/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-updates.repo
+++ /dev/null
@@ -1,31 +0,0 @@
-[rpmfusion-nonfree-updates]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-updates-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-updates-source]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
-enabled=0
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree.repo
deleted file mode 100644
index dfb5110a..00000000
--- a/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree.repo
+++ /dev/null
@@ -1,34 +0,0 @@
-[rpmfusion-nonfree]
-name=RPM Fusion for Fedora $releasever - Nonfree
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
-metadata_expire=14d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
-[rpmfusion-nonfree-source]
-name=RPM Fusion for Fedora $releasever - Nonfree - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-type=rpm-md
-gpgcheck=1
-repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-
diff --git a/katsu/modules/chromebook/repodir-mtest/terra.repo b/katsu/modules/chromebook/repodir-mtest/terra.repo
deleted file mode 100644
index 1c61569f..00000000
--- a/katsu/modules/chromebook/repodir-mtest/terra.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-[terra]
-name=Terra Packages $releasever
-baseurl=https://repos.fyralabs.com/terra$releasever
-metadata_expire=6h
-type=rpm
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
-repo_gpgcheck=1
-enabled=1
-enabled_metadata=1
\ No newline at end of file
diff --git a/katsu/modules/chromebook/repodir-mtest/ultramarine.repo b/katsu/modules/chromebook/repodir-mtest/ultramarine.repo
deleted file mode 100644
index 316c5464..00000000
--- a/katsu/modules/chromebook/repodir-mtest/ultramarine.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-[ultramarine]
-name=Ultramarine Linux $releasever
-baseurl=https://repos.fyralabs.com/um$releasever
-metadata_expire=6h
-type=rpm
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://repos.fyralabs.com/um$releasever/key.asc
-repo_gpgcheck=1
-enabled=1
-enabled_metadata=1
\ No newline at end of file
diff --git a/katsu/modules/flagship/base-disk-aarch64.yaml b/katsu/modules/flagship/base-disk-aarch64.yaml
index 6b063f06..30e08fd7 100644
--- a/katsu/modules/flagship/base-disk-aarch64.yaml
+++ b/katsu/modules/flagship/base-disk-aarch64.yaml
@@ -20,7 +20,7 @@ scripts:
       file: ../base/grub-setup.sh
 
 disk:
-  size: 12GB
+  size: 13GB
   partitions:
     - label: EFI
       type: esp
diff --git a/katsu/modules/flagship/flagship-chromebook-kernel.yaml b/katsu/modules/flagship/flagship-chromebook-kernel.yaml
deleted file mode 100644
index d261aefd..00000000
--- a/katsu/modules/flagship/flagship-chromebook-kernel.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-kernel.yaml
-  - ../chromebook/live-cbe-kernel.yaml
-  - flagship.yaml
-
-distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
-
-out_file: ultramarine-cbe-flagship-40-live.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-mt8183.yaml b/katsu/modules/flagship/flagship-chromebook-mt8183.yaml
deleted file mode 100644
index c6f2c4e4..00000000
--- a/katsu/modules/flagship/flagship-chromebook-mt8183.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-mt8183.yaml
-  - ../chromebook/live-cbe-mt8183.yaml
-  - flagship.yaml
-
-distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
-
-out_file: ultramarine-cbe-mt8183-flagship-40-live.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-mt8192.yaml b/katsu/modules/flagship/flagship-chromebook-mt8192.yaml
deleted file mode 100644
index ba16445b..00000000
--- a/katsu/modules/flagship/flagship-chromebook-mt8192.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-mt8192.yaml
-  - ../chromebook/live-cbe-mt8192.yaml
-  - flagship.yaml
-
-distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
-
-out_file: ultramarine-cbe-mt8192-flagship-40-live.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-sc7180.yaml b/katsu/modules/flagship/flagship-chromebook-sc7180.yaml
deleted file mode 100644
index a3248728..00000000
--- a/katsu/modules/flagship/flagship-chromebook-sc7180.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-sc7180.yaml
-  - ../chromebook/live-cbe-sc7180.yaml
-  - flagship.yaml
-
-distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
-
-out_file: ultramarine-cbe-sc7c-flagship-40-live.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-stoneyridge.yaml b/katsu/modules/flagship/flagship-chromebook-stoneyridge.yaml
deleted file mode 100644
index 8c0d6098..00000000
--- a/katsu/modules/flagship/flagship-chromebook-stoneyridge.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-stoneyridge.yaml
-  - ../chromebook/live-cbe-stoneyridge.yaml
-  - flagship.yaml
-
-distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
-
-out_file: ultramarine-cbe-stoney-flagship-40-live.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/gnome/base-disk-aarch64.yaml b/katsu/modules/gnome/base-disk-aarch64.yaml
index 921224af..e5916adb 100644
--- a/katsu/modules/gnome/base-disk-aarch64.yaml
+++ b/katsu/modules/gnome/base-disk-aarch64.yaml
@@ -20,7 +20,7 @@ scripts:
       file: ../base/grub-setup.sh
 
 disk:
-  size: 11GB
+  size: 12GB
   partitions:
     - label: EFI
       type: esp
diff --git a/katsu/modules/gnome/gnome-chromebook-kernel.yaml b/katsu/modules/gnome/gnome-chromebook-kernel.yaml
deleted file mode 100644
index fdddb988..00000000
--- a/katsu/modules/gnome/gnome-chromebook-kernel.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-kernel.yaml
-  - ../chromebook/live-cbe-kernel.yaml
-  - gnome.yaml
-
-out_file: ultramarine-cbe-gnome-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: gnome-live
-#      name: Set up GNOME Live
-#      file: gnome-live.sh
-
-distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/gnome/gnome-chromebook-mt8183.yaml b/katsu/modules/gnome/gnome-chromebook-mt8183.yaml
deleted file mode 100644
index e32771d6..00000000
--- a/katsu/modules/gnome/gnome-chromebook-mt8183.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-mt8183.yaml
-  - ../chromebook/live-cbe-mt8183.yaml
-  - gnome.yaml
-
-out_file: ultramarine-cbe-mt8183-gnome-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: gnome-live
-#      name: Set up GNOME Live
-#      file: gnome-live.sh
-
-distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/gnome/gnome-chromebook-mt8192.yaml b/katsu/modules/gnome/gnome-chromebook-mt8192.yaml
deleted file mode 100644
index c78ad734..00000000
--- a/katsu/modules/gnome/gnome-chromebook-mt8192.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-mt8192.yaml
-  - ../chromebook/live-cbe-mt8192.yaml
-  - gnome.yaml
-
-out_file: ultramarine-cbe-mt8192-gnome-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: gnome-live
-#      name: Set up GNOME Live
-#      file: gnome-live.sh
-
-distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
-  packages:
-    - "@ultramarine-gnome-product-environment"
-    - ultramarine-release-gnome
-    - ultramarine-release-identity-gnome
-# scripts:
-#   post:
-#     - id: flagship-live
-#       name: Set up Flagship Live
-#       file: ./flagship-live.sh
diff --git a/katsu/modules/gnome/gnome-chromebook-sc7180.yaml b/katsu/modules/gnome/gnome-chromebook-sc7180.yaml
deleted file mode 100644
index 047a9e47..00000000
--- a/katsu/modules/gnome/gnome-chromebook-sc7180.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-sc7180.yaml
-  - ../chromebook/live-cbe-sc7180.yaml
-  - gnome.yaml
-
-out_file: ultramarine-cbe-sc7c-gnome-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: gnome-live
-#      name: Set up GNOME Live
-#      file: gnome-live.sh
-
-distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/gnome/gnome-chromebook-stoneyridge.yaml b/katsu/modules/gnome/gnome-chromebook-stoneyridge.yaml
deleted file mode 100644
index 03c366ea..00000000
--- a/katsu/modules/gnome/gnome-chromebook-stoneyridge.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-stoneyridge.yaml
-  - ../chromebook/live-cbe-stoneyridge.yaml
-  - gnome.yaml
-
-out_file: ultramarine-cbe-stoney-gnome-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: gnome-live
-#      name: Set up GNOME Live
-#      file: gnome-live.sh
-
-distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/gnome/gnome-chromebook-x86_64.yaml b/katsu/modules/gnome/gnome-chromebook-x86_64.yaml
deleted file mode 100644
index c909e85c..00000000
--- a/katsu/modules/gnome/gnome-chromebook-x86_64.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe.yaml
-  - ../chromebook/live-cbe.yaml
-  - gnome.yaml
-
-out_file: ultramarine-cbe-gnome-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: gnome-live
-#      name: Set up GNOME Live
-#      file: gnome-live.sh
-
-distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-kernel.yaml b/katsu/modules/kde/kde-chromebook-kernel.yaml
deleted file mode 100644
index de750084..00000000
--- a/katsu/modules/kde/kde-chromebook-kernel.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-kernel.yaml
-  - ../chromebook/live-cbe-kernel.yaml
-  - kde.yaml
-  - kde-disk.yaml
-
-distro: Ultramarine Linux 40 KDE (Chromebook Edition)
-
-out_file: ultramarine-cbe-kde-40.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-mt8183.yaml b/katsu/modules/kde/kde-chromebook-mt8183.yaml
deleted file mode 100644
index c993572c..00000000
--- a/katsu/modules/kde/kde-chromebook-mt8183.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-mt8183.yaml
-  - ../chromebook/live-cbe-mt8183.yaml
-  - kde.yaml
-  - kde-disk.yaml
-
-distro: Ultramarine Linux 40 KDE (Chromebook Edition)
-
-out_file: ultramarine-cbe-mt8183-kde-40.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-mt8192.yaml b/katsu/modules/kde/kde-chromebook-mt8192.yaml
deleted file mode 100644
index 7b816252..00000000
--- a/katsu/modules/kde/kde-chromebook-mt8192.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-mt8192.yaml
-  - ../chromebook/live-cbe-mt8192.yaml
-  - kde.yaml
-  - kde-disk.yaml
-
-distro: Ultramarine Linux 40 KDE (Chromebook Edition)
-
-out_file: ultramarine-cbe-mt8192-kde-40.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-sc7180.yaml b/katsu/modules/kde/kde-chromebook-sc7180.yaml
deleted file mode 100644
index 2e9c82da..00000000
--- a/katsu/modules/kde/kde-chromebook-sc7180.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-sc7180.yaml
-  - ../chromebook/live-cbe-sc7180.yaml
-  - kde.yaml
-  - kde-disk.yaml
-
-distro: Ultramarine Linux 40 KDE (Chromebook Edition)
-
-out_file: ultramarine-cbe-sc7c-kde-40.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-stoneyridge.yaml b/katsu/modules/kde/kde-chromebook-stoneyridge.yaml
deleted file mode 100644
index a302b8cf..00000000
--- a/katsu/modules/kde/kde-chromebook-stoneyridge.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-stoneyridge.yaml
-  - ../chromebook/live-cbe-stoneyridge.yaml
-  - kde.yaml
-  - kde-disk.yaml
-
-distro: Ultramarine Linux 40 KDE (Chromebook Edition)
-
-out_file: ultramarine-cbe-stoney-kde-40.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-kernel.yaml b/katsu/modules/pantheon/pantheon-chromebook-kernel.yaml
deleted file mode 100644
index decad5ad..00000000
--- a/katsu/modules/pantheon/pantheon-chromebook-kernel.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-kernel.yaml
-  - ../chromebook/live-cbe-kernel.yaml
-  - pantheon.yaml
-
-out_file: ultramarine-cbe-pantheon-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: pantheon-live
-#      name: Set up Pantheon Live
-#      file: ./pantheon-live.sh
-
-distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-mt8183.yaml b/katsu/modules/pantheon/pantheon-chromebook-mt8183.yaml
deleted file mode 100644
index 562ce656..00000000
--- a/katsu/modules/pantheon/pantheon-chromebook-mt8183.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-mt8183.yaml
-  - ../chromebook/live-cbe-mt8183.yaml
-  - pantheon.yaml
-
-out_file: ultramarine-cbe-mt8183-pantheon-39-live.iso
-
-#  scripts:
-#  post:
-#    - id: pantheon-live
-#      name: Set up Pantheon Live
-#      file: ./pantheon-live.sh
-
-distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-mt8192.yaml b/katsu/modules/pantheon/pantheon-chromebook-mt8192.yaml
deleted file mode 100644
index ffcf156d..00000000
--- a/katsu/modules/pantheon/pantheon-chromebook-mt8192.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-mt8192.yaml
-  - ../chromebook/live-cbe-mt8192.yaml
-  - pantheon.yaml
-
-out_file: ultramarine-cbe-mt8192-pantheon-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: pantheon-live
-#      name: Set up Pantheon Live
-#      file: ./pantheon-live.sh
-
-distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-sc7180.yaml b/katsu/modules/pantheon/pantheon-chromebook-sc7180.yaml
deleted file mode 100644
index 34b89504..00000000
--- a/katsu/modules/pantheon/pantheon-chromebook-sc7180.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-sc7180.yaml
-  - ../chromebook/live-cbe-sc7180.yaml
-  - pantheon.yaml
-
-out_file: ultramarine-cbe-sc7c-pantheon-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: pantheon-live
-#      name: Set up Pantheon Live
-#      file: ./pantheon-live.sh
-
-distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-stoneyridge.yaml b/katsu/modules/pantheon/pantheon-chromebook-stoneyridge.yaml
deleted file mode 100644
index cab604c9..00000000
--- a/katsu/modules/pantheon/pantheon-chromebook-stoneyridge.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe-stoneyridge.yaml
-  - ../chromebook/live-cbe-stoneyridge.yaml
-  - pantheon.yaml
-out_file: ultramarine-cbe-stoney-pantheon-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: pantheon-live
-#      name: Set up Pantheon Live
-#      file: ./pantheon-live.sh
-
-distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-x86_64.yaml b/katsu/modules/pantheon/pantheon-chromebook-x86_64.yaml
deleted file mode 100644
index c2eab787..00000000
--- a/katsu/modules/pantheon/pantheon-chromebook-x86_64.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe.yaml
-  - ../chromebook/live-cbe.yaml
-  - pantheon.yaml
-
-out_file: ultramarine-cbe-pantheon-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: pantheon-live
-#      name: Set up Pantheon Live
-#      file: ./pantheon-live.sh
-
-distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
diff --git a/katsu/modules/ports/chromebook/chromebook.yaml b/katsu/modules/ports/chromebook/chromebook.yaml
new file mode 100644
index 00000000..46643ee4
--- /dev/null
+++ b/katsu/modules/ports/chromebook/chromebook.yaml
@@ -0,0 +1,25 @@
+builder: dnf
+
+scripts:
+  post:
+    - id: cleanup
+      name: Clean up system
+      file: ../../base/cleanup.sh
+    - id: selinux-setup
+      name: Set up SELinux
+      file: ../../base/selinux.sh
+      chroot: false
+    - id: buildstamp
+      name: Generate buildstamp
+      file: ../../base/buildstamp.sh
+    - id: submarine
+      name: Set up ChromeOS bootloader
+      file: submarine.sh
+
+dnf:
+  releasever: 40
+  packages:
+    - cros-keyboard-map
+    - depthcharge-tools
+    - vboot-utils
+    - submarine
diff --git a/katsu/modules/ports/chromebook/mt8183/flagship.yaml b/katsu/modules/ports/chromebook/mt8183/flagship.yaml
new file mode 100644
index 00000000..97acc05b
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8183/flagship.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - mt8183.yaml
+  - ../../../flagship/flagship.yaml
+  - ../../../flagship/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 Flagship (mt8183 Chromebook)
+
+out_file: ultramarine-cbe-mt8183-flagship-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/mt8183/gnome.yaml b/katsu/modules/ports/chromebook/mt8183/gnome.yaml
new file mode 100644
index 00000000..dffa0376
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8183/gnome.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - mt8183.yaml
+  - ../../../gnome/gnome.yaml
+  - ../../../gnome/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 GNOME (mt8183 Chromebook)
+
+out_file: ultramarine-cbe-mt8183-gnome-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/mt8183/kde.yaml b/katsu/modules/ports/chromebook/mt8183/kde.yaml
new file mode 100644
index 00000000..80ae2e51
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8183/kde.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - mt8183.yaml
+  - ../../../kde/kde.yaml
+  - ../../../kde/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 KDE (mt8183 Chromebook)
+
+out_file: ultramarine-cbe-mt8183-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml
new file mode 100644
index 00000000..f1e8bffb
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml
@@ -0,0 +1,10 @@
+builder: dnf
+
+import:
+  - ../chromebook.yaml
+
+dnf:
+  releasever: 40
+  packages:
+    - kernel-mt8183
+    - kernel-mt8183-devel
diff --git a/katsu/modules/ports/chromebook/mt8183/readme.md b/katsu/modules/ports/chromebook/mt8183/readme.md
new file mode 100644
index 00000000..8260dd0b
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8183/readme.md
@@ -0,0 +1,7 @@
+# mt8183 Chromebooks
+
+This is our most complete port. Our reference device is the Lenovo Chromebook Duet (Krane).
+
+## Known Issues
+
+- Krane may loudly beep if the speakers are active within 15 seconds of sleep.
diff --git a/katsu/modules/ports/chromebook/mt8183/xfce.yaml b/katsu/modules/ports/chromebook/mt8183/xfce.yaml
new file mode 100644
index 00000000..0df13544
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8183/xfce.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - mt8183.yaml
+  - ../../../xfce/xfce.yaml
+  - ../../../xfce/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 Xfce (mt8183 Chromebook)
+
+out_file: ultramarine-cbe-mt8183-xfce-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/mt8192/flagship.yaml b/katsu/modules/ports/chromebook/mt8192/flagship.yaml
new file mode 100644
index 00000000..67608b7c
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8192/flagship.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - mt8192.yaml
+  - ../../../flagship/flagship.yaml
+  - ../../../flagship/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 Flagship (mt8192 Chromebook)
+
+out_file: ultramarine-cbe-mt8192-flagship-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/mt8192/gnome.yaml b/katsu/modules/ports/chromebook/mt8192/gnome.yaml
new file mode 100644
index 00000000..58085878
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8192/gnome.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - mt8192.yaml
+  - ../../../gnome/gnome.yaml
+  - ../../../gnome/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 GNOME (mt8192 Chromebook)
+
+out_file: ultramarine-cbe-mt8192-gnome-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/mt8192/kde.yaml b/katsu/modules/ports/chromebook/mt8192/kde.yaml
new file mode 100644
index 00000000..8340896a
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8192/kde.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - mt8192.yaml
+  - ../../../kde/kde.yaml
+  - ../../../kde/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 KDE (mt8192 Chromebook)
+
+out_file: ultramarine-cbe-mt8192-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml
new file mode 100644
index 00000000..ae1b2d34
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml
@@ -0,0 +1,10 @@
+builder: dnf
+
+import:
+  - ../chromebook.yaml
+
+dnf:
+  releasever: 40
+  packages:
+    - kernel-mt8192
+    - kernel-mt8192-devel
diff --git a/katsu/modules/ports/chromebook/mt8192/readme.md b/katsu/modules/ports/chromebook/mt8192/readme.md
new file mode 100644
index 00000000..a9c74709
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8192/readme.md
@@ -0,0 +1,7 @@
+# mt8192 Chromebooks
+
+Our reference device is the Asus Chromebook Flip CM3 (Hayato).
+
+## Known Issues
+
+- [Submarine doesn't initialize the display](https://github.com/FyraLabs/submarine/issues/10)
diff --git a/katsu/modules/ports/chromebook/mt8192/xfce.yaml b/katsu/modules/ports/chromebook/mt8192/xfce.yaml
new file mode 100644
index 00000000..7f504df7
--- /dev/null
+++ b/katsu/modules/ports/chromebook/mt8192/xfce.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - mt8192.yaml
+  - ../../../xfce/xfce.yaml
+  - ../../../xfce/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 Xfce (mt8192 Chromebook)
+
+out_file: ultramarine-cbe-mt8192-xfce-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/sc7180/flagship.yaml b/katsu/modules/ports/chromebook/sc7180/flagship.yaml
new file mode 100644
index 00000000..ce69aa0a
--- /dev/null
+++ b/katsu/modules/ports/chromebook/sc7180/flagship.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - sc7180.yaml
+  - ../../../flagship/flagship.yaml
+  - ../../../flagship/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 Flagship (sc7180 Chromebook)
+
+out_file: ultramarine-cbe-sc7180-flagship-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/sc7180/gnome.yaml b/katsu/modules/ports/chromebook/sc7180/gnome.yaml
new file mode 100644
index 00000000..b6334c0c
--- /dev/null
+++ b/katsu/modules/ports/chromebook/sc7180/gnome.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - sc7180.yaml
+  - ../../../gnome/gnome.yaml
+  - ../../../gnome/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 GNOME (sc7180 Chromebook)
+
+out_file: ultramarine-cbe-sc7180-gnome-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/sc7180/kde.yaml b/katsu/modules/ports/chromebook/sc7180/kde.yaml
new file mode 100644
index 00000000..ad6eef3c
--- /dev/null
+++ b/katsu/modules/ports/chromebook/sc7180/kde.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - sc7180.yaml
+  - ../../../kde/kde.yaml
+  - ../../../kde/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 KDE (sc7180 Chromebook)
+
+out_file: ultramarine-cbe-sc7180-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/sc7180/readme.md b/katsu/modules/ports/chromebook/sc7180/readme.md
new file mode 100644
index 00000000..dff91f8d
--- /dev/null
+++ b/katsu/modules/ports/chromebook/sc7180/readme.md
@@ -0,0 +1,7 @@
+# QC-7C/sc7180 Chromebooks
+
+Our reference device is the Lenovo IdeaPad Duet 3 (wormdingler)
+
+## Known Issues
+
+- WiFi may be flaky.
diff --git a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml
new file mode 100644
index 00000000..cae1d93c
--- /dev/null
+++ b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml
@@ -0,0 +1,10 @@
+builder: dnf
+
+import:
+  - ../chromebook.yaml
+
+dnf:
+  releasever: 40
+  packages:
+    - kernel-sc7180
+    - kernel-sc7180-devel
diff --git a/katsu/modules/ports/chromebook/sc7180/xfce.yaml b/katsu/modules/ports/chromebook/sc7180/xfce.yaml
new file mode 100644
index 00000000..4824d065
--- /dev/null
+++ b/katsu/modules/ports/chromebook/sc7180/xfce.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - sc7180.yaml
+  - ../../../xfce/xfce.yaml
+  - ../../../xfce/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 Xfce (sc7180 Chromebook)
+
+out_file: ultramarine-cbe-sc7180-xfce-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/stoney/flagship.yaml b/katsu/modules/ports/chromebook/stoney/flagship.yaml
new file mode 100644
index 00000000..71bdf9bf
--- /dev/null
+++ b/katsu/modules/ports/chromebook/stoney/flagship.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - stoney.yaml
+  - ../../../flagship/flagship.yaml
+  - ../../../flagship/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 Flagship (Stoney Chromebook)
+
+out_file: ultramarine-cbe-stoney-flagship-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/stoney/gnome.yaml b/katsu/modules/ports/chromebook/stoney/gnome.yaml
new file mode 100644
index 00000000..8d0c6d4e
--- /dev/null
+++ b/katsu/modules/ports/chromebook/stoney/gnome.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - stoney.yaml
+  - ../../../gnome/gnome.yaml
+  - ../../../gnome/base-disk-x86_64.yaml
+
+distro: Ultramarine Linux 40 GNOME (Stoney Chromebook)
+
+out_file: ultramarine-cbe-stoney-gnome-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/stoney/kde.yaml b/katsu/modules/ports/chromebook/stoney/kde.yaml
new file mode 100644
index 00000000..29209a5c
--- /dev/null
+++ b/katsu/modules/ports/chromebook/stoney/kde.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - stoney.yaml
+  - ../../../kde/kde.yaml
+  - ../../../kde/base-disk-x86_64.yaml
+
+distro: Ultramarine Linux 40 KDE (Stoney Chromebook)
+
+out_file: ultramarine-cbe-stoney-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/ports/chromebook/stoney/stoney.yaml b/katsu/modules/ports/chromebook/stoney/stoney.yaml
new file mode 100644
index 00000000..ac00d294
--- /dev/null
+++ b/katsu/modules/ports/chromebook/stoney/stoney.yaml
@@ -0,0 +1,10 @@
+builder: dnf
+
+import:
+  - ../chromebook.yaml
+
+dnf:
+  releasever: 40
+  packages:
+    - kernel-stoneyridge
+    - kernel-stoneyridge-devel
diff --git a/katsu/modules/ports/chromebook/stoney/xfce.yaml b/katsu/modules/ports/chromebook/stoney/xfce.yaml
new file mode 100644
index 00000000..e28536d1
--- /dev/null
+++ b/katsu/modules/ports/chromebook/stoney/xfce.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - stoney.yaml
+  - ../../../xfce/xfce.yaml
+  - ../../../xfce/base-disk-aarch64.yaml
+
+distro: Ultramarine Linux 40 Xfce (Stoney Chromebook)
+
+out_file: ultramarine-cbe-stoney-xfce-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/chromebook/submarine.sh b/katsu/modules/ports/chromebook/submarine.sh
similarity index 100%
rename from katsu/modules/chromebook/submarine.sh
rename to katsu/modules/ports/chromebook/submarine.sh
diff --git a/katsu/modules/flagship/flagship-chromebook-x86_64.yaml b/katsu/modules/ports/chromebook/x86_64/flagship.yaml
similarity index 52%
rename from katsu/modules/flagship/flagship-chromebook-x86_64.yaml
rename to katsu/modules/ports/chromebook/x86_64/flagship.yaml
index bb0e02f1..8c161c3d 100644
--- a/katsu/modules/flagship/flagship-chromebook-x86_64.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/flagship.yaml
@@ -1,13 +1,13 @@
 builder: dnf
 
 import:
-  - ../chromebook/base-cbe.yaml
-  - ../chromebook/live-cbe.yaml
-  - flagship.yaml
+  - chromebook.yaml
+  - ../../../flagship/flagship.yaml
+  - ../../../flagship/base-disk-x86_64.yaml
 
 distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
 
-out_file: ultramarine-cbe-flagship-40-live.img
+out_file: ultramarine-cbe-flagship-40.img
 
 bootloader: grub
 
diff --git a/katsu/modules/ports/chromebook/x86_64/gnome.yaml b/katsu/modules/ports/chromebook/x86_64/gnome.yaml
new file mode 100644
index 00000000..7240bb07
--- /dev/null
+++ b/katsu/modules/ports/chromebook/x86_64/gnome.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - chromebook.yaml
+  - ../../../gnome/gnome.yaml
+  - ../../../gnome/base-disk-x86_64.yaml
+
+distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
+
+out_file: ultramarine-cbe-gnome-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-x86_64.yaml b/katsu/modules/ports/chromebook/x86_64/kde.yaml
similarity index 66%
rename from katsu/modules/kde/kde-chromebook-x86_64.yaml
rename to katsu/modules/ports/chromebook/x86_64/kde.yaml
index f2f9ca4f..2f6eb65a 100644
--- a/katsu/modules/kde/kde-chromebook-x86_64.yaml
+++ b/katsu/modules/ports/chromebook/x86_64/kde.yaml
@@ -1,10 +1,9 @@
 builder: dnf
 
 import:
-  - ../chromebook/base-cbe.yaml
-  - ../chromebook/live-cbe.yaml
-  - kde.yaml
-  - kde-disk.yaml
+  - chromebook.yaml
+  - ../../../kde/kde.yaml
+  - ../../../kde/base-disk-x86_64.yaml
 
 distro: Ultramarine Linux 40 KDE (Chromebook Edition)
 
diff --git a/katsu/modules/ports/chromebook/x86_64/xfce.yaml b/katsu/modules/ports/chromebook/x86_64/xfce.yaml
new file mode 100644
index 00000000..635e5a03
--- /dev/null
+++ b/katsu/modules/ports/chromebook/x86_64/xfce.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - chromebook.yaml
+  - ../../../xfce/xfce.yaml
+  - ../../../xfce/base-disk-x86.yaml
+
+distro: Ultramarine Linux 40 Xfce (Chromebook Edition)
+
+out_file: ultramarine-cbe-xfce-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/xfce/base-disk-aarch64.yaml b/katsu/modules/xfce/base-disk-aarch64.yaml
index fc7157f5..02cb3c4c 100644
--- a/katsu/modules/xfce/base-disk-aarch64.yaml
+++ b/katsu/modules/xfce/base-disk-aarch64.yaml
@@ -20,7 +20,7 @@ scripts:
       file: ../base/grub-setup.sh
 
 disk:
-  size: 12GB
+  size: 13GB
   partitions:
     - label: EFI
       type: esp
diff --git a/katsu/modules/xfce/xfce-chromebook-x86_64.yaml b/katsu/modules/xfce/xfce-chromebook-x86_64.yaml
deleted file mode 100644
index 3faa96ea..00000000
--- a/katsu/modules/xfce/xfce-chromebook-x86_64.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe.yaml
-  - ../chromebook/live-cbe.yaml
-  - xfce.yaml
-
-out_file: ultramarine-cbe-xfce-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: pantheon-live
-#      name: Set up Pantheon Live
-#      file: ./pantheon-live.sh
-
-distro: Ultramarine Linux 40 Xfce (Chromebook Edition)
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"