diff --git a/hal/targets/cmsis/TARGET_STM/mbed_rtx.h b/hal/targets/cmsis/TARGET_STM/mbed_rtx.h
index b0a18d335da..bc117b9923b 100644
--- a/hal/targets/cmsis/TARGET_STM/mbed_rtx.h
+++ b/hal/targets/cmsis/TARGET_STM/mbed_rtx.h
@@ -317,36 +317,6 @@
 #define OS_CLOCK                168000000
 #endif
 
-#elif defined(TARGET_STM32F411RE)
-
-#ifndef INITIAL_SP
-#define INITIAL_SP              (0x20020000UL)
-#endif
-#ifndef OS_TASKCNT
-#define OS_TASKCNT              14
-#endif
-#ifndef OS_MAINSTKSIZE
-#define OS_MAINSTKSIZE          256
-#endif
-#ifndef OS_CLOCK
-#define OS_CLOCK                100000000
-#endif
-
-#elif defined(TARGET_STM32F411RE)
-
-#ifndef INITIAL_SP
-#define INITIAL_SP              (0x20020000UL)
-#endif
-#ifndef OS_TASKCNT
-#define OS_TASKCNT              14
-#endif
-#ifndef OS_MAINSTKSIZE
-#define OS_MAINSTKSIZE          256
-#endif
-#ifndef OS_CLOCK
-#define OS_CLOCK                100000000
-#endif
-
 #elif defined(TARGET_STM32F405RG)
 
 #ifndef INITIAL_SP
@@ -362,10 +332,10 @@
 #define OS_CLOCK                48000000
 #endif
 
-#elif defined(TARGET_STM32F411RE)
+#elif defined(TARGET_STM32F401RE)
 
 #ifndef INITIAL_SP
-#define INITIAL_SP              (0x20020000UL)
+#define INITIAL_SP              (0x20018000UL)
 #endif
 #ifndef OS_TASKCNT
 #define OS_TASKCNT              14
@@ -374,13 +344,13 @@
 #define OS_MAINSTKSIZE          256
 #endif
 #ifndef OS_CLOCK
-#define OS_CLOCK                96000000
+#define OS_CLOCK                84000000
 #endif
 
-#elif defined(TARGET_STM32F401RE)
+#elif defined(TARGET_STM32F410RB)
 
 #ifndef INITIAL_SP
-#define INITIAL_SP              (0x20018000UL)
+#define INITIAL_SP              (0x20008000UL)
 #endif
 #ifndef OS_TASKCNT
 #define OS_TASKCNT              14
@@ -389,22 +359,22 @@
 #define OS_MAINSTKSIZE          256
 #endif
 #ifndef OS_CLOCK
-#define OS_CLOCK                84000000
+#define OS_CLOCK                100000000
 #endif
 
-#elif defined(TARGET_STM32F410RB)
+#elif defined(TARGET_MTS_MDOT_F411RE) || defined (TARGET_MTS_DRAGONFLY_F411RE)
 
 #ifndef INITIAL_SP
-#define INITIAL_SP              (0x20008000UL)
+#define INITIAL_SP              (0x20020000UL)
 #endif
 #ifndef OS_TASKCNT
 #define OS_TASKCNT              14
 #endif
 #ifndef OS_MAINSTKSIZE
-#define OS_MAINSTKSIZE          256
+#define OS_MAINSTKSIZE          1024
 #endif
 #ifndef OS_CLOCK
-#define OS_CLOCK                100000000
+#define OS_CLOCK                96000000
 #endif
 
 #elif defined(TARGET_STM32F411RE)