diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index b83402f..8d57cfa 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -181,10 +181,10 @@
     }
     // Only submit LAVA test for a specified OTP enabled config in nightly or release job
     else if (params_collection["OTP"] == "ENABLED" && \
-             params_collection["CONFIG_NAME"] != "MUSCA_B1_ARMCLANG_PSA_3_REG_Debug_OTP_BL2_NS") {
+             params_collection["CONFIG_NAME"] != "MUSCA_B1_GNUARM_PSA_3_REG_Debug_OTP_BL2_NS") {
       print("LAVA is not needed for ${build_url}")
     }
-    else if (params_collection["CONFIG_NAME"] == "MUSCA_B1_ARMCLANG_PSA_3_REG_Debug_OTP_BL2_NS" && \
+    else if (params_collection["CONFIG_NAME"] == "MUSCA_B1_GNUARM_PSA_3_REG_Debug_OTP_BL2_NS" && \
              !(env.JOB_NAME.equals("tf-m-nightly") || env.JOB_NAME.equals("tf-m-release"))) {
       print("LAVA is not needed for ${build_url}")
     }
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index f3cc435..e5a81cd 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -2762,7 +2762,7 @@
     "monitor_timeout": 30,
     "poweroff_timeout": 40,
     "platforms": {"MUSCA_B1_OTP": ""},
-    "compilers": ["ARMCLANG"],
+    "compilers": ["GNUARM"],
     "build_types": ["Debug"],
     "boot_types": ["BL2"],
     "tests": {