diff --git a/thirdparty/jetty-distribution/zimbra-jetty-distribution/debian/changelog b/thirdparty/jetty-distribution/zimbra-jetty-distribution/debian/changelog
index 3b207656b..6ae562731 100644
--- a/thirdparty/jetty-distribution/zimbra-jetty-distribution/debian/changelog
+++ b/thirdparty/jetty-distribution/zimbra-jetty-distribution/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-jetty-distribution (VERSION-2.PKG_OS_TAG) unstable; urgency=medium
+
+  * Fix ZBUG-4023, Upgraded jetty to 9.4.57.v20241219
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Mon, 03 Mar 2025 05:14:15 +0530
+
 zimbra-jetty-distribution (VERSION-2.PKG_OS_TAG) unstable; urgency=medium
 
   * Fix ZBUG-2633, Upgraded jetty to 9.4.46.v20220331
diff --git a/thirdparty/jetty-distribution/zimbra-jetty-distribution/debian/rules b/thirdparty/jetty-distribution/zimbra-jetty-distribution/debian/rules
index bab2f7abe..222c8ab6c 100755
--- a/thirdparty/jetty-distribution/zimbra-jetty-distribution/debian/rules
+++ b/thirdparty/jetty-distribution/zimbra-jetty-distribution/debian/rules
@@ -10,3 +10,4 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	mkdir -p $$(pwd)/debian/tmp/opt/zimbra/common/jetty_home
 	find -maxdepth 1 -mindepth 1 | grep -v -w -e debian -e rpm | xargs -r '-I{}' cp -a '{}' ./debian/tmp/opt/zimbra/common/jetty_home
+	rm -rf $$(pwd)/debian/tmp/opt/zimbra/common/jetty_home/demo-base
diff --git a/thirdparty/jetty-distribution/zimbra-jetty-distribution/rpm/SPECS/jetty-distribution.spec b/thirdparty/jetty-distribution/zimbra-jetty-distribution/rpm/SPECS/jetty-distribution.spec
index 2f92133ae..91d7193bf 100644
--- a/thirdparty/jetty-distribution/zimbra-jetty-distribution/rpm/SPECS/jetty-distribution.spec
+++ b/thirdparty/jetty-distribution/zimbra-jetty-distribution/rpm/SPECS/jetty-distribution.spec
@@ -14,6 +14,8 @@ URL:                https://www.eclipse.org/jetty/
 The Zimbra jetty-distribution build
 
 %changelog
+* Fri Mar 03 2025 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-2.PKG_OS_TAG
+- Fix ZBUG-4023, Upgraded jetty to 9.4.57.v20241219
 * Mon May 09 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-2.PKG_OS_TAG
 - Fix ZBUG-2633, Upgraded jetty to 9.4.46.v20220331
 * Thu Aug 31 2017 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-2.PKG_OS_TAG
@@ -29,6 +31,7 @@ The Zimbra jetty-distribution build
 %install
 mkdir -p ${RPM_BUILD_ROOT}/opt/zimbra/common/jetty_home
 find -maxdepth 1 -mindepth 1 | grep -v -w -e debian -e rpm | xargs -r '-I{}' cp -a '{}' ${RPM_BUILD_ROOT}/opt/zimbra/common/jetty_home
+rm -rf ${RPM_BUILD_ROOT}/opt/zimbra/common/jetty_home/demo-base
 
 %files
 %defattr(-,root,root)
diff --git a/versions.def b/versions.def
index e56c96a01..f384e4bb0 100644
--- a/versions.def
+++ b/versions.def
@@ -77,7 +77,7 @@ JDK_BUILD		:= 12
 JDK_TAG			:= openjdk-$(JDK_UPDATE).$(JDK_BUILD)
 JDK_VERSION		:= $(JDK_UPDATE).$(JDK_BUILD)
 
-JETTY_DISTRIBUTION_VERSION := 9.4.46.v20220331
+JETTY_DISTRIBUTION_VERSION := 9.4.57.v20241219
 
 JUNIXSOCKET_VERSION	:= 2.0.4