diff --git a/docs/changelog/114337.yaml b/docs/changelog/114337.yaml
new file mode 100644
index 0000000000000..ec55be8bb179b
--- /dev/null
+++ b/docs/changelog/114337.yaml
@@ -0,0 +1,5 @@
+pr: 114337
+summary: "Enables cluster state role mapper, to include ECK operator-defined role mappings in role resolution"
+area: Authentication
+type: bug
+issues: []
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java
index 21a5b53e89af7..d84e4a7bc9dc4 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java
@@ -148,15 +148,6 @@ public class RoleMappingFileSettingsIT extends NativeRealmIntegTestCase {
}
}""";
- @Override
- protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
- Settings.Builder builder = Settings.builder()
- .put(super.nodeSettings(nodeOrdinal, otherSettings))
- // some tests make use of cluster-state based role mappings
- .put("xpack.security.authc.cluster_state_role_mappings.enabled", true);
- return builder.build();
- }
-
@After
public void cleanUp() {
updateClusterSettings(Settings.builder().putNull("indices.recovery.max_bytes_per_sec"));
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtRoleMappingsIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtRoleMappingsIntegTests.java
index 0a4a379e3a060..77fe4a896eedb 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtRoleMappingsIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtRoleMappingsIntegTests.java
@@ -78,8 +78,6 @@ private void clearRoleMappings() throws InterruptedException {
protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
Settings.Builder builder = Settings.builder()
.put(super.nodeSettings(nodeOrdinal, otherSettings))
- // some tests make use of cluster-state based role mappings
- .put("xpack.security.authc.cluster_state_role_mappings.enabled", true)
.put(XPackSettings.TOKEN_SERVICE_ENABLED_SETTING.getKey(), randomBoolean())
// 1st JWT realm
.put("xpack.security.authc.realms.jwt.jwt0.order", 10)
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/ClusterStateRoleMapper.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/ClusterStateRoleMapper.java
index 9a6e9e75c4685..5dea6a938263c 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/ClusterStateRoleMapper.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/ClusterStateRoleMapper.java
@@ -31,9 +31,9 @@
public final class ClusterStateRoleMapper extends AbstractRoleMapperClearRealmCache implements ClusterStateListener {
/**
- * This setting is never registered by the xpack security plugin - in order to enable the
+ * This setting is never registered by the xpack security plugin - in order to disable the
* cluster-state based role mapper another plugin must register it as a boolean setting
- * and set it to `true`.
+ * and set it to `false`.
* If this setting is set to true then:
*