diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 0c15bb6..1a341d6 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -31,15 +31,15 @@
 from .tfm_builder import TFM_Builder
 
 
-mapPlatform = {"cypress/psoc64":            "psoc64",
-               "mps2/an519":                "AN519",
-               "mps2/an521":                "AN521",
-               "mps2/an539":                "AN539",
-               "mps2/sse-200_aws":          "SSE-200_AWS",
-               "mps3/an524":                "AN524",
-               "musca_b1/sse_200":          "MUSCA_B1",
-               "musca_b1/secure_enclave":   "MUSCA_B1_SE",
-               "musca_s1":                  "MUSCA_S1"}
+mapPlatform = {"cypress/psoc64":                "psoc64",
+               "arm/mps2/an519":                "AN519",
+               "arm/mps2/an521":                "AN521",
+               "arm/mps2/an539":                "AN539",
+               "arm/mps2/sse-200_aws":          "SSE-200_AWS",
+               "arm/mps3/an524":                "AN524",
+               "arm/musca_b1/sse_200":          "MUSCA_B1",
+               "arm/musca_b1/secure_enclave":   "MUSCA_B1_SE",
+               "arm/musca_s1":                  "MUSCA_S1"}
 
 mapCompiler = {"toolchain_GNUARM.cmake":   "GNUARM",
                "toolchain_ARMCLANG.cmake": "ARMCLANG"}
@@ -402,7 +402,7 @@
                             "partition_ps": i.partition_ps}
         if i.test_psa_api == "IPC":
             overwrite_params["test_psa_api"] += " -DINCLUDE_PANIC_TESTS=1"
-            if i.tfm_platform == "musca_b1/sse_200":
+            if i.tfm_platform == "arm/musca_b1/sse_200":
                 overwrite_params["test_psa_api"] += " -DITS_RAM_FS=ON -DPS_RAM_FS=ON"
         build_cfg["config_template"] %= overwrite_params
         if len(build_cfg["build_cmds"]) > 1: