diff --git a/base/acme/pom.xml b/base/acme/pom.xml
index 6f9fc1c908f..55ead0d8d49 100644
--- a/base/acme/pom.xml
+++ b/base/acme/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-acme</artifactId>
diff --git a/base/ca/pom.xml b/base/ca/pom.xml
index 09be7e013a3..9f27980985d 100644
--- a/base/ca/pom.xml
+++ b/base/ca/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-ca</artifactId>
diff --git a/base/common/pom.xml b/base/common/pom.xml
index 17002b22e33..a9afeb10f3b 100644
--- a/base/common/pom.xml
+++ b/base/common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-common</artifactId>
diff --git a/base/console/pom.xml b/base/console/pom.xml
index 43c769dd426..34d6d782441 100644
--- a/base/console/pom.xml
+++ b/base/console/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-console</artifactId>
diff --git a/base/est/pom.xml b/base/est/pom.xml
index 89e1c5c54e8..3ffcafbb4d5 100644
--- a/base/est/pom.xml
+++ b/base/est/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-est</artifactId>
diff --git a/base/kra/pom.xml b/base/kra/pom.xml
index 87d82266a0a..8bec3de882f 100644
--- a/base/kra/pom.xml
+++ b/base/kra/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-kra</artifactId>
diff --git a/base/ocsp/pom.xml b/base/ocsp/pom.xml
index 7c280e0165e..34d47114287 100644
--- a/base/ocsp/pom.xml
+++ b/base/ocsp/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-ocsp</artifactId>
diff --git a/base/pom.xml b/base/pom.xml
index 28a9a4a0946..924b4aa1cbd 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-base-parent</artifactId>
diff --git a/base/server-webapp/pom.xml b/base/server-webapp/pom.xml
index 99093b10bdb..05a430d4bae 100644
--- a/base/server-webapp/pom.xml
+++ b/base/server-webapp/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-server-webapp</artifactId>
diff --git a/base/server/pom.xml b/base/server/pom.xml
index e742bdd28b5..3a70bac1983 100644
--- a/base/server/pom.xml
+++ b/base/server/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-server</artifactId>
diff --git a/base/tks/pom.xml b/base/tks/pom.xml
index 69e62dc0ba1..2d59da41f88 100644
--- a/base/tks/pom.xml
+++ b/base/tks/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tks</artifactId>
diff --git a/base/tomcat-9.0/pom.xml b/base/tomcat-9.0/pom.xml
index a6456ee7f4a..8bdd05843fd 100644
--- a/base/tomcat-9.0/pom.xml
+++ b/base/tomcat-9.0/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tomcat-9.0</artifactId>
diff --git a/base/tomcat/pom.xml b/base/tomcat/pom.xml
index d85cef673f1..bdbdcb7b1d4 100644
--- a/base/tomcat/pom.xml
+++ b/base/tomcat/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tomcat</artifactId>
diff --git a/base/tools/pom.xml b/base/tools/pom.xml
index c7185c6dd63..7c3a38a21e7 100644
--- a/base/tools/pom.xml
+++ b/base/tools/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tools</artifactId>
diff --git a/base/tps/pom.xml b/base/tps/pom.xml
index ff07b239f80..61926b08efd 100644
--- a/base/tps/pom.xml
+++ b/base/tps/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.5.1-SNAPSHOT</version>
+        <version>11.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tps</artifactId>
diff --git a/pki.spec b/pki.spec
index 026d388b14b..8ffc6dc5a2b 100644
--- a/pki.spec
+++ b/pki.spec
@@ -9,7 +9,7 @@ Name:             pki
 # Upstream version number:
 %global           major_version 11
 %global           minor_version 5
-%global           update_version 1
+%global           update_version 2
 
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
@@ -1209,7 +1209,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}.xml
 %endif
 
 %if %{with base}
@@ -1235,7 +1235,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-java.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-java.xml
 
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-tools.xml"
 xmlstarlet edit --inplace \
@@ -1245,7 +1245,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-tools.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-tools.xml
 %endif
 
 %if %{with server}
@@ -1261,7 +1261,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-server.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-server.xml
 %endif
 
 %if %{with ca}
@@ -1273,7 +1273,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-ca.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-ca.xml
 %endif
 
 %if %{with kra}
@@ -1285,7 +1285,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-kra.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-kra.xml
 %endif
 
 %if %{with ocsp}
@@ -1297,7 +1297,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-ocsp.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-ocsp.xml
 %endif
 
 %if %{with tks}
@@ -1309,7 +1309,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-tks.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-tks.xml
 %endif
 
 %if %{with tps}
@@ -1321,7 +1321,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-tps.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-tps.xml
 %endif
 
 %if %{with acme}
@@ -1333,7 +1333,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-acme.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-acme.xml
 %endif
 
 %if %{with est}
@@ -1345,7 +1345,7 @@ xmlstarlet edit --inplace \
     -d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
     -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
-    %{buildroot}%{_datadir}/maven-metadata/pki-pki-est.xml
+    %{buildroot}%{_datadir}/maven-metadata/%{name}-pki-est.xml
 %endif
 
 # with deps
diff --git a/pom.xml b/pom.xml
index 396b2e9efd5..3052d37ad80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dogtagpki.pki</groupId>
     <artifactId>pki-parent</artifactId>
-    <version>11.5.1-SNAPSHOT</version>
+    <version>11.5.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>