diff --git a/pom.xml b/pom.xml
index b4d433696780aca8b264d24b9d1ddb1694cee426..4b88ec5b930f2578fb31299a0991b6006d75f2f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,14 +12,13 @@
   ~ See the Licence for the specific language governing permissions and limitations under the Licence.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.europa.ec.edelivery</groupId>
     <artifactId>smp-modules</artifactId>
     <packaging>pom</packaging>
     <name>SMP</name>
-    <version>5.0-SNAPSHOT</version>
+    <version>5.0-RC2-SNAPSHOT</version>
 
     <modules>
         <module>smp-angular</module>
diff --git a/smp-aggregator/pom.xml b/smp-aggregator/pom.xml
index f33169c312f9a219c81d02fcbfd0a9979fd244d9..91059f17f980cd26647bb3eb7db0a2a4a1a7c1d3 100644
--- a/smp-aggregator/pom.xml
+++ b/smp-aggregator/pom.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>smp-modules</artifactId>
         <groupId>eu.europa.ec.edelivery</groupId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>smp-aggregator</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>eu.europa.ec.edelivery</groupId>
-            <artifactId>smp-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>eu.europa.ec.edelivery</groupId>
             <artifactId>smp-spi</artifactId>
@@ -51,4 +44,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/smp-angular/pom.xml b/smp-angular/pom.xml
index 3933b07fccfe6d173b6c83d4a21102ba213f07cf..01cdbcdba173c66e26056b6c2e1364fbdb06dae5 100644
--- a/smp-angular/pom.xml
+++ b/smp-angular/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.europa.ec.edelivery</groupId>
     <artifactId>smp-modules</artifactId>
-    <version>5.0-SNAPSHOT</version>
+    <version>5.0-RC2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>smp-angular</artifactId>
diff --git a/smp-examples/pom.xml b/smp-examples/pom.xml
index d2736ea0ba1918fb777bd44f752db175765dae3f..328551ec82a5e8e131ef9cc665c5ec501da2795d 100644
--- a/smp-examples/pom.xml
+++ b/smp-examples/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>smp-examples</artifactId>
diff --git a/smp-examples/smp-spi-payload-validation-example/pom.xml b/smp-examples/smp-spi-payload-validation-example/pom.xml
index d0bd80981367e14a8049d2d164f150ba6083bdcf..4c5ab691b9539846d4bc89229ef086cd8d878f72 100644
--- a/smp-examples/smp-spi-payload-validation-example/pom.xml
+++ b/smp-examples/smp-spi-payload-validation-example/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/smp-resource-extensions/oasis-smp-spi/pom.xml b/smp-resource-extensions/oasis-smp-spi/pom.xml
index 4865eeb07a697d9fe8b2350ccb836e7d4aa0ec50..90cce1420e80773d507cdd69d5175087bcf258b9 100644
--- a/smp-resource-extensions/oasis-smp-spi/pom.xml
+++ b/smp-resource-extensions/oasis-smp-spi/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/smp-resource-extensions/pom.xml b/smp-resource-extensions/pom.xml
index 8b4712d49c138674cee1d2b8914280e7f9dfc449..06ce67c04d063d8b765853c682dadbf02fe7411a 100644
--- a/smp-resource-extensions/pom.xml
+++ b/smp-resource-extensions/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>smp-resource-extensions</artifactId>
diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index f4286b48378939da348f17b15759082d8a54ba81..8e2303b931bbbc7d2b842c557c5030e7681efef8 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>smp-server-library</artifactId>
diff --git a/smp-soapui-tests/pom.xml b/smp-soapui-tests/pom.xml
index 9a2cb0bb5e9eeb8e0db466f5a6682ecf6f94ec47..c096d30d64b77c8c5dc96636dc1a413f01156e33 100644
--- a/smp-soapui-tests/pom.xml
+++ b/smp-soapui-tests/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>smp-soapui-tests</artifactId>
@@ -17,8 +16,8 @@
         <!-- Only selected modules are deployed -->
         <maven.deploy.skip>false</maven.deploy.skip>
         <url>http://localhost:8080/smp</url>
-        <SMPAdminUser/>
-        <SMPAdminPassword/>
+        <SMPAdminUser />
+        <SMPAdminPassword />
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- the soap ui specific dependencies -->
diff --git a/smp-spi/pom.xml b/smp-spi/pom.xml
index db038612467fb332164bdca8f84a4021dc7da948..f93de7ac3df8fb66cf8f192b7e286633a07b575f 100644
--- a/smp-spi/pom.xml
+++ b/smp-spi/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>smp-spi</artifactId>
diff --git a/smp-springboot/pom.xml b/smp-springboot/pom.xml
index 2eaad8cdcce885dfbd360b61d188687953580333..e84f5f53af717131bd6ca6834703e257ca9e2a8b 100644
--- a/smp-springboot/pom.xml
+++ b/smp-springboot/pom.xml
@@ -14,13 +14,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>smp-springboot</artifactId>
diff --git a/smp-webapp/pom.xml b/smp-webapp/pom.xml
index c511d272ad563a473cc6ae6ed3319499b56fc8ca..9d23d03fa152a5aa51700f7a7e23c2ed0dc42dd5 100644
--- a/smp-webapp/pom.xml
+++ b/smp-webapp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-modules</artifactId>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.0-RC2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>smp</artifactId>