diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index 71281058e3d2fc9b3fd13f5acea56deaab0c1fc2..ef77c7a9c625259b0309eeda92c0677b11d66820 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -415,7 +415,7 @@
       <packagereq variant="AppStream">plymouth-system-theme</packagereq>
       <packagereq variant="AppStream">sane-backends-drivers-scanners</packagereq>
       <packagereq variant="AppStream">rocky-backgrounds</packagereq>
-      <packagereq variant="AppStream">rocky-flatpak-repo</packagereq>
+      <packagereq variant="AppStream">redhat-flatpak-repo</packagereq>
       <packagereq variant="AppStream">tracker</packagereq>
       <packagereq variant="AppStream">tracker-miners</packagereq>
       <packagereq variant="AppStream">xdg-desktop-portal</packagereq>
@@ -1968,7 +1968,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">rocky-flatpak-preinstall-thunderbird</packagereq>
+      <packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -1978,7 +1978,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>rocky-flatpak-preinstall-firefox</packagereq>
+      <packagereq>redhat-flatpak-preinstall-firefox</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 2fc1f90ecf8f06625866f9b9656d794163a7ab03..e0ef2753376f8f5a67e7a0ece43b4fa4b9192e0a 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -421,7 +421,7 @@
       <rhel_only><packagereq variant="AppStream">redhat-backgrounds</packagereq></rhel_only>
       <rocky_only><packagereq variant="AppStream">rocky-backgrounds</packagereq></rocky_only>
       <centos_only><packagereq variant="AppStream">centos-backgrounds</packagereq></centos_only>
-      <packagereq variant="AppStream">rocky-flatpak-repo</packagereq>
+      <packagereq variant="AppStream">redhat-flatpak-repo</packagereq>
       <packagereq variant="AppStream">tracker</packagereq>
       <packagereq variant="AppStream">tracker-miners</packagereq>
       <packagereq variant="AppStream">xdg-desktop-portal</packagereq>
@@ -2035,7 +2035,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">rocky-flatpak-preinstall-thunderbird</packagereq>
+      <packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -2045,7 +2045,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>rocky-flatpak-preinstall-firefox</packagereq>
+      <packagereq>redhat-flatpak-preinstall-firefox</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
diff --git a/scripts/sync-from-upstream-10 b/scripts/sync-from-upstream-10
index b7b4b16fedfde092a6dde4f7853132d2d5bbfef8..d3a0509170ddc5b97b7c5780b7cb5da34e1eb18b 100755
--- a/scripts/sync-from-upstream-10
+++ b/scripts/sync-from-upstream-10
@@ -18,7 +18,6 @@ while read -r pattern; do
   sscript+="$pattern;"
 done <<EOF
 s/>redhat-release/>rocky-release/g
-s/>redhat-flatpak/>rocky-flatpak/g
 s/Red Hat Enterprise Linux/Rocky Linux/g
 s/RHEL/Rocky Linux/g
 s/Red Hat, Inc./Rocky Enterprise Software Foundation/g
@@ -33,6 +32,15 @@ sed -i "$sscript" "${COMPS_ROCKY}"
 #EOF
 #sed -Ei "$mscript" "${COMPS_ROCKY}"
 
+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
+EOF
+sed -Ei "$cscript" "${COMPS_ROCKY}"
+
 echo "Making sure some packages are RHEL only"
 while read -r pattern; do
   bscript+="$pattern;"