diff --git a/c6-i386-comps.xml b/c6-i386-comps.xml
index aaa31ec..674e6db 100644
--- a/c6-i386-comps.xml
+++ b/c6-i386-comps.xml
@@ -992,6 +992,7 @@
       <packagereq type="optional">brltty</packagereq>
       <packagereq type="optional">chrony</packagereq>
       <packagereq type="optional">convmv</packagereq>
+      <packagereq type="optional">cpuid</packagereq>
       <packagereq type="optional">cpupowerutils</packagereq>
       <packagereq type="optional">cryptsetup-reencrypt</packagereq>
       <packagereq type="optional">device-mapper-persistent-data</packagereq>
@@ -1034,6 +1035,7 @@
       <packagereq type="optional">x86info</packagereq>
       <packagereq type="optional">yum-plugin-aliases</packagereq>
       <packagereq type="optional">yum-plugin-changelog</packagereq>
+      <packagereq type="optional">yum-plugin-downloadonly</packagereq>
       <packagereq type="optional">yum-plugin-ovl</packagereq>
       <packagereq type="optional">yum-plugin-protect-packages</packagereq>
       <packagereq type="optional">yum-plugin-tmprepo</packagereq>
@@ -6430,13 +6432,13 @@
       <packagereq type="default">libmlx5</packagereq>
       <packagereq type="default">libmthca</packagereq>
       <packagereq type="default">libnes</packagereq>
+      <packagereq type="default">libocrdma</packagereq>
       <packagereq type="default">rds-tools</packagereq>
       <packagereq type="optional">compat-dapl</packagereq>
       <packagereq type="optional">glusterfs-rdma</packagereq>
       <packagereq type="optional">infiniband-diags</packagereq>
       <packagereq type="optional">libibcommon</packagereq>
       <packagereq type="optional">libiwpm</packagereq>
-      <packagereq type="optional">libocrdma</packagereq>
       <packagereq type="optional">mstflint</packagereq>
       <packagereq type="optional">opensm</packagereq>
       <packagereq type="optional">perftest</packagereq>
diff --git a/c6-x86_64-comps.xml b/c6-x86_64-comps.xml
index 1a6fede..661ff73 100644
--- a/c6-x86_64-comps.xml
+++ b/c6-x86_64-comps.xml
@@ -991,7 +991,9 @@
       <packagereq type="optional">audispd-plugins</packagereq>
       <packagereq type="optional">brltty</packagereq>
       <packagereq type="optional">chrony</packagereq>
+      <packagereq type="optional">cloud-init</packagereq>
       <packagereq type="optional">convmv</packagereq>
+      <packagereq type="optional">cpuid</packagereq>
       <packagereq type="optional">cpupowerutils</packagereq>
       <packagereq type="optional">cryptsetup-reencrypt</packagereq>
       <packagereq type="optional">device-mapper-persistent-data</packagereq>
@@ -1034,6 +1036,7 @@
       <packagereq type="optional">x86info</packagereq>
       <packagereq type="optional">yum-plugin-aliases</packagereq>
       <packagereq type="optional">yum-plugin-changelog</packagereq>
+      <packagereq type="optional">yum-plugin-downloadonly</packagereq>
       <packagereq type="optional">yum-plugin-ovl</packagereq>
       <packagereq type="optional">yum-plugin-protect-packages</packagereq>
       <packagereq type="optional">yum-plugin-tmprepo</packagereq>
@@ -6512,13 +6515,13 @@
       <packagereq type="default">libmlx5</packagereq>
       <packagereq type="default">libmthca</packagereq>
       <packagereq type="default">libnes</packagereq>
+      <packagereq type="default">libocrdma</packagereq>
       <packagereq type="default">rds-tools</packagereq>
       <packagereq type="optional">compat-dapl</packagereq>
       <packagereq type="optional">glusterfs-rdma</packagereq>
       <packagereq type="optional">infiniband-diags</packagereq>
       <packagereq type="optional">libibcommon</packagereq>
       <packagereq type="optional">libiwpm</packagereq>
-      <packagereq type="optional">libocrdma</packagereq>
       <packagereq type="optional">mstflint</packagereq>
       <packagereq type="optional">opensm</packagereq>
       <packagereq type="optional">perftest</packagereq>