diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JavaModulePlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JavaModulePlugin.java
index ab48bab30c..2581b41e66 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JavaModulePlugin.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JavaModulePlugin.java
@@ -53,8 +53,8 @@ public class JavaModulePlugin implements Plugin<Project> {
 		final SourceSet testSourceSet = sourceSets.getByName( SourceSet.TEST_SOURCE_SET_NAME );
 
 		final JavaCompile mainCompileTask = (JavaCompile) project.getTasks().getByName( mainSourceSet.getCompileJavaTaskName() );
-		mainCompileTask.setSourceCompatibility( jdkVersionsConfig.getTestCompileVersion().toString() );
-		mainCompileTask.setTargetCompatibility( jdkVersionsConfig.getTestCompileVersion().toString() );
+		mainCompileTask.setSourceCompatibility( jdkVersionsConfig.getMainCompileVersion().toString() );
+		mainCompileTask.setTargetCompatibility( jdkVersionsConfig.getMainCompileVersion().toString() );
 
 		final JavaCompile testCompileTask = (JavaCompile) project.getTasks().getByName( testSourceSet.getCompileJavaTaskName() );
 		testCompileTask.setSourceCompatibility( jdkVersionsConfig.getTestCompileVersion().toString() );
diff --git a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
index a11901a7b3..ed65b61e34 100644
--- a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
+++ b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
@@ -17,6 +17,7 @@ plugins {
 	id 'maven-publish'
 
 	id 'org.hibernate.orm.build.jdks'
+	id 'org.hibernate.orm.build.java-module'
 }
 
 apply from: rootProject.file( 'gradle/module.gradle' )