diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
index 7e03beaf9..82cda4178 100644
--- a/pipelines/build/common/openjdk_build_pipeline.groovy
+++ b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -1983,7 +1983,7 @@ def buildScriptsAssemble(
             } finally {
                 // Archive any artifacts including failed make logs, unless doing internal
                 // signing where we will perform this step after the assemble phase
-                if ( ! (enableSigner && (buildConfig.TARGET_OS == 'windows') || (buildConfig.TARGET_OS == 'mac') ) ) {
+                if (!((buildConfig.TARGET_OS == 'mac' || buildConfig.TARGET_OS == 'windows') && buildConfig.JAVA_TO_BUILD != 'jdk8u' && enableSigner))
                    try {
                        context.timeout(time: buildTimeouts.BUILD_ARCHIVE_TIMEOUT, unit: 'HOURS') {
                           // We have already archived cross compiled artifacts, so only archive the metadata files