diff --git a/modules/ingest-attachment/src/main/config/log4j2.properties b/modules/ingest-attachment/src/main/config/log4j2.properties
index 92951ec9e0e56..0f1deb9bc48f8 100644
--- a/modules/ingest-attachment/src/main/config/log4j2.properties
+++ b/modules/ingest-attachment/src/main/config/log4j2.properties
@@ -9,3 +9,6 @@ logger.org_apache_fontbox.level = off
 
 logger.org_apache_xmlbeans.name = org.apache.xmlbeans
 logger.org_apache_xmlbeans.level = off
+
+logger.entitlements_ingest_attachment.name = org.elasticsearch.entitlement.runtime.policy.PolicyManager.ingest-attachment.ALL-UNNAMED
+logger.entitlements_ingest_attachment.level = error
diff --git a/modules/repository-gcs/src/main/config/log4j2.properties b/modules/repository-gcs/src/main/config/log4j2.properties
index ba596176f8956..3ba07198d91fd 100644
--- a/modules/repository-gcs/src/main/config/log4j2.properties
+++ b/modules/repository-gcs/src/main/config/log4j2.properties
@@ -1,3 +1,2 @@
-logger.org_elasticsearch_entitlement_runtime_policy_PolicyManager.name = org.elasticsearch.entitlement.runtime.policy.PolicyManager.repository-gcs.ALL-UNNAMED
-logger.org_elasticsearch_entitlement_runtime_policy_PolicyManager.level = error
-
+logger.entitlements_repository_gcs.name = org.elasticsearch.entitlement.runtime.policy.PolicyManager.repository-gcs.ALL-UNNAMED
+logger.entitlements_repository_gcs.level = error
diff --git a/modules/repository-s3/src/main/config/log4j2.properties b/modules/repository-s3/src/main/config/log4j2.properties
index 1ee119746149d..903a5fde9d53c 100644
--- a/modules/repository-s3/src/main/config/log4j2.properties
+++ b/modules/repository-s3/src/main/config/log4j2.properties
@@ -13,6 +13,6 @@ logger.com_amazonaws_auth_profile_internal_BasicProfileConfigFileLoader.level =
 logger.com_amazonaws_services_s3_internal_UseArnRegionResolver.name = com.amazonaws.services.s3.internal.UseArnRegionResolver
 logger.com_amazonaws_services_s3_internal_UseArnRegionResolver.level = error
 
-logger.org_elasticsearch_entitlement_runtime_policy_PolicyManager.name = org.elasticsearch.entitlement.runtime.policy.PolicyManager.repository-s3.ALL-UNNAMED
-logger.org_elasticsearch_entitlement_runtime_policy_PolicyManager.level = error
+logger.entitlements_repository_s3.name = org.elasticsearch.entitlement.runtime.policy.PolicyManager.repository-s3.ALL-UNNAMED
+logger.entitlements_repository_s3.level = error
 
diff --git a/plugins/discovery-ec2/config/discovery-ec2/log4j2.properties b/plugins/discovery-ec2/config/discovery-ec2/log4j2.properties
index 36a38cf9d13a0..78e7c0aa473bb 100644
--- a/plugins/discovery-ec2/config/discovery-ec2/log4j2.properties
+++ b/plugins/discovery-ec2/config/discovery-ec2/log4j2.properties
@@ -12,3 +12,6 @@ logger.com_amazonaws_auth_profile_internal_BasicProfileConfigFileLoader.level =
 
 logger.com_amazonaws_services_s3_internal_UseArnRegionResolver.name = com.amazonaws.services.s3.internal.UseArnRegionResolver
 logger.com_amazonaws_services_s3_internal_UseArnRegionResolver.level = error
+
+logger.entitlements_discovery_ec2.name = org.elasticsearch.entitlement.runtime.policy.PolicyManager.discovery-ec2.ALL-UNNAMED
+logger.entitlements_discovery_ec2.level = error
diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle
index c6beaf3f332ca..4c37831b0beec 100644
--- a/plugins/discovery-gce/build.gradle
+++ b/plugins/discovery-gce/build.gradle
@@ -44,6 +44,10 @@ tasks.named("dependencyLicenses").configure {
   mapping from: /jackson-.*/, to: 'jackson'
 }
 
+esplugin.bundleSpec.from('config/discovery-gce') {
+  into 'config'
+}
+
 tasks.named("check").configure {
   // also execute the QA tests when testing the plugin
   dependsOn 'qa:gce:check'
diff --git a/plugins/discovery-gce/config/discovery-gce/log4j2.properties b/plugins/discovery-gce/config/discovery-gce/log4j2.properties
new file mode 100644
index 0000000000000..cde35af628683
--- /dev/null
+++ b/plugins/discovery-gce/config/discovery-gce/log4j2.properties
@@ -0,0 +1,3 @@
+logger.entitlements_discovery_gce.name = org.elasticsearch.entitlement.runtime.policy.PolicyManager.discovery-gce.ALL-UNNAMED
+logger.entitlements_discovery_gce.level = error
+
diff --git a/x-pack/plugin/inference/src/main/config/log4j2.properties b/x-pack/plugin/inference/src/main/config/log4j2.properties
new file mode 100644
index 0000000000000..10646b5d8c13f
--- /dev/null
+++ b/x-pack/plugin/inference/src/main/config/log4j2.properties
@@ -0,0 +1,3 @@
+logger.entitlements_inference.name = org.elasticsearch.entitlement.runtime.policy.PolicyManager.inference.software.amazon.awssdk.profiles
+logger.entitlements_inference.level = error
+