diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index ef77c7a9c625259b0309eeda92c0677b11d66820..b9553569cb352460c4b5980408009c0863100d3c 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -1968,7 +1968,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq>
+      <packagereq type="optional">thunderbird</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -1978,7 +1978,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>redhat-flatpak-preinstall-firefox</packagereq>
+      <packagereq>firefox</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index e0ef2753376f8f5a67e7a0ece43b4fa4b9192e0a..2c498a662ca6bba4368aa3995784718199ce19d8 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -2035,7 +2035,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq>
+      <rhel_only><packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq></rhel_only>
+      <centos_only><packagereq type="optional">thunderbird</packagereq></centos_only>
+      <rocky_only><packagereq type="optional">thunderbird</packagereq></rocky_only>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -2045,7 +2047,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>redhat-flatpak-preinstall-firefox</packagereq>
+      <rhel_only><packagereq>redhat-flatpak-preinstall-firefox</packagereq></rhel_only>
+      <centos_only><packagereq>firefox</packagereq></centos_only>
+      <rocky_only><packagereq>firefox</packagereq></rocky_only>
     </packagelist>
   </group>
   <group variant="AppStream">
diff --git a/scripts/sync-from-upstream-10 b/scripts/sync-from-upstream-10
index d3a0509170ddc5b97b7c5780b7cb5da34e1eb18b..eea9bb85c85805879353b84d301565d14f2fa4b0 100755
--- a/scripts/sync-from-upstream-10
+++ b/scripts/sync-from-upstream-10
@@ -36,8 +36,8 @@ echo "Making sure some packages are Rocky Linux and CentOS only"
 while read -r pattern; do
   cscript+="$pattern;"
 done <<EOF
-/<centos_only><packagereq>firefox<\/packagereq><\/centos_only>/ s/$/\n            <rocky_only><packagereq>firefox<\/packagereq><\/rocky_only>/g
-/<centos_only><packagereq type="optional">thunderbird<\/packagereq><\/centos_only>/ s/$/\n            <rocky_only><packagereq type="optional">thunderbird<\/packagereq><\/rocky_only>/g
+/<centos_only><packagereq>firefox<\/packagereq><\/centos_only>/ s/$/\n      <rocky_only><packagereq>firefox<\/packagereq><\/rocky_only>/g
+/<centos_only><packagereq type="optional">thunderbird<\/packagereq><\/centos_only>/ s/$/\n      <rocky_only><packagereq type="optional">thunderbird<\/packagereq><\/rocky_only>/g
 EOF
 sed -Ei "$cscript" "${COMPS_ROCKY}"