diff --git a/pom.xml b/pom.xml
index 05ee59738..694a61996 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,90 @@
       </license>
    </licenses>
 
+   <properties>
+      <revision>0-SNAPSHOT</revision>
+      <java.version>17</java.version>
+
+      <spring.boot.version>3.2.2</spring.boot.version>
+      <spring.cloud.version>2023.0.0</spring.cloud.version>
+      <springdoc-openapi.version>2.3.0</springdoc-openapi.version>
+      <spring.plugin.core.version>3.0.0</spring.plugin.core.version>
+      <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
+      <!-- Newer versions needed than defined in Boot -->
+      <!-- Spring boot version overrides - END -->
+
+      <!-- Eclipselink - START -->
+      <eclipselink.version>4.0.2</eclipselink.version>
+      <eclipselink.maven.plugin.version>3.0.0</eclipselink.maven.plugin.version>
+      <!-- Eclipselink - END -->
+
+      <!-- Misc libraries versions - START -->
+      <cron-utils.version>9.2.1</cron-utils.version>
+      <jsoup.version>1.16.1</jsoup.version>
+      <jaxb-api.version>2.3.1</jaxb-api.version>
+      <guava.version>32.1.2-jre</guava.version>
+      <javax.el-api.version>3.0.0</javax.el-api.version>
+      <commons-io.version>2.13.0</commons-io.version>
+      <rsql-parser.version>2.1.0</rsql-parser.version>
+      <io-protostuff.version>1.8.0</io-protostuff.version>
+      <!-- test -->
+      <rabbitmq.http-client.version>5.1.0</rabbitmq.http-client.version>
+      <surefire.forkcount>1</surefire.forkcount>
+      <allure.version>2.24.0</allure.version>
+      <awaitility.version>4.2.0</awaitility.version>
+      <!-- Misc libraries versions - END -->
+
+      <!-- Maven Plugin versions - START -->
+      <maven.scm.plugin.version>2.0.1</maven.scm.plugin.version>
+      <maven.site.plugin.version>3.12.1</maven.site.plugin.version>
+      <maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
+      <maven.failsafe.plugin.version>3.1.2</maven.failsafe.plugin.version>
+      <maven.enforcer.plugin.version>3.3.0</maven.enforcer.plugin.version>
+      <!-- Maven Plugin versions - END -->
+
+      <snapshotDependencyAllowed>true</snapshotDependencyAllowed>
+      <test.jvm.args/>
+
+      <!-- Release - START -->
+      <release.scm.connection>scm:git:git@github.com:eclipse/hawkbit.git</release.scm.connection>
+      <release.scm.developerConnection>scm:git:https://github.com/eclipse/hawkbit.git</release.scm.developerConnection>
+      <release.scm.url>https://github.com/eclipse/hawkbit.git</release.scm.url>
+      <!-- Release - END -->
+
+      <!-- Sonar - START -->
+      <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+      <sonar.organization>bosch-iot-rollouts</sonar.organization>
+      <sonar.projectKey>${project.groupId}:${project.artifactId}</sonar.projectKey>
+      <sonar.branch.name>LOCAL_SCAN</sonar.branch.name>
+      <sonar.qualitygate.wait>true</sonar.qualitygate.wait>
+      <sonar.qualitygate.timeout>600</sonar.qualitygate.timeout>
+      <sonar.links.homepage>https://www.eclipse.org/hawkbit</sonar.links.homepage>
+      <sonar.links.ci>https://circleci.com/gh/eclipse/hawkbit</sonar.links.ci>
+      <sonar.exclusions>
+         **/target/generated-sources/apt/**,**/src/test/**,**/src/main/java/org/eclipse/hawkbit/repository/test/**
+      </sonar.exclusions>
+      <sonar.coverage.exclusions>
+         **/src/main/java/org/eclipse/hawkbit/ui/**,**/target/generated-sources/apt/**,**/src/main/java/org/eclipse/hawkbit/repository/test/**,**/examples/**
+      </sonar.coverage.exclusions>
+      <jacoco.version>0.8.11</jacoco.version>
+      <jacoco.outputDir>${project.build.directory}</jacoco.outputDir>
+      <sonar.coverage.jacoco.xmlReportPaths>
+         ${project.basedir}/../hawkbit-test-report/target/jacoco-aggregate/jacoco.xml,
+         ${project.basedir}/../../hawkbit-test-report/target/jacoco-aggregate/jacoco.xml
+      </sonar.coverage.jacoco.xmlReportPaths>
+      <!-- Sonar - END -->
+
+      <!-- Dash tool integration - START -->
+      <dash.skip>true</dash.skip>
+      <dash.fail>true</dash.fail>
+      <dash.projectId>iot.hawkbit</dash.projectId>
+      <dash.summary>${project.build.directory}/dash/summary</dash.summary>
+      <!-- To automatically create IP Team review requests for identified content call with -Ddash.iplab.token=<token> (do not share your access token) -->
+      <dash.review.summary>${project.build.directory}/dash/review-summary</dash.review.summary>
+      <excludeGroupIds>org.eclipse,org.junit</excludeGroupIds>
+      <!-- Dash tool integration - START -->
+   </properties>
+
    <modules>
       <module>hawkbit-core</module>
       <module>hawkbit-security-core</module>
@@ -136,104 +220,6 @@
       </pluginRepository>
    </pluginRepositories>
 
-   <properties>
-      <revision>0-SNAPSHOT</revision>
-      <java.version>17</java.version>
-      <snapshotDependencyAllowed>true</snapshotDependencyAllowed>
-      <test.jvm.args/>
-
-      <spring.boot.version>3.2.2</spring.boot.version>
-      <spring.cloud.version>2023.0.0</spring.cloud.version>
-      <springdoc-openapi.version>2.3.0</springdoc-openapi.version>
-      <spring.plugin.core.version>3.0.0</spring.plugin.core.version>
-
-
-      <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
-      <!-- Newer versions needed than defined in Boot -->
-      <!-- Fixed dependencies -->
-      <!-- CVE-2022-25857 -->
-<!--      <snakeyaml.version>1.33</snakeyaml.version>-->
-<!--      <logback.version>1.2.13</logback.version>-->
-      <!-- Spring boot version overrides - END -->
-
-      <!-- CVE-2022-45868, fixed in 2.2.200 -->
-<!--      <h2.version>2.2.222</h2.version>-->
-
-      <rabbitmq.http-client.version>5.1.0</rabbitmq.http-client.version>
-
-      <!-- Eclipselink - START -->
-      <eclipselink.version>4.0.2</eclipselink.version>
-      <eclipselink.maven.plugin.version>3.0.0</eclipselink.maven.plugin.version>
-      <!-- Eclipselink - END -->
-
-      <!-- ************************ -->
-      <!-- Maven Plugins -->
-      <!-- ************************ -->
-      <maven.scm.plugin.version>2.0.1</maven.scm.plugin.version>
-      <maven.site.plugin.version>3.12.1</maven.site.plugin.version>
-      <maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
-      <maven.failsafe.plugin.version>3.1.2</maven.failsafe.plugin.version>
-      <maven.enforcer.plugin.version>3.3.0</maven.enforcer.plugin.version>
-
-      <!-- dash tool integration -->
-      <dash.skip>true</dash.skip>
-      <dash.fail>true</dash.fail>
-      <dash.projectId>iot.hawkbit</dash.projectId>
-      <dash.summary>${project.build.directory}/dash/summary</dash.summary>
-      <!-- To automatically create IP Team review requests for identified content call with -Ddash.iplab.token=<token> (do not share your access token) -->
-      <dash.review.summary>${project.build.directory}/dash/review-summary</dash.review.summary>
-      <excludeGroupIds>org.eclipse,org.junit</excludeGroupIds>
-      <!-- ************************ -->
-      <!-- Maven Surefire settings -->
-      <!-- ************************ -->
-
-      <!-- Misc libraries versions - START -->
-      <cron-utils.version>9.2.1</cron-utils.version>
-      <jsoup.version>1.16.1</jsoup.version>
-      <jaxb-api.version>2.3.1</jaxb-api.version>
-      <guava.version>32.1.2-jre</guava.version>
-      <javax.el-api.version>3.0.0</javax.el-api.version>
-      <commons-io.version>2.13.0</commons-io.version>
-      <rsql-parser.version>2.1.0</rsql-parser.version>
-      <io-protostuff.version>1.8.0</io-protostuff.version>
-
-      <!-- test -->
-      <surefire.forkcount>1</surefire.forkcount>
-      <allure.version>2.24.0</allure.version>
-      <awaitility.version>4.2.0</awaitility.version>
-
-      <!-- Misc libraries versions - END -->
-
-      <!-- Release - START -->
-      <release.scm.connection>scm:git:git@github.com:eclipse/hawkbit.git</release.scm.connection>
-      <release.scm.developerConnection>scm:git:https://github.com/eclipse/hawkbit.git</release.scm.developerConnection>
-      <release.scm.url>https://github.com/eclipse/hawkbit.git</release.scm.url>
-      <!-- Release - END -->
-
-      <!-- Sonar - START -->
-      <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-      <sonar.organization>bosch-iot-rollouts</sonar.organization>
-      <sonar.projectKey>${project.groupId}:${project.artifactId}</sonar.projectKey>
-      <sonar.branch.name>LOCAL_SCAN</sonar.branch.name>
-      <sonar.qualitygate.wait>true</sonar.qualitygate.wait>
-      <sonar.qualitygate.timeout>600</sonar.qualitygate.timeout>
-      <sonar.links.homepage>https://www.eclipse.org/hawkbit</sonar.links.homepage>
-      <sonar.links.ci>https://circleci.com/gh/eclipse/hawkbit</sonar.links.ci>
-      <sonar.exclusions>
-         **/target/generated-sources/apt/**,**/src/test/**,**/src/main/java/org/eclipse/hawkbit/repository/test/**
-      </sonar.exclusions>
-      <sonar.coverage.exclusions>
-         **/src/main/java/org/eclipse/hawkbit/ui/**,**/target/generated-sources/apt/**,**/src/main/java/org/eclipse/hawkbit/repository/test/**,**/examples/**
-      </sonar.coverage.exclusions>
-      <jacoco.version>0.8.11</jacoco.version>
-      <jacoco.outputDir>${project.build.directory}</jacoco.outputDir>
-      <sonar.coverage.jacoco.xmlReportPaths>
-         ${project.basedir}/../hawkbit-test-report/target/jacoco-aggregate/jacoco.xml,
-         ${project.basedir}/../../hawkbit-test-report/target/jacoco-aggregate/jacoco.xml
-      </sonar.coverage.jacoco.xmlReportPaths>
-      <!-- Sonar - END -->
-   </properties>
-
    <build>
       <plugins>
          <plugin>