diff --git a/clusterbench-common/pom.xml b/clusterbench-common/pom.xml
index adfedaa1..a2c95076 100644
--- a/clusterbench-common/pom.xml
+++ b/clusterbench-common/pom.xml
@@ -22,10 +22,9 @@
     </properties>
 
     <dependencies>
-        <!-- Jakarta dependencies -->
         <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -33,9 +32,10 @@
             <artifactId>jakarta.ejb-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- Jakarta dependencies -->
         <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <!-- Test dependencies -->
diff --git a/clusterbench-ee10-web/pom.xml b/clusterbench-ee10-web/pom.xml
index 66e887c8..8b8f66fc 100644
--- a/clusterbench-ee10-web/pom.xml
+++ b/clusterbench-ee10-web/pom.xml
@@ -26,25 +26,14 @@
 
     <dependencies>
         <!-- Project dependencies -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>clusterbench-ee10-ejb</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>clusterbench-common</artifactId>
             <scope>compile</scope>
         </dependency>
-        <!-- Jakarta dependencies -->
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>clusterbench-ee10-ejb</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -57,10 +46,15 @@
             <artifactId>jakarta.faces-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- @org.wildfly.clustering.web.annotation.Immutable -->
         <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-clustering-web-api</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Jakarta dependencies -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <!-- /debug servlet -->
@@ -69,6 +63,12 @@
             <artifactId>jgroups</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- @org.wildfly.clustering.web.annotation.Immutable -->
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-web-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index e0616450..2c51bfef 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -24,13 +24,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.junit</groupId>
-                <artifactId>junit-bom</artifactId>
-                <version>${version.org.junit.jupiter}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-bom</artifactId>
@@ -45,6 +38,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${version.org.junit.jupiter}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/integration-tests/tomcat-10.1/pom.xml b/integration-tests/tomcat-10.1/pom.xml
index d95364c6..f17534c9 100644
--- a/integration-tests/tomcat-10.1/pom.xml
+++ b/integration-tests/tomcat-10.1/pom.xml
@@ -22,10 +22,10 @@
     </properties>
 
     <dependencies>
+        <!-- Needed by ARQ -->
         <dependency>
-            <groupId>org.jboss.test</groupId>
-            <artifactId>clusterbench-ee10-web</artifactId>
-            <classifier>classes</classifier>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -49,10 +49,10 @@
             <artifactId>arquillian-junit-container</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- Needed by ARQ -->
         <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>org.jboss.test</groupId>
+            <artifactId>clusterbench-ee10-web</artifactId>
+            <classifier>classes</classifier>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/wildfly/pom.xml b/integration-tests/wildfly/pom.xml
index 781ee4d5..be1725ca 100644
--- a/integration-tests/wildfly/pom.xml
+++ b/integration-tests/wildfly/pom.xml
@@ -24,16 +24,16 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.junit</groupId>
-                <artifactId>junit-bom</artifactId>
-                <version>${version.org.junit.jupiter}</version>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>${version.org.jboss.arquillian}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.jboss.arquillian</groupId>
-                <artifactId>arquillian-bom</artifactId>
-                <version>${version.org.jboss.arquillian}</version>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${version.org.junit.jupiter}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -42,23 +42,23 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.junit5</groupId>
-            <artifactId>arquillian-junit5-core</artifactId>
+            <artifactId>arquillian-junit5-container</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.junit5</groupId>
-            <artifactId>arquillian-junit5-container</artifactId>
+            <artifactId>arquillian-junit5-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index a3735249..d448ae29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,13 +68,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-clustering-web-api</artifactId>
-                <!-- TODO this should be managed by the BOM! -->
-                <version>${version.org.wildfly}</version>
-                <scope>provided</scope>
-            </dependency>
             <!-- Only for Dependabot, this is never referenced via Maven dependencies -->
             <dependency>
                 <groupId>org.wildfly.cloud</groupId>
@@ -82,6 +75,13 @@
                 <version>${version.org.wildfly.cloud-feature-pack}</version>
                 <type>zip</type>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-clustering-web-api</artifactId>
+                <!-- TODO this should be managed by the BOM! -->
+                <version>${version.org.wildfly}</version>
+                <scope>provided</scope>
+            </dependency>
             <!-- Test dependencies -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>