diff --git a/build-test-analytics-cloud.xml b/build-test-analytics-cloud.xml
index 692f586990d90b..4057a60928c277 100644
--- a/build-test-analytics-cloud.xml
+++ b/build-test-analytics-cloud.xml
@@ -20,7 +20,10 @@
 						analytics.cloud.repository.dir="${analytics.cloud.asah.dir}"
 					/>
 
-					<execute dir="${analytics.cloud.asah.dir}">
+					<echo file="${analytics.cloud.asah.dir}/build_analytics_cloud_image.sh">
+						java -version
+						ant -version
+
 						./gradlew jar -Dliferay.ci=true
 
 						./gradlew clean assemble -Dliferay.ci=true
@@ -28,7 +31,38 @@
 						docker compose --file=${analytics.cloud.docker.test.yaml} --project-name=${analytics.cloud.project.name} build
 
 						docker images
-					</execute>
+					</echo>
+
+					<local name="java.jdk.home" />
+					<local name="java.jdk.opts" />
+					<local name="path" />
+
+					<!--<get-java-jdk-home architecture="x64" type="oracle" version="8" />-->
+					<!--<get-java-jdk-opts architecture="x64" type="oracle" version="8" />-->
+					<get-java-jdk-home architecture="x64" type="zulu" version="21" />
+					<get-java-jdk-opts architecture="x64" type="zulu" version="21" />
+
+					<propertyregex
+						input="${env.PATH}"
+						override="true"
+						property="path"
+						regexp="/opt/java/jdk[^/]+/bin"
+						replace="${java.jdk.home}/bin"
+					/>
+
+					<echo>java.jdk.home=${java.jdk.home}</echo>
+					<echo>java.jdk.opts=${java.jdk.opts}</echo>
+					<echo>path=${path}</echo>
+
+					<exec dir="${analytics.cloud.asah.dir}" executable="/bin/bash" failonerror="true" timeout="600000">
+						<env key="ANT_OPTS" value="${java.jdk.opts}" />
+						<env key="JAVA_HOME" value="${java.jdk.home}" />
+						<env key="JAVA_OPTS" value="${java.jdk.opts}" />
+						<env key="PATH" value="${path}" />
+						<arg value="${analytics.cloud.asah.dir}/build_analytics_cloud_image.sh" />
+					</exec>
+
+					<delete file="${analytics.cloud.asah.dir}/build_analytics_cloud_image.sh" />
 
 					<for list="${analytics.cloud.asah.image.names}" param="analytics.cloud.asah.image.name">
 						<sequential>
diff --git a/build-test-batch.xml b/build-test-batch.xml
index 378675d3b5a556..11b34fef5f9b88 100644
--- a/build-test-batch.xml
+++ b/build-test-batch.xml
@@ -2761,8 +2761,6 @@ ${poshi.runner.testsuite.testcase.name}</echo>
 			<get-java-jdk-bundle-type test.batch.name="${test.batch.name}" />
 			<get-java-jdk-bundle-version test.batch.name="${test.batch.name}" />
 
-			<get-java-jdk-home type="${java.jdk.bundle.type}" version="${java.jdk.bundle.version}" />
-
 			<run-batch-test>
 				<test-action>
 					<database-test-run-test database.type="@{database.type}" stop.app.server="true">
@@ -2781,9 +2779,13 @@ ${poshi.runner.testsuite.testcase.name}</echo>
 
 							<trycatch property="exception.message">
 								<try>
+									<get-java-jdk-home architecture="x64" type="oracle" version="8" />
+									<get-java-jdk-opts architecture="x64" type="oracle" version="8" />
+
 									<exec executable="/bin/bash">
 										<arg value="modules/test/playwright/env/set_up.sh" />
 										<env key="JAVA_HOME" value="${java.jdk.home}" />
+										<env key="JAVA_OPTS" value="${java.jdk.opts}" />
 										<env key="LIFERAY_HOME" value="${liferay.home}" />
 										<env key="LIFERAY_PORTAL_URL" value="http://${env.NODE_NAME}:8080" />
 										<env key="PLAYWRIGHT_PROJECT_NAME" value="${playwright.project.name}" />
@@ -2796,9 +2798,9 @@ ${poshi.runner.testsuite.testcase.name}</echo>
 									<local name="playwright.test.shard" />
 
 									<if>
-										<isset property="PLAYWRIGHT_ARGS_${axis.variable}" />
+										<isset property="env.PLAYWRIGHT_ARGS_${axis.variable}" />
 										<then>
-											<propertycopy from="PLAYWRIGHT_ARGS_${axis.variable}" name="playwright.test.shard" />
+											<propertycopy from="env.PLAYWRIGHT_ARGS_${axis.variable}" name="playwright.test.shard" />
 										</then>
 										<else>
 											<property name="playwright.test.shard" value="" />
@@ -2806,9 +2808,9 @@ ${poshi.runner.testsuite.testcase.name}</echo>
 									</if>
 
 									<if>
-										<isset property="PLAYWRIGHT_PROJECT_NAME" />
+										<isset property="env.PLAYWRIGHT_PROJECT_NAME" />
 										<then>
-											<propertycopy from="PLAYWRIGHT_PROJECT_NAME" name="playwright.project.name" />
+											<propertycopy from="env.PLAYWRIGHT_PROJECT_NAME" name="playwright.project.name" />
 										</then>
 										<else>
 											<property name="playwright.project.name" value="" />
@@ -2823,7 +2825,7 @@ ${poshi.runner.testsuite.testcase.name}</echo>
 											<property name="playwright.command" value="npx playwright test ${playwright.test.shard}" />
 										</then>
 										<else>
-											<property name="playwright.command" value="npx playwright test --project ${playwright.project.name} ${playwright.test.shard}" />
+											<property name="playwright.command" value="npx playwright test --project=${playwright.project.name} ${playwright.test.shard}" />
 										</else>
 									</if>