diff --git a/docs/documentation/pom.xml b/docs/documentation/pom.xml
index 24fe1917d0d..a04c8aded14 100644
--- a/docs/documentation/pom.xml
+++ b/docs/documentation/pom.xml
@@ -27,7 +27,6 @@
         <version.compiler.plugin>3.6.1</version.compiler.plugin>
         <version.jar.plugin>3.0.2</version.jar.plugin>
         <version.install.plugin>2.5.2</version.install.plugin>
-        <version.surefire.plugin>2.22.2</version.surefire.plugin>
         <version.plexus.utils>4.0.0</version.plexus.utils>
     </properties>
 
diff --git a/pom.xml b/pom.xml
index cede4add997..ff56e2d7cef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,8 +176,8 @@
         <jmeter.version>2.10</jmeter.version>
         <junit.version>4.13.2</junit.version>
         <picketlink.version>2.7.0.Final</picketlink.version>
-        <!-- Needs to be aligned with Quarkus, see e.g. https://github.com/quarkusio/quarkus-quickstarts/blob/2.13.5.Final/getting-started-async/pom.xml#L14 -->
-        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
+        <!-- Needs to be aligned with Quarkus, handled in quarkus/set-quarkus-version.sh script -->
+        <version.surefire.plugin>3.5.3</version.surefire.plugin>
         <xml-apis.version>1.4.01</xml-apis.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
         <assertj-core.version>3.22.0</assertj-core.version>
@@ -1343,7 +1343,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${surefire-plugin.version}</version>
+                    <version>${version.surefire.plugin}</version>
                     <configuration>
                         <argLine>-Djava.awt.headless=true ${surefire.memory.settings} ${surefire.system.args} -Duser.language=en -Duser.region=US -XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</argLine>
                         <runOrder>alphabetical</runOrder>
diff --git a/quarkus/server/pom.xml b/quarkus/server/pom.xml
index 876875b135a..8f6b27d75c0 100644
--- a/quarkus/server/pom.xml
+++ b/quarkus/server/pom.xml
@@ -51,7 +51,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
+                <version>${version.surefire.plugin}</version>
                 <configuration>
                     <systemProperties>
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
diff --git a/quarkus/set-quarkus-version.sh b/quarkus/set-quarkus-version.sh
index 41db6659e3e..d7e6122700a 100755
--- a/quarkus/set-quarkus-version.sh
+++ b/quarkus/set-quarkus-version.sh
@@ -47,19 +47,36 @@ if [ "$QUARKUS_BRANCH" == "$DEFAULT_QUARKUS_VERSION" ]; then
 fi
 
 QUARKUS_BOM_URL="https://raw.githubusercontent.com/quarkusio/quarkus/$QUARKUS_BRANCH/bom/application/pom.xml"
+QUARKUS_PARENT_POM_URL="https://raw.githubusercontent.com/quarkusio/quarkus/$QUARKUS_BRANCH/independent-projects/parent/pom.xml"
+
+VERSIONS_FROM_QUARKUS_PARENT=(
+    "version.surefire.plugin"
+)
 
 if ! $(curl --output /dev/null --silent --head --fail "$QUARKUS_BOM_URL"); then
     echo "Failed to resolve version from Quarkus BOM at '$QUARKUS_BOM_URL'"
     exit 1
 fi
 
+if ! $(curl --output /dev/null --silent --head --fail "$QUARKUS_PARENT_POM_URL"); then
+    echo "Failed to resolve version from Quarkus Parent pom.xml at '$QUARKUS_PARENT_POM_URL'"
+    exit 1
+fi
+
 QUARKUS_BOM=$(curl -f -s "$QUARKUS_BOM_URL")
+QUARKUS_PARENT_POM=$(curl -f -s "$QUARKUS_PARENT_POM_URL")
 
 echo "Setting Quarkus version: $QUARKUS_VERSION"
 
 $SCRIPT_DIR/../mvnw -B versions:set-property -f $SCRIPT_DIR/../pom.xml -Dproperty=quarkus.version -DnewVersion="$QUARKUS_VERSION" 1> /dev/null
 $SCRIPT_DIR/../mvnw -B versions:set-property -f $SCRIPT_DIR/../pom.xml -Dproperty=quarkus.build.version -DnewVersion="$QUARKUS_VERSION" 1> /dev/null
 
+for dependency in "${VERSIONS_FROM_QUARKUS_PARENT[@]}"; do
+    VERSION=$(grep -oP "(?<=<$dependency>)[^<]*(?=</$dependency>)" <<< "$QUARKUS_PARENT_POM")
+    echo "Setting $dependency to $VERSION based on the Quarkus Parent pom.xml"
+    $SCRIPT_DIR/../mvnw versions:set-property -f $SCRIPT_DIR/../pom.xml -Dproperty="$dependency" -DnewVersion="$VERSION" 1> /dev/null
+done
+
 DEPENDENCIES_LIST=$(grep -oP '(?<=\</).*(?=\.version\>)' "$SCRIPT_DIR/../pom.xml")
 
 echo "Changing dependencies: $DEPENDENCIES_LIST"