diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py
index d7a9ddf2ab..fde3603fb3 100644
--- a/tools/toolchains/__init__.py
+++ b/tools/toolchains/__init__.py
@@ -216,6 +216,9 @@ class mbedToolchain:
         self.CHROOT = None
 
         self.mp_pool = None
+        
+        if 'UVISOR_PRESENT' in self.macros:
+            self.target.core = re.sub(r"F$", '', self.target.core)
 
     def get_output(self):
         return self.output