diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index b3dbb654..d987ccd8 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -52,8 +52,7 @@ jobs:
         env:
           VERBOSE: ${{ github.debug && 'true' || '' }}
         run: |
-          BUILD_DIR=$(realpath $MAIN_PATH)          
-          MAVEN_OPT="-U -B -T 0.3C -s $ROOT_DIR/.settings.xml ${{ inputs.verbose && '--debug' || '' }}"
+          BUILD_DIR=$(realpath $MAIN_PATH)                    
           echo "::notice ::building - stream-applications-build"
           set +e
           $BUILD_DIR/build-folder.sh stream-applications-build install -DskipTests
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 0cca1d82..3d3c67f0 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -203,7 +203,6 @@ jobs:
           CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
         run: |
           ROOT_DIR=$(realpath $PWD)
-          MAVEN_OPT="-U -B -T 0.3C -s $ROOT_DIR/.settings.xml ${{ inputs.verbose && '--debug' || '' }}"
           pushd stream-applications > /dev/null
           echo "::notice ::building - stream-applications-build,functions,applications/stream-applications-core"
           set -e
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 598fb341..5d43cd33 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/build-folder.sh b/build-folder.sh
index acdf7a45..09a5f18b 100755
--- a/build-folder.sh
+++ b/build-folder.sh
@@ -65,7 +65,7 @@ for FOLDER in $FOLDERS; do
   while ((RETRIES >= 0)); do
     echo -e "Resolving dependencies for ${bold}$FOLDER${end}"
     set +e
-    ./mvnw -U -f "$FOLDER" $MAVEN_OPTS dependency:resolve
+    ./mvnw -U -f "$FOLDER" $MAVEN_OPTS -T 0.75C dependency:resolve
     RESULT=$?
     set -e
     if ((RESULT == 0)); then
@@ -82,7 +82,7 @@ if ((RESULT == 0)); then
   for FOLDER in $FOLDERS; do
     echo -e "Maven goals:${bold}-f $FOLDER $MAVEN_GOAL${end}"
     set +e
-    ./mvnw -f "$FOLDER" $MAVEN_OPTS -T 0.3C $MAVEN_GOAL
+    ./mvnw -f "$FOLDER" $MAVEN_OPTS -T 0.25C $MAVEN_GOAL
     RESULT=$?
     set -e
     if ((RESULT != 0)); then
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index b49da961..fc2fe2bf 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -151,7 +151,7 @@
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <parallel>classes</parallel>
-                    <forkCount>0.3C</forkCount>
+                    <forkCount>0.25C</forkCount>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
@@ -329,7 +329,7 @@
                         <version>${maven-surefire-plugin.version}</version>
                         <configuration>
                             <parallel>classes</parallel>
-                            <forkCount>0.3C</forkCount>
+                            <forkCount>0.25C</forkCount>
                             <excludedGroups>integration</excludedGroups>
                         </configuration>
                     </plugin>
@@ -346,7 +346,7 @@
                         <version>${maven-surefire-plugin.version}</version>
                         <configuration>
                             <parallel>classes</parallel>
-                            <forkCount>0.3C</forkCount>
+                            <forkCount>0.25C</forkCount>
                             <groups>integration</groups>
                         </configuration>
                     </plugin>