diff --git a/comps-f36.xml.in b/comps-f36.xml.in
index 1c490211..07f42f71 100644
--- a/comps-f36.xml.in
+++ b/comps-f36.xml.in
@@ -680,8 +680,10 @@
     <_description>A set of packages that provide the shared platform for Critical Path functionality on all Fedora spins</_description>
     <default>false</default>
     <uservisible>false</uservisible>
-    <!-- @core is already in the critical path, there is no need to duplicate things from @core here -->
     <packagelist>
+      <!--
+        @core is already in the critical path, there is no need to duplicate things from @core here
+      -->
       <packagereq type="mandatory">dbus-broker</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">initial-setup</packagereq>
diff --git a/comps-f37.xml.in b/comps-f37.xml.in
index c725c3b9..8eb5e962 100644
--- a/comps-f37.xml.in
+++ b/comps-f37.xml.in
@@ -742,8 +742,10 @@
     <_description>A set of packages that provide the shared platform for Critical Path functionality on all Fedora spins</_description>
     <default>false</default>
     <uservisible>false</uservisible>
-    <!-- @core is already in the critical path, there is no need to duplicate things from @core here -->
     <packagelist>
+      <!--
+        @core is already in the critical path, there is no need to duplicate things from @core here
+      -->
       <packagereq type="mandatory">dbus-broker</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">initial-setup</packagereq>
@@ -3018,8 +3020,8 @@
     <packagelist>
       <packagereq arch="x86_64" type="default">alsa-sof-firmware</packagereq>
       <packagereq type="default">amd-gpu-firmware</packagereq>
-      <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">atheros-firmware</packagereq>
+      <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">b43-fwcutter</packagereq>
       <packagereq type="default">b43-openfwwf</packagereq>
       <packagereq type="default">brcmfmac-firmware</packagereq>
diff --git a/comps-f38.xml.in b/comps-f38.xml.in
index 7b8fa45a..a85756d3 100644
--- a/comps-f38.xml.in
+++ b/comps-f38.xml.in
@@ -726,8 +726,10 @@
     <_description>A set of packages that provide the shared platform for Critical Path functionality on all Fedora spins</_description>
     <default>false</default>
     <uservisible>false</uservisible>
-    <!-- @core is already in the critical path, there is no need to duplicate things from @core here -->
     <packagelist>
+      <!--
+        @core is already in the critical path, there is no need to duplicate things from @core here
+      -->
       <packagereq type="mandatory">dbus-broker</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">initial-setup</packagereq>
diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index 28f78a3a..81164b0e 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -726,8 +726,10 @@
     <_description>A set of packages that provide the shared platform for Critical Path functionality on all Fedora spins</_description>
     <default>false</default>
     <uservisible>false</uservisible>
-    <!-- @core is already in the critical path, there is no need to duplicate things from @core here -->
     <packagelist>
+      <!--
+        @core is already in the critical path, there is no need to duplicate things from @core here
+      -->
       <packagereq type="mandatory">dbus-broker</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">initial-setup</packagereq>
@@ -2966,7 +2968,6 @@
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
       <packagereq type="optional">atmel-firmware</packagereq>
-      <packagereq type="optional">zd1211-firmware</packagereq>
       <packagereq arch="aarch64" type="optional">bcm283x-firmware</packagereq>
       <packagereq arch="x86_64" type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>
@@ -2986,6 +2987,7 @@
       <packagereq type="optional">pcsc-lite-ccid</packagereq>
       <packagereq type="optional">radeontop</packagereq>
       <packagereq type="optional">wpan-tools</packagereq>
+      <packagereq type="optional">zd1211-firmware</packagereq>
     </packagelist>
   </group>
   <group>