diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml
index 049a505..951b5d9 100644
--- a/.github/workflows/build-katsu.yml
+++ b/.github/workflows/build-katsu.yml
@@ -51,6 +51,7 @@ jobs:
         variant:
           - base/base-disk-x86_64
           - base/base-disk-aarch64
+          - flagship/flagship-chromebook
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/terrapkg/builder:f38
@@ -113,7 +114,6 @@ jobs:
           - gnome/gnome-live
           - kde/kde-live
           - pantheon/pantheon-live
-          - flagship/flagship-chromebook
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/terrapkg/builder:f38
diff --git a/katsu/modules/flagship/flagship-chromebook.yaml b/katsu/modules/flagship/flagship-chromebook.yaml
index cae643d..1359732 100644
--- a/katsu/modules/flagship/flagship-chromebook.yaml
+++ b/katsu/modules/flagship/flagship-chromebook.yaml
@@ -1,7 +1,9 @@
 builder: dnf
 
 import:
-  - ../chromebook/base.yaml
+  - ../chromebook/base-disk.yaml
+  # - ../live/live.yaml
+  - ../chromebook/base-disk-x86_64.yaml
 
 distro: Ultramarine CBE Flagship 39
 
@@ -22,7 +24,7 @@ dnf:
     - budgie-desktop-defaults
     - budgie-backgrounds
   packages:
-    - "@ultramarine-flagship-product-enviroment"
+    - "@ultramarine-flagship-product-environment"
 
 scripts:
   post:
diff --git a/katsu/modules/flagship/flagship-live.yaml b/katsu/modules/flagship/flagship-live.yaml
index c003b20..b7d2a65 100644
--- a/katsu/modules/flagship/flagship-live.yaml
+++ b/katsu/modules/flagship/flagship-live.yaml
@@ -23,7 +23,7 @@ dnf:
     - budgie-desktop-defaults
     - budgie-backgrounds
   packages:
-    - "@ultramarine-flagship-product-enviroment"
+    - "@ultramarine-flagship-product-environment"
 
 scripts:
   post:
diff --git a/katsu/modules/gnome/gnome-chromebook.yaml b/katsu/modules/gnome/gnome-chromebook.yaml
index a39f712..7fe01e6 100644
--- a/katsu/modules/gnome/gnome-chromebook.yaml
+++ b/katsu/modules/gnome/gnome-chromebook.yaml
@@ -1,7 +1,7 @@
 builder: dnf
 
 import:
-  - ../chromebook/base.yaml
+  - ../chromebook/base-disk.yaml
 
 out_file: ultramarine-cbe-gnome-39-live.iso
 
@@ -25,7 +25,7 @@ dnf:
   options:
     - --setopt=strict=0
   packages:
-    - "@ultramarine-gnome-product-enviroment"
+    - "@ultramarine-gnome-product-environment"
 # scripts:
 #   post:
 #     - id: flagship-live
diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml
index 3d5c474..6db4a52 100644
--- a/katsu/modules/gnome/gnome-live.yaml
+++ b/katsu/modules/gnome/gnome-live.yaml
@@ -26,7 +26,7 @@ dnf:
   # options:
   #   - --setopt=strict=0
   packages:
-    - "@ultramarine-gnome-product-enviroment"
+    - "@ultramarine-gnome-product-environment"
     - ultramarine-release-gnome
     - ultramarine-release-identity-gnome
 # scripts:
diff --git a/katsu/modules/kde/kde-chromebook.yaml b/katsu/modules/kde/kde-chromebook.yaml
index 91fb671..82fd54d 100644
--- a/katsu/modules/kde/kde-chromebook.yaml
+++ b/katsu/modules/kde/kde-chromebook.yaml
@@ -1,7 +1,7 @@
 builder: dnf
 
 import:
-  - ../chromebook/base.yaml
+  - ../chromebook/base-disk.yaml
 
 distro: Ultramarine CBE KDE 39
 
@@ -25,7 +25,7 @@ dnf:
   # options:
   #   - --setopt=strict=0
   packages:
-    - "@ultramarine-kde-product-enviroment"
+    - "@ultramarine-kde-product-environment"
 # scripts:
 #   post:
 #     - id: flagship-live
diff --git a/katsu/modules/kde/kde-live.yaml b/katsu/modules/kde/kde-live.yaml
index 8e4b6e5..17be002 100644
--- a/katsu/modules/kde/kde-live.yaml
+++ b/katsu/modules/kde/kde-live.yaml
@@ -26,7 +26,7 @@ dnf:
   # options:
   #   - --setopt=strict=0
   packages:
-    - "@ultramarine-kde-product-enviroment"
+    - "@ultramarine-kde-product-environment"
 # scripts:
 #   post:
 #     - id: flagship-live
diff --git a/katsu/modules/pantheon/pantheon-chromebook.yaml b/katsu/modules/pantheon/pantheon-chromebook.yaml
index e4e8c64..5a82b9b 100644
--- a/katsu/modules/pantheon/pantheon-chromebook.yaml
+++ b/katsu/modules/pantheon/pantheon-chromebook.yaml
@@ -1,7 +1,7 @@
 builder: dnf
 
 import:
-  - ../chromebook/base.yaml
+  - ../chromebook/base-disk.yaml
 
 out_file: ultramarine-cbe-pantheon-39.iso
 
@@ -25,7 +25,7 @@ dnf:
   options:
     - --setopt=strict=0
   packages:
-    - "@ultramarine-pantheon-product-enviroment"
+    - "@ultramarine-pantheon-product-environment"
 # scripts:
 #   post:
 #     - id: flagship-live
diff --git a/katsu/modules/pantheon/pantheon-live.yaml b/katsu/modules/pantheon/pantheon-live.yaml
index 8ecb21d..5751c86 100644
--- a/katsu/modules/pantheon/pantheon-live.yaml
+++ b/katsu/modules/pantheon/pantheon-live.yaml
@@ -29,7 +29,7 @@ dnf:
     - gnome-tour
     - setroubleshoot
   packages:
-    - "@ultramarine-pantheon-product-enviroment"
+    - "@ultramarine-pantheon-product-environment"
     - elementary-greeter
     - lightdm
     - seahorse
@@ -39,7 +39,6 @@ dnf:
     - xdg-desktop-portal-xapp
     - ultramarine-backgrounds-gnome
     - rsms-inter-fonts
-
 # scripts:
 #   post:
 #     - id: flagship-live