diff --git a/apps/updateserver/services/legacy/MavenRepo.cfc b/apps/updateserver/services/legacy/MavenRepo.cfc
index 4da3291..a8c2a15 100644
--- a/apps/updateserver/services/legacy/MavenRepo.cfc
+++ b/apps/updateserver/services/legacy/MavenRepo.cfc
@@ -444,7 +444,8 @@ component {
 
 			// unpack the servers
 			if(!isNull(url.test)) throw temp;
-			zip action="unzip" file="#getDirectoryFromPath(getCurrenttemplatePath())&("build/servers/tomcat.zip")#" destination="#temp#tomcat";
+			local.minorVersion=mid(server.lucee.version,1,find(".",server.lucee.version,find(".",minorVersion)+1)-1);
+			zip action="unzip" file="#getDirectoryFromPath(getCurrenttemplatePath())&("build/servers/tomcat-"&(local.minorVersion >= '6.2'?'jakarta':'javax')&".zip")#" destination="#temp#tomcat";
 			
 			// let's zip it
 			zip action="zip" file=zipTmp overwrite=true {
diff --git a/apps/updateserver/services/legacy/S3.cfc b/apps/updateserver/services/legacy/S3.cfc
index 6c8f06e..bbf6d93 100644
--- a/apps/updateserver/services/legacy/S3.cfc
+++ b/apps/updateserver/services/legacy/S3.cfc
@@ -513,7 +513,9 @@ component {
 			//if (!directoryExists(webDir)) directoryCreate(webDir);
 
 			// unpack the servers
-			zip action="unzip" file=#curr&("build/servers/tomcat.zip")# destination=tmpTom;
+			local.useJakarta=checkVersionGTE( arguments.version, '6.2' );
+			local.srcTomcat = curr & "build/servers/tomcat-" & ( useJakarta ? 'jakarta':'javax' ) & ".zip";
+			zip action="unzip" file=srcTomcat destination=tmpTom;
 
 			// let's zip it
 			zip action="zip" file=zipTmp overwrite=true {
diff --git a/apps/updateserver/services/legacy/build/servers/tomcat-10.1.28.zip b/apps/updateserver/services/legacy/build/servers/tomcat-10.1.28.zip
new file mode 100644
index 0000000..b13101c
Binary files /dev/null and b/apps/updateserver/services/legacy/build/servers/tomcat-10.1.28.zip differ
diff --git a/apps/updateserver/services/legacy/build/servers/tomcat-jakarta.zip b/apps/updateserver/services/legacy/build/servers/tomcat-jakarta.zip
new file mode 100644
index 0000000..b13101c
Binary files /dev/null and b/apps/updateserver/services/legacy/build/servers/tomcat-jakarta.zip differ
diff --git a/apps/updateserver/services/legacy/build/servers/tomcat.zip b/apps/updateserver/services/legacy/build/servers/tomcat-javax.zip
similarity index 100%
rename from apps/updateserver/services/legacy/build/servers/tomcat.zip
rename to apps/updateserver/services/legacy/build/servers/tomcat-javax.zip