diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/risk_score_data_client.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/risk_score_data_client.ts
index 572a8deafd9bc..23c4317de3b8c 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/risk_score_data_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/risk_score_data_client.ts
@@ -130,7 +130,7 @@ export class RiskScoreDataClient {
           logger: this.options.logger,
           esClient,
           template: {
-            name: mappingComponentName,
+            name: nameSpaceAwareMappingsComponentName(namespace),
             _meta: {
               managed: true,
             },
@@ -151,7 +151,7 @@ export class RiskScoreDataClient {
           body: {
             data_stream: { hidden: true },
             index_patterns: [indexPatterns.alias],
-            composed_of: [mappingComponentName],
+            composed_of: [nameSpaceAwareMappingsComponentName(namespace)],
             template: {
               lifecycle: {},
               settings: {