diff --git a/appserver/PKGBUILD b/appserver/PKGBUILD
index ed6a455..4fef457 100644
--- a/appserver/PKGBUILD
+++ b/appserver/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname="carbonio-appserver"
-pkgver="4.1.3"
+pkgver="4.2.0"
 pkgrel="1"
 pkgdesc="An open-source, community-driven email server"
 maintainer="Zextras <packages@zextras.com>"
@@ -18,10 +18,7 @@ depends=(
   "carbonio-appserver-conf"
   "carbonio-appserver-service"
   "carbonio-appserver-db"
-  "carbonio-appserver-store-libs"
-  "carbonio-appserver-war"
   "carbonio-core"
-  "carbonio-jetty-distribution"
   "carbonio-mariadb"
   "carbonio-prometheus-mysqld-exporter"
   "carbonio-zal"
@@ -57,54 +54,6 @@ package() {
   install -D conf/owasp_policy.xml \
     "${pkgdir}/opt/zextras/conf/owasp_policy.xml"
 
-  install -D conf/jetty/jetty-setuid.xml \
-    "${pkgdir}/opt/zextras/jetty_base/etc/jetty-setuid.xml"
-
-  install -D conf/jetty/jetty.xml.production \
-    "${pkgdir}/opt/zextras/jetty_base/etc/jetty.xml.in"
-
-  install -D conf/jetty/jettyrc \
-    "${pkgdir}/opt/zextras/jetty_base/etc/jettyrc"
-
-  install -D conf/jetty/spnego/etc/krb5.ini \
-    "${pkgdir}/opt/zextras/jetty_base/etc/krb5.ini.in"
-
-  install -D conf/jetty/spnego/etc/spnego.conf \
-    "${pkgdir}/opt/zextras/jetty_base/etc/spnego.conf.in"
-
-  install -D conf/jetty/spnego/etc/spnego.properties \
-    "${pkgdir}/opt/zextras/jetty_base/etc/spnego.properties.in"
-
-  install -D conf/jetty/webdefault.xml \
-    "${pkgdir}/opt/zextras/jetty_base/etc/webdefault.xml"
-
-  install -D conf/jetty/zimbra.policy.example \
-    "${pkgdir}/opt/zextras/jetty_base/etc/zimbra.policy.example"
-
-  install -D conf/jetty/modules/deploy.mod \
-    "${pkgdir}/opt/zextras/jetty_base/modules/deploy.mod"
-
-  install -D conf/jetty/modules/mail.mod \
-    "${pkgdir}/opt/zextras/jetty_base/modules/mail.mod"
-
-  install -D conf/jetty/modules/npn/npn-1.7.0_51.mod \
-    "${pkgdir}/opt/zextras/jetty_base/modules/npn"
-
-  install -D conf/jetty/modules/rewrite.mod \
-    "${pkgdir}/opt/zextras/jetty_base/modules/rewrite.mod"
-
-  install -D conf/jetty/modules/setuid.mod.in \
-    "${pkgdir}/opt/zextras/jetty_base/modules/setuid.mod.in"
-
-  install -D conf/jetty/modules/zimbra.mod \
-    "${pkgdir}/opt/zextras/jetty_base/modules/zimbra.mod"
-
-  install -D conf/jetty/start.d/setuid.ini.in \
-    "${pkgdir}/opt/zextras/jetty_base/start.d/setuid.ini.in"
-
-  install -D conf/.emptyfile \
-    "${pkgdir}/opt/zextras/jetty_base/temp/.emptyfile"
-
   install -D ${srcdir}/zm-clam-scanner-store-22.3.0.jar \
     -t "${pkgdir}/opt/zextras/lib/ext/clamscanner/"
 
@@ -114,9 +63,6 @@ package() {
   install -D conf/hotspot_compiler \
     "${pkgdir}/opt/zextras/log/.hotspot_compiler"
 
-  install -D conf/robots.txt \
-    -t "${pkgdir}/opt/zextras/jetty_base/webapps/zimbra/"
-
   # systemd unit
   mkdir -p "${pkgdir}/lib/systemd/system/${pkgname}.target.wants"
   install -Dm 644 "${srcdir}/${pkgname}.target" \
diff --git a/build_packages.sh b/build_packages.sh
index 9d76978..9bd1510 100755
--- a/build_packages.sh
+++ b/build_packages.sh
@@ -4,16 +4,30 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
+OS=$1
 
-TARGET=$1
-
-if [[ ${TARGET} == '' ||  ${TARGET} == 'ubuntu-focal' ]]
+if [[ -z $OS ]]
 then
-  docker run --entrypoint=yap -it -v $(pwd)/artifacts:/artifacts -v $(pwd):/tmp/staging registry.dev.zextras.com/jenkins/pacur/ubuntu-20.04:v2 build ubuntu-focal -c /tmp/staging -s
-else
-  if [[ ${TARGET} == 'rocky-8' ]]
-  then
-    docker run --entrypoint=yap -it -v $(pwd)/artifacts:/artifacts -v $(pwd):/tmp/staging registry.dev.zextras.com/jenkins/pacur/rocky-8:v2 build rocky-8 -c /tmp/staging -s
-  fi
+  echo "Please provide an OS as argument: (ubuntu-jammy, rocky-8)"
+  exit 1
 fi
 
+echo "Building for OS: $OS"
+
+if [[ $OS == "ubuntu-jammy" ]]
+then
+  docker run -it --rm \
+    --entrypoint=yap \
+    -v $(pwd)/artifacts/ubuntu-jammy:/artifacts \
+    -v $(pwd):/tmp/staging \
+    docker.io/m0rf30/yap-ubuntu-jammy:1.8 \
+    build ubuntu-jammy /tmp/staging
+elif [[ $OS == "rocky-8" ]]
+then
+  docker run -it --rm \
+    --entrypoint=yap \
+    -v $(pwd)/artifacts/rocky-8:/artifacts \
+    -v $(pwd):/tmp/staging \
+    docker.io/m0rf30/yap-rocky-8:1.10 \
+    build rocky-8 /tmp/staging
+fi