diff --git a/libs/core/build.gradle b/libs/core/build.gradle
index e24417e09a53d..99c22620e7354 100644
--- a/libs/core/build.gradle
+++ b/libs/core/build.gradle
@@ -8,7 +8,6 @@
  */
 
 apply plugin: 'elasticsearch.publish'
-apply plugin: 'elasticsearch.mrjar'
 
 dependencies {
   // This dependency is used only by :libs:core for null-checking interop with other tools
diff --git a/libs/entitlement/tools/common/build.gradle b/libs/entitlement/tools/common/build.gradle
index 3373a8f747430..89772b4132c5f 100644
--- a/libs/entitlement/tools/common/build.gradle
+++ b/libs/entitlement/tools/common/build.gradle
@@ -7,9 +7,8 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-plugins {
-  id 'java'
-}
-
-group = 'org.elasticsearch.entitlement.tools'
+apply plugin: 'elasticsearch.build'
 
+tasks.named('forbiddenApisMain').configure {
+  replaceSignatureFiles 'jdk-signatures'
+}