diff --git a/comps-f35.xml.in b/comps-f35.xml.in
index 85218939..5669997b 100644
--- a/comps-f35.xml.in
+++ b/comps-f35.xml.in
@@ -1128,13 +1128,13 @@
false
false
- pki-ca
- pki-console
- pki-kra
- pki-ocsp
- pki-javadoc
- pki-tks
- pki-tps
+ dogtag-pki-ca
+ dogtag-pki-acme
+ dogtag-pki-kra
+ dogtag-pki-ocsp
+ dogtag-pki-javadoc
+ dogtag-pki-tks
+ dogtag-pki-tps
diff --git a/comps-f36.xml.in b/comps-f36.xml.in
index 85218939..5669997b 100644
--- a/comps-f36.xml.in
+++ b/comps-f36.xml.in
@@ -1128,13 +1128,13 @@
false
false
- pki-ca
- pki-console
- pki-kra
- pki-ocsp
- pki-javadoc
- pki-tks
- pki-tps
+ dogtag-pki-ca
+ dogtag-pki-acme
+ dogtag-pki-kra
+ dogtag-pki-ocsp
+ dogtag-pki-javadoc
+ dogtag-pki-tks
+ dogtag-pki-tps