diff --git a/isos/justfile b/isos/justfile
index 716df58..92ab57c 100644
--- a/isos/justfile
+++ b/isos/justfile
@@ -75,6 +75,6 @@ build product image update_ref: prep
     --cachedir=$(pwd)/cache \
     $(pwd)/out
 
-build-ultramarine variant: (build "ultramarine" "docker://ghcr.io/ultramarine-linux/ultramarine-" + variant + ":" + ultramarine_version "ostree-unverified-image:docker://ghcr.io/ultramarine-linux/" + variant + ":" + ultramarine_version)
-build-tau variant: (build "tau" "docker://ghcr.io/ultramarine-linux/tau-" + variant + ":" + tau_version "ostree-unverified-image:docker://ghcr.io/ultramarine-linux/" + variant + ":" + tau_version)
+build-ultramarine variant: (build "ultramarine" "docker://ghcr.io/ultramarine-linux/ultramarine-" + variant + ":" + ultramarine_version "ostree-unverified-image:docker://ghcr.io/ultramarine-" + variant + ":" + ultramarine_version)
+build-tau variant: (build "tau" "docker://ghcr.io/ultramarine-linux/tau-" + variant + ":" + tau_version "ostree-unverified-image:docker://ghcr.io/ultramarine-linux/tau-" + variant + ":" + tau_version)
 
diff --git a/ultramarine/base.yaml b/ultramarine/base.yaml
index 65d4def..0f2e989 100644
--- a/ultramarine/base.yaml
+++ b/ultramarine/base.yaml
@@ -20,3 +20,4 @@ repos:
 
 packages:
   - ultramarine-release-identity-basic
+  - ultramarine-release-basic
diff --git a/ultramarine/flagship.yaml b/ultramarine/flagship.yaml
index 0d670c8..c78571b 100644
--- a/ultramarine/flagship.yaml
+++ b/ultramarine/flagship.yaml
@@ -29,3 +29,7 @@ groups:
       - PackageKit-command-not-found
       - PackageKit-gtk3-module
   - id: ultramarine-flagship-product
+
+packages:
+  - ultramarine-release-identity-flagship
+  - ultramarine-release-flagship
diff --git a/ultramarine/gnome.yaml b/ultramarine/gnome.yaml
index 5694c9d..7947e01 100644
--- a/ultramarine/gnome.yaml
+++ b/ultramarine/gnome.yaml
@@ -30,3 +30,12 @@ groups:
       - PackageKit-command-not-found
       - PackageKit-gtk3-module
   - id: ultramarine-gnome-product
+
+packages:
+  - ultramarine-release-identity-gnome
+  - ultramarine-release-gnome
+  - ultramarine-gnome-filesystem
+  - pop-launcher
+  - system76-scheduler
+  - gnome-shell-extension-pop-shell
+  - gnome-shell-extension-pop-shell-shortcut-overrides
diff --git a/ultramarine/kde.yaml b/ultramarine/kde.yaml
index 17741d4..05acd9a 100644
--- a/ultramarine/kde.yaml
+++ b/ultramarine/kde.yaml
@@ -30,3 +30,8 @@ groups:
       - PackageKit-command-not-found
       - PackageKit-gtk3-module
   - id: ultramarine-kde-product
+
+packages:
+  - ultramarine-release-identity-kde
+  - ultramarine-release-kde
+  - ultramarine-plasma-theme
diff --git a/ultramarine/pantheon.yaml b/ultramarine/pantheon.yaml
index 815622e..3e9b569 100644
--- a/ultramarine/pantheon.yaml
+++ b/ultramarine/pantheon.yaml
@@ -30,3 +30,7 @@ groups:
       - PackageKit-command-not-found
       - PackageKit-gtk3-module
   - id: ultramarine-pantheon-product
+
+packages:
+  - ultramarine-release-identity-pantheon
+  - ultramarine-release-pantheon