diff --git a/gradle/gradle-enterprise.gradle b/gradle/gradle-enterprise.gradle
index b3de61a3b7..cbc92874ce 100644
--- a/gradle/gradle-enterprise.gradle
+++ b/gradle/gradle-enterprise.gradle
@@ -46,7 +46,7 @@ gradleEnterprise {
 
         uploadInBackground = !settings.ext.isCiEnvironment
 
-        tag "JDK ${JavaVersion.current().toString()}"
+        tag "jdk-${extensions.jdkVersions.test.launcher}"
         tag extensions.db
         value 'database', extensions.db
         if ( extensions.hasProperty( 'ci.node' ) ) {
diff --git a/local-build-plugins/build.gradle b/local-build-plugins/build.gradle
index 70f3b72041..1419125bfb 100644
--- a/local-build-plugins/build.gradle
+++ b/local-build-plugins/build.gradle
@@ -60,6 +60,10 @@ gradlePlugin {
 			id = 'org.hibernate.orm.build.env-settings'
 			implementationClass = 'org.hibernate.orm.env.EnvironmentSettingsPlugin'
 		}
+		jdkVersionSettings {
+			id = 'org.hibernate.orm.build.jdks-settings'
+			implementationClass = 'org.hibernate.orm.toolchains.JdkVersionSettingsPlugin'
+		}
 		envProject {
 			id = 'org.hibernate.orm.build.env-project'
 			implementationClass = 'org.hibernate.orm.env.EnvironmentProjectPlugin'
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionSettingsPlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionSettingsPlugin.java
index 66b3f19dbd..b1fc2c750a 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionSettingsPlugin.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionSettingsPlugin.java
@@ -49,6 +49,7 @@ public class JdkVersionSettingsPlugin implements Plugin<Settings> {
 		);
 
 		settings.getGradle().getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );
+		settings.getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );
 		JdkVersionsLogging.logVersions( jdkVersionConfig );
 	}
 
diff --git a/settings.gradle b/settings.gradle
index 1620f914cb..c0ad56c92d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,6 +19,7 @@ pluginManagement {
 
 plugins {
     id 'org.hibernate.orm.build.env-settings'
+    id 'org.hibernate.orm.build.jdks-settings'
     id 'com.gradle.enterprise' version '3.16.2'
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.13'
 }