diff --git a/apps/updateserver/services/legacy/S3.cfc b/apps/updateserver/services/legacy/S3.cfc
index bd34027..6548262 100644
--- a/apps/updateserver/services/legacy/S3.cfc
+++ b/apps/updateserver/services/legacy/S3.cfc
@@ -382,15 +382,24 @@ component {
 		local.warTmp=temp&"lucee-"&version&"-temp-"&createUniqueId()&".war";
 		var curr=getDirectoryFromPath(getCurrenttemplatePath());
 
+		var noServlet = checkVersionGTE( arguments.version, 6, 2 );
+		systemOutput("War Version check, gte 6.2: #noServlet#", true );
+
+		var warFolder = noServlet ? "war-6.2" : "war";
+
 		try {
 			// temp directory
 			// create paths and dir if necessary
 			local.build={};
 			loop list="extensions,common,website,war" item="local.name" {
-				local.tmp=curr & "build/"&name&"/";
+				local.tmp=curr & "build/" & name & "/";
 				if ( name == "extensions" && !directoryExists( tmp ) ) 
 					directoryCreate( tmp, true );
-				build[ name ]=tmp;
+				if ( name == "war" ){
+					tmp = curr & "build/" & warFolder & "/";
+				}
+				build[ name ] = tmp;
+				
 			}
 			systemOutput( "---- createWar", true );
 			systemOutput( build, true );
@@ -601,6 +610,16 @@ component {
 		return temp;
 	}
 
+	private function checkVersionGTE( version, major, minor ){
+		var v = listToArray( arguments.version, "." );
+		if ( v[ 1 ] gt arguments.major ) {
+			return true;
+		} else if ( v[ 1 ] eq arguments.major && v[ 2 ] gte arguments.minor ) {
+			return true;
+		}
+		return false;
+	}
+
 }
 
 
diff --git a/apps/updateserver/services/legacy/build/war-6.2/WEB-INF/web.xml b/apps/updateserver/services/legacy/build/war-6.2/WEB-INF/web.xml
new file mode 100644
index 0000000..ce1a4e8
--- /dev/null
+++ b/apps/updateserver/services/legacy/build/war-6.2/WEB-INF/web.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	metadata-complete="true"
+	version="2.5">
+
+    <servlet>
+        <servlet-name>CFMLServlet</servlet-name>
+        <servlet-class>lucee.loader.servlet.CFMLServlet</servlet-class>
+        
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- to specify the location of the Lucee Server config and libraries,   -->
+    <!-- uncomment the init-param below.  make sure that the param-value     -->
+    <!-- points to a valid folder, and that the process that runs Lucee has  -->
+    <!-- write permissions to that folder.  leave commented for defaults.    -->
+    <!--
+    <init-param>
+      <param-name>lucee-server-directory</param-name>
+      <param-value>/var/Lucee/config/server/</param-value>
+      <description>Lucee Server configuration directory (for Server-wide configurations, settings, and libraries)</description>
+    </init-param>
+    !-->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- to specify the location of the Web Contexts' config and libraries,  -->
+    <!-- uncomment the init-param below.  make sure that the param-value     -->
+    <!-- points to a valid folder, and that the process that runs Lucee has  -->
+    <!-- write permissions to that folder.  the {web-context-label} can be   -->
+    <!-- set in Lucee Server Admin homepage.  leave commented for defaults.  -->
+    <!--
+    <init-param>
+      <param-name>lucee-web-directory</param-name>
+      <param-value>/var/Lucee/config/web/{web-context-label}/</param-value> 
+      <description>Lucee Web Directory (for Website-specific configurations, settings, and libraries)</description>
+    </init-param>
+    !-->
+    <load-on-startup>2</load-on-startup>
+
+    </servlet>
+
+
+  <!-- ===================================================================== -->
+  <!-- Lucee REST Servlet - handles Lucee's RESTful web services             -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <servlet>
+    <servlet-name>RESTServlet</servlet-name>    
+    <servlet-class>lucee.loader.servlet.RestServlet</servlet-class>
+    <load-on-startup>3</load-on-startup>
+  </servlet> 
+
+  <!-- ===================================================================== -->
+  <!-- Lucee MessageBroker Servlet - Flex Gateway                            -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <!-- * ATTENTION - ATENCION - ACHTUNG  -  ATTENTION - ATENCION - ACHTUNG * -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <!-- messageBrokerId must be unique for each defintion of the MessageBroker-->
+  <!-- Servlet.  if you use the MessageBroker Servlet and define it in more  -->
+  <!-- than one xml file, you must uncomment the messageBrokerId init-param  -->
+  <!-- and set a different value in each definition.                         -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <!-- <servlet>
+    <description>Lucee Servlet for Flex Gateway</description>
+    <servlet-name>MessageBrokerServlet</servlet-name>
+    <servlet-class>flex.messaging.MessageBrokerServlet</servlet-class>
+    <init-param>
+      <param-name>services.configuration.file</param-name>
+      <param-value>/WEB-INF/flex/services-config.xml</param-value>
+    </init-param>
+    <init-param>
+      <param-name>messageBrokerId</param-name>
+      <param-value>_default_</param-value>
+    </init-param>
+    <load-on-startup>3</load-on-startup>
+  </servlet> -->
+
+
+
+  <servlet-mapping>
+      <servlet-name>LuceeServlet</servlet-name>
+      <url-pattern>*.lucee</url-pattern>
+      <url-pattern>/index.lucee/*</url-pattern>
+  </servlet-mapping>
+
+    <servlet-mapping>
+      <servlet-name>CFMLServlet</servlet-name>
+      <url-pattern>*.cfc</url-pattern>
+      <url-pattern>*.cfm</url-pattern>
+      <url-pattern>*.cfml</url-pattern>   
+      <url-pattern>/index.cfc/*</url-pattern>
+      <url-pattern>/index.cfm/*</url-pattern>
+      <url-pattern>/index.cfml/*</url-pattern>
+  </servlet-mapping>
+
+
+
+  <servlet-mapping>
+    <servlet-name>RESTServlet</servlet-name>
+    <url-pattern>/rest/*</url-pattern>
+  </servlet-mapping>
+ 
+
+	<!-- default file to execute if directory is called with no file name, e.g. http://mysite.com/ !-->
+	<welcome-file-list>
+		<welcome-file>index.cfm</welcome-file>
+		<welcome-file>index.lucee</welcome-file>
+		<welcome-file>index.html</welcome-file>
+		<welcome-file>index.htm</welcome-file>
+	</welcome-file-list>
+
+</web-app>
\ No newline at end of file
diff --git a/tests/testBuildArtifacts.cfc b/tests/testBuildArtifacts.cfc
index 057684b..dd1e0b6 100644
--- a/tests/testBuildArtifacts.cfc
+++ b/tests/testBuildArtifacts.cfc
@@ -8,46 +8,16 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="data-provider-inte
 		variables.artifacts = dir & "/artifacts";
 		if ( !DirectoryExists( variables.artifacts ))
 			directoryCreate( variables.artifacts );
-
-		variables.buildDir = getTempDirectory() & "/build-test-#createUniqueId()#/";
-		if ( DirectoryExists( variables.buildDir ) )
-			directoryDelete( variables.buildDir, true );
-		directoryCreate( variables.buildDir, true );
-
 	}
 
 	function run( testResults , testBox ) {
 		describe( "test build artifacts", function() {
-			it(title="check valid files are produced", body=function(){
-
-				var srcJar = fetchLuceeJar( "lucee-6.0.3.1" );
-				FileCopy( srcJar, variables.buildDir & listLast( srcJar, "/\" ) );
-
-				var s3 = new services.legacy.S3();
-				s3.init( variables.buildDir );
-				s3.addMissing( includingForgeBox=true, skipMaven=true );
-
-				var produced = directoryList( path=variables.buildDir, recurse=true, listinfo="query" );
-				for (var f in produced ) {
-					systemOutput( "", true );
-					var fileCount = -1;
-					var zip = queryNew("");
-					try {
-						zip action="list" file="#f.directory#/#f.name#" name="local.zip";
-						fileCount = zip.recordcount;
-					} catch ( e ) {
-						systemOutput( f, true );
-						systemOutput( e.stacktrace, true );
-					}
-					systemOutput( "#f.name#, #numberFormat( f.size )#, #fileCount# files", true );
-					var type = listLast( f.name, "." );
-					if ( zip.recordCount && type != "jar" && type != "lco" ){
-						for (var z in zip ){
-							systemOutput( "#chr(9)# #z.name#, #numberFormat( z.size )#", true );
-						}
-					}
-				}
+			it(title="check valid artifacts are produced, 6.0.3.1", body=function(){
+				buildArtifacts( "lucee-6.0.3.1" );
+			});
 
+			it(title="check valid artifacts are produced, 6.2.0.30-SNAPSHOT", body=function(){
+				buildArtifacts( "lucee-6.2.0.30-SNAPSHOT" );
 			});
 		});
 	}
@@ -58,11 +28,72 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="data-provider-inte
 		var artifact = "https://cdn.lucee.org/#arguments.version#.jar";
 
 		systemOutput( "Downloading #artifact# (cache miss)", true);
-		http url=artifact method="get" result="local.core" path=variables.artifacts;
+		http url=artifact method="get" result="local.core" path=variables.artifacts throwonerror="true";
 		var file = directoryList(path=variables.artifacts, filter="#arguments.version#.jar");
-		//systemOutput(file, true);
+		systemOutput(file, true);
 		return file[ 1 ];
 	}
 
+	private function buildArtifacts( version ){
+
+		var buildDir = getTempDirectory() & "/build-artifacts-#createUUID()#/";
+		if ( DirectoryExists( buildDir ) )
+			directoryDelete( buildDir, true );
+		directoryCreate( buildDir, true );
+
+		systemOutput( "--- buildArtifacts [#arguments.version#] ", true);
+		var srcJar = fetchLuceeJar( arguments.version );
+		FileCopy( srcJar, buildDir & listLast( srcJar, "/\" ) );
+
+		var s3 = new services.legacy.S3();
+		s3.init( buildDir );
+		s3.addMissing( includingForgeBox=true, skipMaven=true );
+
+		var produced = directoryList( path=buildDir, recurse=true, listinfo="query" );
+		for (var f in produced ) {
+			systemOutput( "", true );
+			var fileCount = -1;
+			var zip = queryNew("");
+			try {
+				zip action="list" file="#f.directory#/#f.name#" name="local.zip";
+				fileCount = zip.recordcount;
+			} catch ( e ) {
+				systemOutput( f, true );
+				systemOutput( e.stacktrace, true );
+			}
+			systemOutput( "#f.name#, #numberFormat( f.size )#, #fileCount# files", true );
+			var type = listLast( f.name, "." );
+			if ( zip.recordCount && type != "jar" && type != "lco" ){
+				for (var z in zip ){
+					systemOutput( "#chr(9)# #z.name#, #numberFormat( z.size )#", true );
+					if ( listLast( z.name, "." ) eq "war" ){
+						dumpWarContents( "#f.directory#/#f.name#", true );
+					}
+				}
+			}
+		}
+	}
+
+	private function dumpWarContents( zip, recurse=true ){
+		var warDir = getTempDirectory() & "/build-war-#createUUID()#/";
+		if ( DirectoryExists( warDir ) )
+			directoryDelete( warDir, true );
+		directoryCreate( warDir, true );
+		zip action="unzip" file=arguments.zip destination=wardir;
+
+		if ( arguments.recurse ) {
+			var wars = directoryList( path=warDir, recurse=true, listinfo="query", filter="*.war" );
+			for (var war in wars ){
+				if ( listLast( war.name, ".") eq "war" ){
+					dumpWarContents( zip=(war.directory & "/" & war.name), recurse=false );
+				}
+			}
+		} else {
+			var warContents = directoryList( path=warDir, recurse=true, listinfo="query" );
+			for ( var f in warContents ){
+				systemOutput( "#chr(9)##chr(9)##mid(f.directory,len(warDir))#/#f.name#, #numberFormat( f.size )#", true );
+			}
+		}
+	}
 
 }