diff --git a/openjdk/build.xml b/openjdk/build.xml
index fe7b9969ae..66703c0e97 100755
--- a/openjdk/build.xml
+++ b/openjdk/build.xml
@@ -170,6 +170,7 @@
 								<property name="regressionRepo" value="https://github.com/ibmruntimes/${jdkName}.git"/>
 							</else>
 						</if>
+						<property name="defaultBranch" value=""/>
 					</then>
 					<else>
 						<if>
@@ -192,11 +193,24 @@
 									<then>
 										<echo message="Command passed. Setting repo name to the 'u' version."/>
 										<property name="jdkName" value="jdk${JDK_VERSION}u"/>
+										<property name="defaultBranch" value="-b dev"/>
 									</then>
 									<else>
-										<echo message="Command failed, or tried to ask for a username due to access restrictions. Or both."/>
-										<echo message="Setting repo name to the non-'u' version."/>
-										<property name="jdkName" value="jdk${JDK_VERSION}"/>
+										<property name="jdkName" value="jdk"/>
+										<exec executable="curl" outputproperty="jsonRelease">
+											<arg value="-s"/>
+											<arg value="https://api.adoptium.net/v3/info/available_releases"/>
+										</exec> 
+										<propertyregex property="tipVersion" input="${jsonRelease}" regexp='"tip_version":\s*([0-9]+)' select="\1" defaultValue="0"/>				
+										<if>
+											<equals arg1="${JDK_VERSION}" arg2="${tipVersion}"/>
+											<then>
+												<property name="defaultBranch" value="-b dev"/>
+											</then>
+											<else>
+												<property name="defaultBranch" value="-b dev_jdk${JDK_VERSION}"/>
+											</else>
+										</if>										
 									</else>
 								</if>
 							</else>
@@ -204,16 +218,6 @@
 						<property name="regressionRepo" value="https://github.com/adoptium/${jdkName}.git"/>
 					</else>
 				</if>
-				<if>
-					<contains string="${JDK_IMPL}" substring="hotspot"/>
-					<then>
-						<!-- Adoptium nightly is using dev branch and default branch is master-->
-						<property name="defaultBranch" value="-b dev"/>
-					</then>
-					<else>
-						<property name="defaultBranch" value=""/>
-					</else>
-				</if>
 				<if>
 					<isset property="OPENJDK_SHA_ISSET"/>
 					<then>