diff --git a/README.md b/README.md
index d29be0f..5875a72 100644
--- a/README.md
+++ b/README.md
@@ -315,19 +315,23 @@ smoketests on them.
 
     mbx list
 
+2. To build packages using `mbx`:
+
+    mbx package --repo <repo, default: shapeblue/cloudstack> --tag <tag|branch|PR, default: main> --distro <distro - el7|el8|el9|debian, default: el8> --output-dir <output directory, default: /export/testing/builds> --flags <maven build flags, default: ''>
+
 2. To deploy an environment, run:
 
-    mbx deploy <name of env, default: mbxe> <mgmt server template, default: mbxt-kvm-el7> <hypervisor template, default: mbxt-kvm-el7> <repo, default: http://packages.shapeblue.com/cloudstack/upstream/el7/4.18>
+    mbx deploy <name of env, default: mbxe> <mgmt server template, default: mbxt-kvm-el8> <hypervisor template, default: mbxt-kvm-el8> <repo, default: http://packages.shapeblue.com/cloudstack/upstream/el8/4.20>
 
 Example to deploy test matrix (kvm, vmware, xenserver) environments:
 
-    mbx deploy 418-kenv mbxt-kvm-el8 mbxt-kvm-el8 # deploys ACS 4.18 + KVM EL8 env
-    mbx deploy 418-venv mbxt-kvm-el8 mbxt-vmware7 # deploys ACS 4.18 + VMware7(u3) env
-    mbx deploy 418-xenv mbxt-kvm-el8 mbxt-xcpng82 # deploys ACS 4.18 + XCP-ng 8.2 env
+    mbx deploy 420-kenv mbxt-kvm-el8 mbxt-kvm-el8 # deploys ACS 4.20 + KVM EL8 env
+    mbx deploy 420-venv mbxt-kvm-el8 mbxt-vmware7 # deploys ACS 4.20 + VMware7(u3) env
+    mbx deploy 420-xenv mbxt-kvm-el8 mbxt-xcpng82 # deploys ACS 4.20 + XCP-ng 8.2 env
 
 More examples with custom packages repositories:
 
-    mbx deploy cs417-kvm mbxt-kvm-el7 mbxt-kvm-el7 http://download.cloudstack.org/centos/7/4.17/
+    mbx deploy cs420-kvm mbxt-kvm-el8 mbxt-kvm-el8 http://download.cloudstack.org/el/8/4.20/
 
 3. Once `mbx` environment is deployed, to launch a zone run:
 
diff --git a/files/build.sh b/files/build.sh
index 53cfea5..84e6ec3 100644
--- a/files/build.sh
+++ b/files/build.sh
@@ -18,22 +18,101 @@
 
 set -e
 
