diff --git a/kotlin-native/tools/performance-server/src/main/kotlin/routes/route.kt b/kotlin-native/tools/performance-server/src/main/kotlin/routes/route.kt
index 8832aa63fcc..20a9f44af63 100644
--- a/kotlin-native/tools/performance-server/src/main/kotlin/routes/route.kt
+++ b/kotlin-native/tools/performance-server/src/main/kotlin/routes/route.kt
@@ -226,8 +226,8 @@ fun router() {
     val express = require("express")
     val router = express.Router()
     val connector = ElasticSearchConnector(networkConnector)
-    val benchmarksDispatcher = BenchmarksIndexesDispatcher(connector, "env.machine.os",
-            listOf("Linux", "Mac OS X", "Windows 10")
+    val benchmarksDispatcher = BenchmarksIndexesDispatcher(connector, "target",
+            listOf("Linux", "Mac OS X", "Windows 10", "Mac OS X Arm64")
     )
     val goldenIndex = GoldenResultsIndex(connector)
     val buildInfoIndex = BuildInfoIndex(connector)
@@ -282,9 +282,14 @@ fun router() {
                         val goldenResultPromise = getGoldenResults(goldenIndex)
                         val goldenResults = goldenResultPromise.await()
                         // Register build information.
+                        val target = reports[0].env.machine.os.let {
+                            if (it == "Mac OS X" && reports[0].env.machine.cpu == "aarch64")
+                                "$it Arm64"
+                            else it
+                        }
                         var buildInfoInstance = getConsistentBuildInfo(
                                 BuildInfo(buildInfo.buildNumber, buildInfo.startTime, buildInfo.finishTime,
-                                        commitsList, buildInfo.branch, reports[0].env.machine.os, buildInfo.buildType),
+                                        commitsList, buildInfo.branch, target, buildInfo.buildType),
                                 reports
                         )
                         if (register.bundleSize != null) {
@@ -295,7 +300,7 @@ fun router() {
                             val bundleSizeReport = BenchmarksReport(reports[0].env,
                                     listOf(bundleSizeBenchmark), reports[0].compiler)
                             bundleSizeReport.buildNumber = buildInfoInstance.buildNumber
-                            benchmarksDispatcher.insert(bundleSizeReport, reports[0].env.machine.os).then { _ ->
+                            benchmarksDispatcher.insert(bundleSizeReport, target).then { _ ->
                                 println("[BUNDLE] Success insert ${buildInfoInstance.buildNumber}")
                             }.catch { errorResponse ->
                                 println("Failed to insert data for build")
@@ -307,7 +312,7 @@ fun router() {
                                     .normalizeBenchmarksSet(goldenResults)
                             benchmarksReport.buildNumber = buildInfoInstance.buildNumber
                             // Save results in database.
-                            benchmarksDispatcher.insert(benchmarksReport, benchmarksReport.env.machine.os)
+                            benchmarksDispatcher.insert(benchmarksReport, target)
                         }
                         if (!buildExists(buildInfoInstance, buildInfoIndex)) {
                             buildInfoIndex.insert(buildInfoInstance).then { _ ->
diff --git a/kotlin-native/tools/performance-server/ui/index.ejs b/kotlin-native/tools/performance-server/ui/index.ejs
index b1c9181aee7..71efa251100 100644
--- a/kotlin-native/tools/performance-server/ui/index.ejs
+++ b/kotlin-native/tools/performance-server/ui/index.ejs
@@ -34,6 +34,7 @@
                 <select class="custom-select" id="inputGroupTarget">
                     <option value="Linux">Linux</option>
                     <option value="Mac_OS_X">Mac OS X</option>
+                    <option value="Mac_OS_X_Arm64">Mac OS X(Arm64)</option>
                     <option value="Windows_10">Windows 10</option>
                 </select>
             </div>
diff --git a/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt b/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt
index 47cfc099d14..802656d19d2 100644
--- a/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt
+++ b/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt
@@ -282,8 +282,12 @@ fun main(args: Array<String>) {
         }
     })
 
-    val platformSpecificBenchs = if (parameters["target"] == "Mac_OS_X") ",FrameworkBenchmarksAnalyzer,SpaceFramework_iosX64" else
-        if (parameters["target"] == "Linux") ",kotlinx.coroutines" else ""
+    val platformSpecificBenchs = when (parameters["target"]) {
+        "Mac_OS_X" -> ",FrameworkBenchmarksAnalyzer,SpaceFramework_iosX64"
+        "Mac_OS_X_Arm64" -> ",FrameworkBenchmarksAnalyzer"
+        "Linux" -> ",kotlinx.coroutines"
+        else -> ""
+    }
 
     var execData = listOf<String>() to listOf<List<Double?>>()
     var compileData = listOf<String>() to listOf<List<Double?>>()