diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index c421291..69427aa 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -17,12 +17,9 @@
     "arm/mps2/an519"                     : "AN519",
     "arm/mps2/an521"                     : "AN521",
     "arm/mps3/an524"                     : "AN524",
-    "arm/mps2/an539"                     : "AN539",
     "arm/mps3/an547"                     : "AN547",
     "arm/mps3/an552"                     : "AN552",
-    "arm/mps2/sse-200_aws"               : "SSE-200_AWS",
-    "arm/musca_b1/sse_200"               : "MUSCA_B1",
-    "arm/musca_b1/secure_enclave"        : "MUSCA_B1_SE",
+    "arm/musca_b1"                       : "MUSCA_B1",
     "arm/musca_s1"                       : "MUSCA_S1",
     "arm/corstone1000"                   : "corstone1000",
     "arm/mps3/corstone310_fvp"           : "corstone310",
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index e0cbd8e..ccfaa40 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -78,17 +78,17 @@
     # ALL commands will be executed for every build.
     # Other keys will append extra commands when matching target_platform
     "build_cmds": {"all": ["cmake --build ./ -- install"],
-                   "arm/musca_b1/sse_200": [("srec_cat "
-                                         "%(_tbm_build_dir_)s/bin/"
-                                         "bl2.bin "
-                                         "-Binary -offset 0xA000000 "
-                                         "-fill 0xFF 0xA000000 0xA020000 "
-                                         "%(_tbm_build_dir_)s/bin/"
-                                         "tfm_s_ns_signed.bin "
-                                         "-Binary -offset 0xA020000 "
-                                         "-fill 0xFF 0xA020000 0xA200000 "
-                                         "-o %(_tbm_build_dir_)s/bin/"
-                                         "tfm.hex -Intel")],
+                   "arm/musca_b1": [("srec_cat "
+                                 "%(_tbm_build_dir_)s/bin/"
+                                 "bl2.bin "
+                                 "-Binary -offset 0xA000000 "
+                                 "-fill 0xFF 0xA000000 0xA020000 "
+                                 "%(_tbm_build_dir_)s/bin/"
+                                 "tfm_s_ns_signed.bin "
+                                 "-Binary -offset 0xA020000 "
+                                 "-fill 0xFF 0xA020000 0xA200000 "
+                                 "-o %(_tbm_build_dir_)s/bin/"
+                                 "tfm.hex -Intel")],
                    "arm/corstone1000": [("cat "
                                          "%(_tbm_build_dir_)s/bin/"
                                          "bl2_signed.bin "
@@ -153,7 +153,7 @@
                            "tfm_s.bin",
                            "%(_tbm_build_dir_)s/bin/"
                            "tfm_ns.bin"],
-                           "arm/musca_b1/sse_200": [
+                           "arm/musca_b1": [
                            "%(_tbm_build_dir_)s/bin/"
                            "tfm.hex",
                            "%(_tbm_build_dir_)s/bin/"
@@ -175,10 +175,10 @@
     # GCC defect
     ("arm/mps2/an519", "GCC_7_3_1", "*", "*", "*", "*", "Minsizerel", "*", "*", "*", "*"),
     # LR_CODE size exceeds limit on MUSCA_B1 & MUSCA_S1 with regression tests in Debug mode built with ARMCLANG
-    ("arm/musca_b1/sse_200", "ARMCLANG_6_13", "*", "*", True, "OFF", "Debug", "*", "", "*", "*"),
+    ("arm/musca_b1", "ARMCLANG_6_13", "*", "*", True, "OFF", "Debug", "*", "", "*", "*"),
     ("arm/musca_s1", "ARMCLANG_6_13", "*", "*", True, "OFF", "Debug", "*", "", "*", "*"),
     # Load range overlap on Musca for IPC Debug type: T895
-    ("arm/musca_b1/sse_200", "ARMCLANG_6_13", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*"),
+    ("arm/musca_b1", "ARMCLANG_6_13", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*"),
     ("arm/musca_s1", "ARMCLANG_6_13", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*"),
     # LVL2 and LVL3 requires IPC model
     ("*", "*", True, "2", "*", "*", "*", "*", "*", "*", "*"),
@@ -188,7 +188,7 @@
     # FF does not support L3
     ("*", "*", "*", "3", "*", "IPC", "*", "*", "*", "*", "*"),
     # Musca requires BL2
-    ("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", False, "*", "*", "*"),
+    ("arm/musca_b1", "*", "*", "*", "*", "*", "*", False, "*", "*", "*"),
     ("arm/musca_s1", "*", "*", "*", "*", "*", "*", False, "*", "*", "*"),
     # Only AN521 and MUSCA_B1 support Isolation Level 3
     ("arm/mps2/an519", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*"),
@@ -263,7 +263,7 @@
                     ("arm/mps3/an552", "GCC_10_3", False, "1",
                      True, "OFF", "Release", True, "", "ON", ""),
                     # MUSCA_B1_GCC_LIB_1_REG_Minsizerel_BL2
-                    ("arm/musca_b1/sse_200", "GCC_7_3_1", True, "1",
+                    ("arm/musca_b1", "GCC_7_3_1", True, "1",
                      True, "OFF", "Minsizerel", True, "", "ON", ""),
                     # MUSCA_S1_ARMCLANG_IPC_2_REG_Release_BL2
                     ("arm/musca_s1", "ARMCLANG_6_13", False, "2",
@@ -305,7 +305,7 @@
                                      "arm/mps2/an521",
                                      "arm/mps3/an524",
                                      "arm/musca_s1",
-                                     "arm/musca_b1/sse_200"],
+                                     "arm/musca_b1"],
                 "compiler":         ["GCC_7_3_1", "ARMCLANG_6_13"],
                 "lib_model":        [True, False],
                 "isolation_level":  ["1", "2", "3"],
@@ -326,7 +326,7 @@
                 "tfm_platform":     ["arm/mps2/an519",
                                      "arm/mps2/an521",
                                      "arm/mps3/an524",
-                                     "arm/musca_b1/sse_200",
+                                     "arm/musca_b1",
                                      "arm/musca_s1"],
                 "compiler":         ["GCC_7_3_1", "ARMCLANG_6_13"],
                 "lib_model":        [True, False],
@@ -379,7 +379,7 @@
 config_profile_m = {"seed_params": {
                 "tfm_platform":     ["arm/mps2/an519",
                                      "arm/mps2/an521",
-                                     "arm/musca_b1/sse_200"],
+                                     "arm/musca_b1"],
                 "compiler":         ["GCC_7_3_1", "ARMCLANG_6_13"],
                 "lib_model":        [False],
                 "isolation_level":  ["2"],
@@ -413,7 +413,7 @@
                 }
 
 config_cc_driver_psa = {"seed_params": {
-               "tfm_platform":      ["arm/musca_b1/sse_200",
+               "tfm_platform":      ["arm/musca_b1",
                                      "arm/musca_s1"],
                 "compiler":         ["GCC_7_3_1"],
                 "lib_model":        [False],
@@ -449,7 +449,7 @@
 
 config_psa_api = {"seed_params": {
                 "tfm_platform":     ["arm/mps2/an521",
-                                     "arm/musca_b1/sse_200",
+                                     "arm/musca_b1",
                                      "arm/musca_s1"],
                 "compiler":         ["GCC_7_3_1", "ARMCLANG_6_13"],
                 "lib_model":        [True, False],
@@ -606,7 +606,7 @@
                 }
 
 config_musca_b1 = {"seed_params": {
-                "tfm_platform":     ["arm/musca_b1/sse_200"],
+                "tfm_platform":     ["arm/musca_b1"],
                 "compiler":         ["GCC_7_3_1", "ARMCLANG_6_13"],
                 "lib_model":        [True, False],
                 "isolation_level":  ["1", "2", "3"],
@@ -622,23 +622,6 @@
                 "invalid": _common_tfm_invalid_configs + []
                 }
 
-config_musca_b1_se = {"seed_params": {
-                "tfm_platform":     ["arm/musca_b1/secure_enclave"],
-                "compiler":         ["GCC_7_3_1", "ARMCLANG_6_13"],
-                "lib_model":        [False],
-                "isolation_level":  ["1"],
-                "test_regression":  [False],
-                "test_psa_api":     ["OFF"],
-                "cmake_build_type": ["Debug", "Release"],
-                "with_bl2":         [True],
-                "profile":          [""],
-                "partition_ps":     ["ON"],
-                "extra_params":     ["NSOFF"]
-                },
-                "common_params": _common_tfm_builder_cfg,
-                "invalid": _common_tfm_invalid_configs + []
-                }
-
 config_musca_s1 = {"seed_params": {
                 "tfm_platform":     ["arm/musca_s1"],
                 "compiler":         ["GCC_7_3_1", "ARMCLANG_6_13"],
@@ -965,7 +948,6 @@
                     "nightly_mmio": config_mmio,
                     "nightly_an547": config_an547,
                     "nightly_an552": config_an552,
-                    "nightly_musca_b1_se": config_musca_b1_se,
                     "nightly_corstone310": config_corstone310,
                     "nightly_corstone1000": config_corstone1000,
                     "nightly_rss": config_rss,
@@ -1006,7 +988,6 @@
                     "an547": config_an547,
                     "an552": config_an552,
                     "musca_b1": config_musca_b1,
-                    "musca_b1_se": config_musca_b1_se,
                     "musca_s1": config_musca_s1,
                     "corstone310": config_corstone310,
                     "rss": config_rss,
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 7bdf4f8..eb45b5d 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -15,14 +15,11 @@
 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/mps3/an547":                "AN547",
                "arm/mps3/an552":                "AN552",
                "arm/mps3/corstone310_fvp":      "corstone310",
-               "arm/musca_b1/sse_200":          "MUSCA_B1",
-               "arm/musca_b1/secure_enclave":   "MUSCA_B1_SE",
+               "arm/musca_b1":                  "MUSCA_B1",
                "arm/musca_s1":                  "MUSCA_S1",
                "arm/rss":                       "RSS",
                "stm/stm32l562e_dk":             "stm32l562e_dk",
diff --git a/script/tf-coverity/cov-makefile b/script/tf-coverity/cov-makefile
index 197b8d0..506a29e 100644
--- a/script/tf-coverity/cov-makefile
+++ b/script/tf-coverity/cov-makefile
@@ -16,7 +16,7 @@
 target_platforms := cypress/psoc64 \
                     arm/mps2/an519 arm/mps2/an521 \
                     arm/mps3/an524 \
-                    arm/musca_b1/sse_200 arm/musca_s1 \
+                    arm/musca_b1 arm/musca_s1 \
                     stm/stm32l562e_dk
 
 tf_m := trusted-firmware-m
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index c1d7f51..de81392 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -410,7 +410,7 @@
             overwrite_params["test_psa_api"] += " -DINCLUDE_PANIC_TESTS=1"
         if i.test_psa_api == "CRYPTO" and "musca" in i.tfm_platform:
             overwrite_params["test_psa_api"] += " -DCC312_LEGACY_DRIVER_API_ENABLED=OFF"
-        if i.tfm_platform == "arm/musca_b1/sse_200":
+        if i.tfm_platform == "arm/musca_b1":
             overwrite_params["test_psa_api"] += " -DITS_RAM_FS=ON -DPS_RAM_FS=ON"
         if i.tfm_platform == "stm/stm32l562e_dk":
             overwrite_params["test_psa_api"] += " -DITS_RAM_FS=ON -DPS_RAM_FS=ON"