diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index f191fae8..7f9452c0 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -207,6 +207,7 @@ jobs:
         env:
           CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
           CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+          VERBOSE: ${{ inputs.verbose }}
         run: |
           ROOT_DIR=$(realpath $PWD)
           echo "::notice ::building - stream-applications-build"
@@ -219,7 +220,7 @@ jobs:
           set +e
           echo "::notice ::building - function-dependencies"
           set -e
-          $ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f functions/function-dependencies
+          $ROOT_DIR/mvnw ${{ inputs.verbose && '--debug' || '' }} -s $ROOT_DIR/.settings.xml deploy -f function-dependencies
           set +e
           echo "::notice ::building - stream-applications-core"
           set -e
@@ -262,6 +263,7 @@ jobs:
           CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
           CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
+          VERBOSE: ${{ inputs.verbose }}
         run: ./build-app.sh "stream-applications/applications/processor/${{ matrix.app }}"
       - name: 'Publish: ${{ matrix.app }}'
         shell: bash
@@ -269,6 +271,7 @@ jobs:
           DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
           DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
+          VERBOSE: ${{ inputs.verbose }}
         run: ./publish-app.sh "stream-applications/applications/processor/${{ matrix.app }}"
   sinks:
     if: ${{ needs.parameters.outputs.sinks != '' && needs.parameters.outputs.sinks != null }}
@@ -312,6 +315,7 @@ jobs:
           DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
           DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
+          VERBOSE: ${{ inputs.verbose }}
         run: ./publish-app.sh "stream-applications/applications/sink/${{ matrix.app }}"
   sources:
     if: ${{ needs.parameters.outputs.sources != '' && needs.parameters.outputs.sources != null }}
@@ -349,6 +353,7 @@ jobs:
           CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
           CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
+          VERBOSE: ${{ inputs.verbose }}
         run: ./build-app.sh "stream-applications/applications/source/${{ matrix.app }}"
       - name: 'Publish: ${{ matrix.app }}'
         shell: bash
@@ -356,6 +361,7 @@ jobs:
           DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
           DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
+          VERBOSE: ${{ inputs.verbose }}
         run: ./publish-app.sh "stream-applications/applications/source/${{ matrix.app }}"
 #  scale-down-runners:
 #    if: ${{ success() }}
diff --git a/build-app.sh b/build-app.sh
index 14134065..064e116e 100755
--- a/build-app.sh
+++ b/build-app.sh
@@ -33,10 +33,7 @@ else
   MAVEN_OPT=-q
 fi
 if [ "$VERSION" == "" ]; then
-  VERSIONS=$($SCDIR/mvnw exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q | sed 's/\"//g')
-  for v in $VERSIONS; do
-    VERSION=$v
-  done
+  VERSION=$($SCDIR/mvn-get-version.sh)
 fi
 echo "Project Version:$VERSION"
 if [ "$LOCAL" == "true" ]; then
diff --git a/build-core.sh b/build-core.sh
index f2b7eed1..9848a31c 100755
--- a/build-core.sh
+++ b/build-core.sh
@@ -24,7 +24,7 @@ else
   MAVEN_GOAL="install deploy"
 fi
 # -T 2C
-./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -f stream-applications-build -U
+./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 -f functions/function-dependencies -U
-./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -f applications/stream-applications-core -U
+./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -T 1.5C -f function-dependencies
+./mvnw $MAVEN_OPT -s ./.settings.xml $MAVEN_GOAL -T 1.5C -f applications/stream-applications-core -U
diff --git a/mvn-get-version.sh b/mvn-get-version.sh
new file mode 100755
index 00000000..1e4efd11
--- /dev/null
+++ b/mvn-get-version.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
+SCDIR=$(realpath $SCDIR)
+
+VERSIONS=$($SCDIR/mvnw exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q | sed 's/\"//g' | sed 's/version=//g')
+for v in $VERSIONS; do
+  VERSION=$v
+done
+echo "$VERSION"
diff --git a/publish-app.sh b/publish-app.sh
index 2da42f10..f0e9025b 100644
--- a/publish-app.sh
+++ b/publish-app.sh
@@ -23,10 +23,7 @@ if [ "$1" == "" ]; then
 fi
 APP_FOLDER=$1
 if [ "$VERSION" == "" ]; then
-  VERSIONS=$($SCDIR/mvnw exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q | sed 's/\"//g')
-  for v in $VERSIONS; do
-    VERSION=$v
-  done
+  VERSION=$($SCDIR/mvn-get-version.sh)
 fi
 echo "Project Version:$VERSION"
 if [[ "$VERSION" == "4."* ]]; then
diff --git a/scripts/terraform/stream-apps-gh-runners/main.tf b/scripts/terraform/stream-apps-gh-runners/main.tf
index 0cc10107..dbe9554c 100644
--- a/scripts/terraform/stream-apps-gh-runners/main.tf
+++ b/scripts/terraform/stream-apps-gh-runners/main.tf
@@ -1,5 +1,5 @@
 variable "cluster_name" {
-  default = "scdf-empty"
+  default = "stream-ci-empty"
 }
 variable "region" {
   default = "us-central1"
@@ -93,7 +93,7 @@ resource "google_container_node_pool" "nodes" {
     disk_size_gb = var.disk_size
     disk_type    = "pd-ssd"
     image_type   = "UBUNTU_CONTAINERD"
-    tags         = ["scdf-node", var.cluster_name, "${var.cluster_name}-node"]
+    tags         = ["stream-ci-node", var.cluster_name, "${var.cluster_name}-node"]
   }
   management {
     auto_upgrade = false
@@ -133,7 +133,7 @@ resource "google_container_cluster" "primary" {
   }
 }
 
-resource "google_compute_firewall" "scdf-fw" {
+resource "google_compute_firewall" "stream-ci-fw" {
   name    = "${var.cluster_name}-firewall"
   network = google_compute_network.vpc.name