diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index aacd2fe5..97ff05a4 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -210,17 +210,18 @@ jobs:
           VERBOSE: ${{ inputs.verbose }}
         run: |
           ROOT_DIR=$(realpath $PWD)
+          MAVEN_OPT="-B -T 1C -s $ROOT_DIR/.settings.xml ${{ inputs.verbose && '--debug' || '' }}"
           echo "::notice ::building - stream-applications-build"
           set -e
-          $ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f stream-applications-build
+          $ROOT_DIR/mvnw $MAVEN_OPT deploy -f stream-applications-build
           set +e
           echo "::notice ::building - functions"
           set -e
-          $ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -T 1.5C -s $ROOT_DIR/.settings.xml deploy -f functions
+          $ROOT_DIR/mvnw $MAVEN_OPT deploy -f functions
           set +e
           echo "::notice ::building - stream-applications-core"
           set -e
-          $ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f applications/stream-applications-core
+          $ROOT_DIR/mvnw $MAVEN_OPT deploy -f applications/stream-applications-core
           set +e
           echo "::notice ::core build completed"
   # Build and tests apps and publishes to repo and creates container
diff --git a/build-app.sh b/build-app.sh
index 064e116e..3c3f4fb6 100755
--- a/build-app.sh
+++ b/build-app.sh
@@ -29,8 +29,11 @@ check_env CI_DEPLOY_PASSWORD
 
 if [ "$VERBOSE" == "true" ]; then
   MAVEN_OPT=--debug
+fi
+if [ "$MAVEN_OPT" == "" ]; then
+  MAVEN_OPT=-B
 else
-  MAVEN_OPT=-q
+  MAVEN_OPT="$MAVEN_OPT -B"
 fi
 if [ "$VERSION" == "" ]; then
   VERSION=$($SCDIR/mvn-get-version.sh)
diff --git a/build-core.sh b/build-core.sh
index fded550b..f65b67c1 100755
--- a/build-core.sh
+++ b/build-core.sh
@@ -13,17 +13,22 @@ function check_env() {
 }
 check_env CI_DEPLOY_USERNAME
 check_env CI_DEPLOY_PASSWORD
+
 if [ "$VERBOSE" == "true" ]; then
   MAVEN_OPT=--debug
-else
-  MAVEN_OPT=-q
 fi
+if [ "$MAVEN_OPT" == "" ]; then
+  MAVEN_OPT=-B
+else
+  MAVEN_OPT="$MAVEN_OPT -B"
+fi
+
 if [ "$LOCAL" == "true" ]; then
   MAVEN_GOAL="install"
 else
   MAVEN_GOAL="install deploy"
 fi
 # -T 2C
-./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -T 1.5C -f stream-applications-build -U
-./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -T 1.5C -f functions -U
-./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -T 1.5C -f applications/stream-applications-core -U
+./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -U -T 1C -f stream-applications-build
+./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -U -T 1C -f functions
+./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -U -T 1C -f applications/stream-applications-core