diff --git a/gradle/published-java-module.gradle b/gradle/published-java-module.gradle
index ac9043be27..03b715baa5 100644
--- a/gradle/published-java-module.gradle
+++ b/gradle/published-java-module.gradle
@@ -98,6 +98,7 @@ javadoc {
 				'http://docs.jboss.org/cdi/api/2.0/',
 				'https://javaee.github.io/javaee-spec/javadocs/'
 		]
+		tags = [ "apiNote", 'implSpec', 'implNote', 'todo' ]
 		
 		if ( JavaVersion.current().isJava11Compatible() ) {
 			//The need to set `--source 1.8` applies to all JVMs after 11, and also to 11
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 7096cd9bc8..f34338efc6 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -260,4 +260,3 @@ task testJavassist(type: Test) {
 
 check.dependsOn testJavassist
 testJavassist.mustRunAfter test
-