diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
index 78650278f..daae911a3 100644
--- a/pipelines/build/common/build_base_file.groovy
+++ b/pipelines/build/common/build_base_file.groovy
@@ -732,6 +732,11 @@ class Builder implements Serializable {
         }
 
         def timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC'))
+        if (javaToBuild == "jdk${headVersion}") {
+          timestamp = "ea.${scmReference}".replaceAll("jdk-","").replaceAll("_adopt","").replaceAll("/\.\+/","");
+        } else {
+          timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC'))
+        }
         def tag = "${javaToBuild}-${timestamp}"
 
         if (publishName) {