diff --git a/flint-core/src/main/java/org/opensearch/flint/core/metrics/reporter/DimensionUtils.java b/flint-core/src/main/java/org/opensearch/flint/core/metrics/reporter/DimensionUtils.java
index f3d2fa749..b24ebe8f3 100644
--- a/flint-core/src/main/java/org/opensearch/flint/core/metrics/reporter/DimensionUtils.java
+++ b/flint-core/src/main/java/org/opensearch/flint/core/metrics/reporter/DimensionUtils.java
@@ -41,7 +41,7 @@ public class DimensionUtils {
             DIMENSION_APPLICATION_ID, ignored -> getEnvironmentVariableDimension("SERVERLESS_EMR_VIRTUAL_CLUSTER_ID", DIMENSION_APPLICATION_ID),
             DIMENSION_APPLICATION_NAME, ignored -> getEnvironmentVariableDimension("SERVERLESS_EMR_APPLICATION_NAME", DIMENSION_APPLICATION_NAME),
             DIMENSION_DOMAIN_ID, ignored -> getEnvironmentVariableDimension("FLINT_CLUSTER_NAME", DIMENSION_DOMAIN_ID),
-            DIMENSION_SEGMENT, ignored -> constructDimensionFromSparkConf(DIMENSION_SEGMENT, "spark.dynamicAllocation.maxExecutors", UNKNOWN, value -> value + "e")
+            DIMENSION_SEGMENT, ignored -> constructDimensionFromSparkConf(DIMENSION_SEGMENT, "spark.dynamicAllocation.maxExecutors", UNKNOWN, value -> value + "e" + System.getenv().getOrDefault("COMPUTE_PLATFORM", ""))
     );
 
     /**
diff --git a/spark-sql-application/src/main/scala/org/apache/spark/sql/JobOperator.scala b/spark-sql-application/src/main/scala/org/apache/spark/sql/JobOperator.scala
index b76d462bd..37a772447 100644
--- a/spark-sql-application/src/main/scala/org/apache/spark/sql/JobOperator.scala
+++ b/spark-sql-application/src/main/scala/org/apache/spark/sql/JobOperator.scala
@@ -319,7 +319,8 @@ case class JobOperator(
    */
   private def getSegmentName(spark: SparkSession): String = {
     val maxExecutorsCount = spark.conf.get(FlintSparkConf.MAX_EXECUTORS_COUNT.key, "unknown")
-    String.format("%se", maxExecutorsCount)
+    val computePlatform = sys.env.getOrElse("COMPUTE_PLATFORM", "")
+    String.format("%se%s", maxExecutorsCount, computePlatform)
   }
 
   /**