diff --git a/common-ostree.yaml b/common-ostree.yaml
index 05f641d..f5b52f7 100644
--- a/common-ostree.yaml
+++ b/common-ostree.yaml
@@ -1,5 +1,10 @@
 # Manifest common to classic ostree varaints only and not Bootable Containers
 
+# Packages only included in the legacy ostree variants and not in Bootable
+# Containers
+packages:
+  - ostree-grub2
+
 # We do not include any version of DNF in the classic ostree Atomic Desktops
 # See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora
 exclude-packages:
diff --git a/common-packages.yaml b/common-packages.yaml
index 7d8e07b..a0a7401 100644
--- a/common-packages.yaml
+++ b/common-packages.yaml
@@ -124,7 +124,6 @@ packages:
   - openssh-clients
   - openssh-server
   - orca
-  - ostree-grub2
   - pam_afs_session
   - paps
   - passwdqc
diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index ff44126..4092841 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -106,6 +106,9 @@ exclude_list:
     - cups-pk-helper
     # For now...
     - ghostscript
+  workstation-ostree-support:
+    # Now only included in the legacy ostree variants
+    - ostree-grub2
 
 # Desktop environment specific exclude lists
 desktop_exclude_list: