diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 004f0bc..50534d6 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -141,7 +141,7 @@
     "poweroff_timeout": 1,
     "recovery_store_url": "https://ci.trustedfirmware.org/userContent/",
     "platforms": {"AN521": "mps2_sse200_an512_new.tar.gz"},
-    "compilers": ["GNUARM", "ARMCLANG"],
+    "compilers": ["GCC", "ARMCLANG"],
     "build_types": ["Debug", "Release", "Minsizerel"],
     "boot_types": ["BL2"],
     "binaries": {
@@ -222,7 +222,7 @@
     "monitor_timeout": 15,
     "poweroff_timeout": 1,
     "platforms": {"AN521": ""},
-    "compilers": ["GNUARM", "ARMCLANG"],
+    "compilers": ["GCC", "ARMCLANG"],
     "build_types": ["Debug", "Release", "Minsizerel"],
     "boot_types": ["BL2"],
     "data_bin_offset": "0x10080000",
@@ -306,7 +306,7 @@
     "monitor_timeout": 15,
     "poweroff_timeout": 1,
     "platforms": {"AN521": ""},
-    "compilers": ["GNUARM", "ARMCLANG"],
+    "compilers": ["GCC", "ARMCLANG"],
     "build_types": ["Debug", "Release", "Minsizerel"],
     "boot_types": ["NOBL2"],
     "data_bin_offset": "0x00100000",
@@ -374,7 +374,7 @@
     "monitor_timeout": 15,
     "poweroff_timeout": 1,
     "platforms": {"AN519": ""},
-    "compilers": ["GNUARM", "ARMCLANG"],
+    "compilers": ["GCC", "ARMCLANG"],
     "build_types": ["Debug", "Release", "Minsizerel"],
     "boot_types": ["BL2"],
     "data_bin_offset": "0x10080000",
@@ -430,7 +430,7 @@
     "monitor_timeout": 15,
     "poweroff_timeout": 1,
     "platforms": {"AN519": ""},
-    "compilers": ["GNUARM", "ARMCLANG"],
+    "compilers": ["GCC", "ARMCLANG"],
     "build_types": ["Debug", "Release", "Minsizerel"],
     "boot_types": ["NOBL2"],
     "data_bin_offset": "0x00100000",
@@ -483,7 +483,7 @@
     "action_timeout": 300,
     "poweroff_timeout": 20,
     "platforms": {"AN521": ""},
-    "compilers": ["GNUARM", "ARMCLANG"],
+    "compilers": ["GCC", "ARMCLANG"],
     "build_types": ["Debug", "Release"],
     "boot_types": ["BL2"],
     "binaries": {
@@ -522,7 +522,7 @@
     "monitor_timeout": 30,
     "poweroff_timeout": 40,
     "platforms": {"MUSCA_B1": ""},
-    "compilers": ["GNUARM", "ARMCLANG"],
+    "compilers": ["GCC", "ARMCLANG"],
     "build_types": ["Debug", "Release", "Minsizerel"],
     "boot_types": ["BL2"],
     "binaries": {
@@ -580,7 +580,7 @@
     "monitor_timeout": 30,
     "poweroff_timeout": 40,
     "platforms": {"MUSCA_B1_OTP": ""},
-    "compilers": ["GNUARM"],
+    "compilers": ["GCC"],
     "build_types": ["Debug"],
     "boot_types": ["BL2"],
     "binaries": {
@@ -603,7 +603,7 @@
     "monitor_timeout": 15,
     "poweroff_timeout": 5,
     "platforms": {"stm32l562e_dk": ""},
-    "compilers": ["GNUARM", "ARMCLANG"],
+    "compilers": ["GCC", "ARMCLANG"],
     "build_types": ["Release", "Minsizerel"],
     "boot_types": ["BL2"],
     "binaries": {
@@ -635,7 +635,7 @@
     "monitor_timeout": 15,
     "poweroff_timeout": 5,
     "platforms": {"lpcxpresso55s69": ""},
-    "compilers": ["GNUARM"],
+    "compilers": ["GCC"],
     "build_types": ["Relwithdebinfo"],
     "boot_types": ["NOBL2"],
     "binaries": {
@@ -661,7 +661,7 @@
     "monitor_timeout": 120,
     "poweroff_timeout": 5,
     "platforms": {"psoc64": ""},
-    "compilers": ["GNUARM", "ARMCLANG"],
+    "compilers": ["GCC", "ARMCLANG"],
     "build_types": ["Release", "Minsizerel"],
     "boot_types": ["NOBL2"],
     "binaries": {