diff --git a/prepopulate.json b/prepopulate.json
index 2413cfe..68d4d96 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -680,7 +680,6 @@
         "dovecot.aarch64"
       ],
       "dpdk": [
-        "dpdk-devel.aarch64",
         "dpdk-doc.noarch",
         "dpdk-tools.aarch64",
         "dpdk.aarch64"
@@ -7169,7 +7168,6 @@
         "dovecot.ppc64le"
       ],
       "dpdk": [
-        "dpdk-devel.ppc64le",
         "dpdk-doc.noarch",
         "dpdk-tools.ppc64le",
         "dpdk.ppc64le"
@@ -20363,7 +20361,6 @@
         "dovecot.x86_64"
       ],
       "dpdk": [
-        "dpdk-devel.x86_64",
         "dpdk-doc.noarch",
         "dpdk-tools.x86_64",
         "dpdk.x86_64"
diff --git a/prepopulate.yaml b/prepopulate.yaml
index 63718bb..7bb852d 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -535,7 +535,6 @@ AppStream:
     - dovecot-pigeonhole.aarch64
     - dovecot.aarch64
     dpdk:
-    - dpdk-devel.aarch64
     - dpdk-doc.noarch
     - dpdk-tools.aarch64
     - dpdk.aarch64
@@ -2721,8 +2720,8 @@ AppStream:
     - lorax-lmc-virt.aarch64
     - lorax-templates-generic.aarch64
     - lorax.aarch64
-    lorax-templates-rocky:
-    - lorax-templates-rocky.noarch
+    lorax-templates-rhel:
+    - lorax-templates-rhel.noarch
     lpsolve:
     - lpsolve.aarch64
     lshw:
@@ -4007,10 +4006,6 @@ AppStream:
     redhat-rpm-config:
     - kernel-rpm-macros.noarch
     - redhat-rpm-config.noarch
-    redhat-support-lib-python:
-    - redhat-support-lib-python.noarch
-    redhat-support-tool:
-    - redhat-support-tool.noarch
     redland:
     - redland.aarch64
     rest:
@@ -5522,7 +5517,6 @@ AppStream:
     - dovecot-pigeonhole.ppc64le
     - dovecot.ppc64le
     dpdk:
-    - dpdk-devel.ppc64le
     - dpdk-doc.noarch
     - dpdk-tools.ppc64le
     - dpdk.ppc64le
@@ -7846,8 +7840,8 @@ AppStream:
     - lorax-lmc-virt.ppc64le
     - lorax-templates-generic.ppc64le
     - lorax.ppc64le
-    lorax-templates-rocky:
-    - lorax-templates-rocky.noarch
+    lorax-templates-rhel:
+    - lorax-templates-rhel.noarch
     lpsolve:
     - lpsolve.ppc64le
     lshw:
@@ -9138,10 +9132,6 @@ AppStream:
     redhat-rpm-config:
     - kernel-rpm-macros.noarch
     - redhat-rpm-config.noarch
-    redhat-support-lib-python:
-    - redhat-support-lib-python.noarch
-    redhat-support-tool:
-    - redhat-support-tool.noarch
     redland:
     - redland.ppc64le
     rest:
@@ -12769,8 +12759,8 @@ AppStream:
     - lorax-lmc-virt.s390x
     - lorax-templates-generic.s390x
     - lorax.s390x
-    lorax-templates-rocky:
-    - lorax-templates-rocky.noarch
+    lorax-templates-rhel:
+    - lorax-templates-rhel.noarch
     lpsolve:
     - lpsolve.s390x
     lshw:
@@ -14034,10 +14024,6 @@ AppStream:
     redhat-rpm-config:
     - kernel-rpm-macros.noarch
     - redhat-rpm-config.noarch
-    redhat-support-lib-python:
-    - redhat-support-lib-python.noarch
-    redhat-support-tool:
-    - redhat-support-tool.noarch
     redland:
     - redland.s390x
     rest:
@@ -15713,7 +15699,6 @@ AppStream:
     - dovecot-pigeonhole.x86_64
     - dovecot.x86_64
     dpdk:
-    - dpdk-devel.x86_64
     - dpdk-doc.noarch
     - dpdk-tools.x86_64
     - dpdk.x86_64
@@ -18665,8 +18650,8 @@ AppStream:
     - lorax-lmc-virt.x86_64
     - lorax-templates-generic.x86_64
     - lorax.x86_64
-    lorax-templates-rocky:
-    - lorax-templates-rocky.noarch
+    lorax-templates-rhel:
+    - lorax-templates-rhel.noarch
     lpsolve:
     - lpsolve.x86_64
     lshw:
@@ -20219,10 +20204,6 @@ AppStream:
     redhat-rpm-config:
     - kernel-rpm-macros.noarch
     - redhat-rpm-config.noarch
-    redhat-support-lib-python:
-    - redhat-support-lib-python.noarch
-    redhat-support-tool:
-    - redhat-support-tool.noarch
     redland:
     - redland.i686
     - redland.x86_64