diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 3ed5901..bbdebb9 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -677,8 +677,8 @@
                 "invalid": _common_tfm_invalid_configs + []
                 }
 
-config_corstone_polaris = {"seed_params": {
-                "tfm_platform":     ["arm/mps3/corstone_polaris"],
+config_corstone310 = {"seed_params": {
+                "tfm_platform":     ["arm/mps3/corstone310_fvp"],
                 "compiler":         ["GCC_10_3"],
                 "lib_model":        [False],
                 "isolation_level":  ["1"],
@@ -985,7 +985,7 @@
                     "nightly_an547": config_an547,
                     "nightly_an552": config_an552,
                     "nightly_musca_b1_se": config_musca_b1_se,
-                    "nightly_polaris": config_corstone_polaris,
+                    "nightly_corstone310": config_corstone310,
                     "nightly_corstone1000": config_corstone1000,
                     "nightly_psoc64": config_psoc64,
                     "nightly_stm32l562e_dk": config_stm32l562e_dk,
@@ -1003,7 +1003,7 @@
                     "release_mmio": config_mmio,
                     "release_an547": config_an547,
                     "release_an552": config_an552,
-                    "release_polaris": config_corstone_polaris,
+                    "release_corstone310": config_corstone310,
                     "release_psoc64": config_psoc64,
                     "release_stm32l562e_dk": config_stm32l562e_dk,
                     "release_lpcxpresso55s69": config_lpcxpresso55s69,
@@ -1025,7 +1025,7 @@
                     "musca_b1": config_musca_b1,
                     "musca_b1_se": config_musca_b1_se,
                     "musca_s1": config_musca_s1,
-                    "corstone_polaris": config_corstone_polaris,
+                    "corstone310": config_corstone310,
                     "cypress_psoc64": config_psoc64,
                     "corstone1000": config_corstone1000,
                     "stm_stm32l562e_dk": config_stm32l562e_dk,
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 6a9eff5..62c814d 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -20,7 +20,7 @@
                "arm/mps3/an524":                "AN524",
                "arm/mps3/an547":                "AN547",
                "arm/mps3/an552":                "AN552",
-               "arm/mps3/corstone_polaris":     "corstone_polaris",
+               "arm/mps3/corstone310_fvp":      "corstone310",
                "arm/musca_b1/sse_200":          "MUSCA_B1",
                "arm/musca_b1/secure_enclave":   "MUSCA_B1_SE",
                "arm/musca_s1":                  "MUSCA_S1",
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 27152a7..451ef41 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -45,7 +45,7 @@
                "arm/corstone1000":                    "corstone1000",
                "nxp/lpcxpresso55s69":                 "lpcxpresso55s69",
                "arm/mps3/an547":                      "AN547",
-               "arm/mps3/corstone_polaris":           "Polaris",
+               "arm/mps3/corstone310_fvp" :           "corstone310",
                "arm/mps3/an552":                      "AN552",
                "lairdconnectivity/bl5340_dvk_cpuapp": "BL5340",
                "nordic_nrf/nrf5340dk_nrf5340_cpuapp": "nrf5340dk",