+# Cleanup function on failure
+cleanup_on_failure() {
+    local exit_code=$?
+    if [ $exit_code -ne 0 ]; then
+        echo "=== BUILD FAILED (exit code: $exit_code) ==="
+        echo "Cleaning up /jenkins and /output directories..."
+        # Move to root before cleanup
+        cd /
+        # Cleanup /jenkins directory
+        if [ -d "/jenkins" ]; then
+            echo "Cleaning /jenkins directory..."
+            rm -rf /jenkins/*
+            echo "/jenkins directory cleaned up."
+        fi
+        # Cleanup /output directory
+        if [ -d "/output" ]; then
+            echo "Cleaning /output directory..."
+            rm -rf /output/*
+            echo "/output directory cleaned up."
+        fi
+        echo "=== CLEANUP COMPLETED ==="
+    fi
+    exit $exit_code
+}
+
+# Set trap to cleanup on any error or exit
+trap cleanup_on_failure ERR EXIT
+
+if [[ $DISTRO == "debian" ]]; then
+  locale-gen en_US.UTF-8
+  update-locale
+fi
+
 # printenv
 
+echo "Repo: $GIT_REPO"
+echo "Tag: $GIT_TAG"
+echo "PR ID: $PR_ID"
+echo "ACS Branch: $ACS_BRANCH"
+echo "Distro: $DISTRO"
+echo "Flags: $FLAGS"
+
 export ROOT=/jenkins
 cd $ROOT
 rm -fr deps/*jar deps/awsapi-lib deps/*.mar NONOSS
 
+# Initialize git repository and fetch code
+echo "Initializing git repository..."
+if [ ! -d ".git" ]; then
+    git init .
+fi
+
+# Add remote origin if it doesn't exist
+if ! git remote get-url origin >/dev/null 2>&1; then
+    echo "Adding remote origin: https://github.com/$GIT_REPO.git"
+    git remote add origin "https://github.com/$GIT_REPO.git"
+else
+    echo "Setting remote origin URL: https://github.com/$GIT_REPO.git"
+    git remote set-url origin "https://github.com/$GIT_REPO.git"
+fi
+
+# Fetch the repository
+echo "Fetching repository from https://github.com/$GIT_REPO.git"
+git reset --hard
+git clean -fd
+git fetch origin --depth=1 --progress
+
 if [[ "${PR_ID}" != "" ]]; then
   # Find base branch
-  BASE=$(curl https://api.github.com/repos/apache/cloudstack/pulls/$PR_ID | jq -r '.base.ref')
+  BASE=$(curl https://api.github.com/repos/$GIT_REPO/pulls/$PR_ID | jq -r '.base.ref')
   git checkout ${BASE}
 else
-  git checkout ${ACS_BRANCH}
+  # For regular branches/tags
+  echo "Fetching and checking out: $ACS_BRANCH"
+  if git ls-remote --heads origin "$ACS_BRANCH" | grep -q "$ACS_BRANCH"; then
+      # It's a branch
+      if [ "$(git rev-parse --abbrev-ref HEAD)" = "$ACS_BRANCH" ]; then
+          echo "Already on branch $ACS_BRANCH, pulling latest changes with rebase..."
+          git pull --rebase origin "$ACS_BRANCH"
+      else
+          git fetch origin "$ACS_BRANCH:$ACS_BRANCH" --depth=1 --progress
+          git checkout "$ACS_BRANCH"
+      fi
+  elif git ls-remote --tags origin "$ACS_BRANCH" | grep -q "$ACS_BRANCH"; then
+      # It's a tag
+      git fetch origin "refs/tags/$ACS_BRANCH:refs/tags/$ACS_BRANCH" --depth=1 --progress
+      git checkout "refs/tags/$ACS_BRANCH"
+  else
+      # Try to fetch as commit SHA
+      git checkout "$ACS_BRANCH"
+  fi
 fi
 
 # Add github remote
-git remote add gh https://github.com/apache/cloudstack.git || true
+git remote add gh https://github.com/$GIT_REPO.git || true
 
 # Apply PR
 if [[ "${PR_ID}" != "" ]]; then
@@ -72,7 +151,13 @@ export ACS_BUILD_OPTS="-Dnoredist -Dnonoss"
 export MAVEN_OPTS="-Xmx4096m -XX:MaxPermSize=800m"
 
 LIBS=NONOSS
-git clone https://github.com/shapeblue/cloudstack-nonoss.git $LIBS --depth=1
+if [ ! -d "$LIBS/.git" ]; then
+  git clone https://github.com/shapeblue/cloudstack-nonoss.git $LIBS --depth=1 --progress
+else
+  cd $LIBS
+  git pull origin main
+  cd $ROOT
+fi
 cd $LIBS
 bash -x install-non-oss.sh
 cd $ROOT
@@ -81,26 +166,25 @@ chmod +x scripts/vm/hypervisor/xenserver/vhd-util
 
 # Debian stuff
 if [[ $DISTRO == "debian" ]]; then
+  export ACS_BUILD_OPTS="-Dnoredist -Dnonoss $FLAGS"
   rm -frv ../cloudstack*deb
   rm -frv ../cloudstack*.tar.gz
   rm -frv ../cloudstack*.dsc
   rm -frv ../cloudstack*.changes
 
   echo "cloudstack (${VERSION}) unstable; urgency=low" > $ROOT/newchangelog
-	echo "" >> $ROOT/newchangelog
-	echo "  * Update the version to ${PACKAGE_VERSION}" >> $ROOT/newchangelog
-	echo "" >> $ROOT/newchangelog
-	echo " -- Apache CloudStack Dev <dev@cloudstack.apache.org>  $(date +'%a, %-d %b %Y %H:%m:%S +0530')" >> $ROOT/newchangelog
-	echo "" >> $ROOT/newchangelog
-	cat $ROOT/debian/changelog >> $ROOT/newchangelog
-	mv $ROOT/newchangelog $ROOT/debian/changelog
-
-	cd $ROOT
+  echo "" >> $ROOT/newchangelog
+  echo "  * Update the version to ${PACKAGE_VERSION}" >> $ROOT/newchangelog
+  echo "" >> $ROOT/newchangelog
+  echo " -- Apache CloudStack Dev <dev@cloudstack.apache.org>  $(date +'%a, %-d %b %Y %H:%m:%S +0530')" >> $ROOT/newchangelog
+  echo "" >> $ROOT/newchangelog
+  cat $ROOT/debian/changelog >> $ROOT/newchangelog
+  mv $ROOT/newchangelog $ROOT/debian/changelog
 
-	dpkg-buildpackage -uc -us -b
+  cd $ROOT
 
+    dpkg-buildpackage -uc -us -b
   mv ../cloudstack-*.deb $ROOT
-
   for pkg in $(ls cloud*.deb);
   do
     cp $pkg /output
@@ -111,24 +195,31 @@ else
   sed -i "s/DEFREL=.*$/DEFREL='-D_rel ${MINOR}'/g" package.sh
 
   case $DISTRO in
-    centos6)
-      bash -x package.sh -p noredist -d centos63
-      ;;
-    centos7)
+    el7)
       bash -x package.sh -p noredist -o rhel7 -d centos7 --release $MINOR
       ;;
-    centos8)
+    el8|el9)
       ln -sf /usr/bin/python2 /usr/bin/python
       bash -x package.sh -p noredist -o rhel8 -d centos8 --release $MINOR
       ;;
   esac
 
   cd $ROOT
-	for pkg in $(ls dist/rpmbuild/RPMS/x86_64/);
-	do
-	  cp dist/rpmbuild/RPMS/x86_64/$pkg /output
-	done
+  package_folder="dist/rpmbuild/RPMS/x86_64/"
+  if [ ! -d $package_folder ];then
+    package_folder="dist/rpmbuild/RPMS/noarch/"
+  fi
+  for pkg in $(ls $package_folder);
+  do
+    cp $package_folder/$pkg /output
+  done
 fi
 
+rm -rf $ROOT/*
 
+# If we reach here, the build was successful
+# Disable the cleanup trap for successful builds
+trap - ERR EXIT
 
+echo "=== BUILD COMPLETED SUCCESSFULLY ==="
+echo "Packages available in /output directory"
diff --git a/mbx b/mbx
index bf52c88..4aa2337 100755
--- a/mbx
+++ b/mbx
@@ -96,43 +96,129 @@ list() {
 }
 
 package() {
-  if [[ "$1" == "-h" ]]; then
-    echo "Usage: mbx package <repo url> <tag|sha|branch name|pr number> <option distro: centos7/centos8/debian>"
-    exit 0
-  fi
+  # Default values
+  repo="apache/cloudstack"
+  tag="main"
+  distro="el8"
+  output_dir="/export/testing/builds"
+  pr_id=""
+  maven_flags=""
+
+  # Parse named arguments
+  TEMP=$(getopt -o h --long help,repo:,tag:,pr:,distro:,output-dir:,flags: -n 'mbx package' -- "$@")
+  if [ $? != 0 ]; then echo "Failed parsing options." >&2; exit 1; fi
+  eval set -- "$TEMP"
+
+  while true; do
+    case "$1" in
+      -h|--help)
+        echo "Usage: mbx package [options]"
+        echo "Options:"
+        echo "  --repo <repo>          Git repository (default: apache/cloudstack)"
+        echo "  --tag <tag>            Tag/branch/SHA or PR number (default: main)"
+        echo "  --distro <distro>      Distribution: el7/el8/el9/debian (default: el8)"
+        echo "  --output-dir <dir>     Output directory (default: /export/testing/builds)"
+        echo "  --flags <flags>        Comma-separated Maven build flags (e.g., '-DskipTests,-T4')"
+        echo "  -h, --help             Show this help"
+        echo ""
+        echo "Examples:"
+        echo "  mbx package --tag 4.20"
+        echo "  mbx package --tag 1234 --distro debian --flags '-DskipTests'"
+        echo "  mbx package --repo shapeblue/cloudstack --tag feature-branch --flags '-DskipTests,-T4'"
+        exit 0
+        ;;
+      --repo)
+        repo="$2"
+        shift 2
+        ;;
+      --tag)
+        tag="$2"
+        # Check if tag is a PR number (all digits)
+        re='^[0-9]+$'
+        if [[ $tag =~ $re ]]; then
+          pr_id=$tag
+          tag="main"
+        fi
+        shift 2
+        ;;
+      --pr)
+        pr_id="$2"
+        tag="main"  # PRs are always against main
+        shift 2
+        ;;
+      --distro)
+        distro="$2"
+        shift 2
+        ;;
+      --output-dir)
+        output_dir="$2"
+        shift 2
+        ;;
+      --flags)
+        echo "Using maven flags: $2"
+        if [ -n "$2" ]; then
+          maven_flags="${2//,/ }"
+          shift 2
+        else
+          maven_flags=""
+          shift 1
+        fi
+        ;;
+      --)
+        shift
+        break
+        ;;
+      *)
+        echo "Internal error!"
+        exit 1
+        ;;
+    esac
+  done
 
-  echo "This feature likely broken, run at your own risk"
+  # Handle positional arguments for backward compatibility
+  if [[ $# -gt 0 && -z "$TEMP" ]]; then
+    repo="${1:-apache/cloudstack}"
+    tag="${2:-main}"
+    distro="${3:-el8}"
+    output_dir="${4:-/export/testing/builds}"
+    maven_flags="${5:-}"
+  fi
 
-  url="${1:-apache/cloudstack}"
-  echo $url | egrep "^https?://" || url="https://github.com/$url"
-  tag="${2:-master}"
-  distro="${3:-centos7}"
+  # Set output directory based on PR or tag
+  if [[ -n "$pr_id" ]]; then
+    output_dir="$output_dir/pr/$pr_id/$distro"
+  else
+    output_dir="$output_dir/$tag/$distro"
+  fi
 
-  re='^[0-9]+$'
-  [[ $tag =~ $re ]] && pr_id=$tag && output_dir="${output_dir:=/export/testing/builds/pr/$tag/$distro}"
-  output_dir="${output_dir:=/export/testing/builds/$tag/$distro}"
+  # Validate inputs
+  if [[ -z "$repo" || -z "$tag" || -z "$distro" ]]; then
+    echo "Error: Missing required parameters"
+    exit 1
+  fi
 
-  CUR=$(pwd)
-  uuid=$(uuid)
+  echo "Building with:"
+  echo "  Repo: $repo"
+  echo "  Tag: $tag"
+  echo "  Distro: $distro"
+  echo "  Output: $output_dir"
+  echo "  PR ID: ${pr_id:-none}"
+  echo "  Maven flags: ${maven_flags:-none}"
+
+  # Generate UUID
+  if command -v uuid >/dev/null 2>&1; then
+    uuid=$(uuid)
+  else
+    echo "Error: No UUID generation method available. Please install 'uuid' package."
+    exit 1
+  fi
   packaging_dir="/tmp/mbx/cloudstack/$uuid"
 
-  echo "Pulling $url:$tag to $packaging_dir"
-  mkdir -p $packaging_dir
-  cd $packaging_dir
-
-  git init $(pwd)
-  git fetch --tags --progress $url --depth 1 +refs/heads/*:refs/remotes/origin/* > /dev/null
-  git config remote.origin.url $url
-  git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
-  git checkout $tag
-
-  cd $CUR
-
   # TODO: Build all simultaniously
   case "$distro" in
-    centos7) image_name="shapeblue/centos7-cloudstack-builder";;
-    centos8) image_name="shapeblue/centos7-cloudstack-builder";;
-    debian) image_name="shapeblue/ubuntu-cloudstack-builder";;
+    el7) image_name="ghcr.io/shapeblue/centos7-cloudstack-builder";;
+    el8|el9) image_name="ghcr.io/shapeblue/centos8-cloudstack-builder";;
+    debian) image_name="ghcr.io/shapeblue/ubuntu-cloudstack-builder";;
     *) echo "Unknown distro" && exit 1;;
   esac
 
@@ -143,20 +229,45 @@ package() {
   uuid=`uuid`
   container_name="builder-$uuid"
 
-  rm -rf $output_dir || true
+  # Create output directory
+  rm -rf $output_dir/* || true
+  mkdir "$output_dir" || true
+
+  # Run container with git repo details as environment variables
+  docker run -d \
+    -v $packaging_dir:/jenkins \
+    -v "$output_dir:/output" \
+    -e "GIT_REPO=$repo" \
+    -e "GIT_TAG=$tag" \
+    -e "PR_ID=$pr_id" \
+    -e "ACS_BRANCH=$tag" \
+    -e "DISTRO=$distro" \
+    -e "FLAGS='$maven_flags'" \
+    --name "$container_name" \
+    "$image_name" \
+    /usr/sbin/sshd -D -p 22
 
-  docker run -d -v $packaging_dir:/jenkins -v $output_dir:/output  --name $container_name $image_name /usr/sbin/sshd -D -p 22
   builder_ip=`docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $container_name `
 
+  # Wait for SSH to be ready
+  echo "Waiting for SSH service to be ready in container..."
+  while ! nc -vzw 5 "$builder_ip" 22 2>/dev/null; do
+    sleep 2
+  done
+
   iscp files/build.sh root@$builder_ip://jenkins/build.sh
-  issh root@$builder_ip \
-    PR_ID=$pr_id ACS_BRANCH=$tag DISTRO=$distro bash -x /jenkins/build.sh
+  # Is it possible to scp local maven cache to container?
+
+  issh root@"$builder_ip" \
+    GIT_REPO="$repo" GIT_TAG="$tag" PR_ID="$pr_id" ACS_BRANCH="$tag" DISTRO="$distro" FLAGS="'$maven_flags'" \
+    bash -x /jenkins/build.sh
 
   echo "Packages can be found at $output_dir"
 
+  # Cleanup
   docker kill $container_name
   docker rm $container_name
-  rm -rf $packaging_dir || true
+  # rm -rf $packaging_dir || true
 }
 
 check_mbxt() {
@@ -217,9 +328,9 @@ deploy() {
     exit 1
   fi
 
-  name=${1:-"mbx-cs418"}
-  mst=${2:-"mbxt-kvm-el7"}
-  hyt=${3:-"mbxt-kvm-el7"}
+  name=${1:-"mbx-cs420"}
+  mst=${2:-"mbxt-kvm-el8"}
+  hyt=${3:-"mbxt-kvm-el8"}
   # Validate templates
   check_mbxt mgmt $mst
   check_mbxt hypervisor $hyt
@@ -495,7 +606,7 @@ dev() {
   fi
 
   name=${1:-"mbx-dev"}
-  hyt=${2:-"mbxt-kvm-el7"}
+  hyt=${2:-"mbxt-kvm-el8"}
   # Validate input templates
   check_mbxt hypervisor $hyt