diff --git a/tools/build_api.py b/tools/build_api.py
index cbe2f8d253..423adc5121 100644
--- a/tools/build_api.py
+++ b/tools/build_api.py
@@ -443,7 +443,7 @@ def scan_resources(src_paths, toolchain, dependencies_paths=None,
             "rtos" in toolchain.config.lib_config_data):
         if "Cortex-A" in toolchain.target.core:
             raise NotSupportedException(
-                ("%s Will be supported in mbed OS 5.6. "
+                ("%s Will be supported in a future version of Mbed OS. "
                     "To use the %s, please checkout the mbed OS 5.4 release branch. "
                     "See https://developer.mbed.org/platforms/Renesas-GR-PEACH/#important-notice "
                     "for more information") % (toolchain.target.name, toolchain.target.name))
diff --git a/tools/options.py b/tools/options.py
index 8cfec663ac..58aed4d6d7 100644
--- a/tools/options.py
+++ b/tools/options.py
@@ -122,7 +122,7 @@ def mcu_is_enabled(parser, mcu):
     if "Cortex-A" in TARGET_MAP[mcu].core:
         args_error(
             parser,
-            ("%s Will be supported in mbed OS 5.6. "
+            ("%s Will be supported in a future version of Mbed OS. "
              "To use the %s, please checkout the mbed OS 5.4 release branch. "
              "See https://developer.mbed.org/platforms/Renesas-GR-PEACH/#important-notice "
              "for more information") % (mcu, mcu))