diff --git a/docs/tools/CLI/cli-setup/cli-reqs.md b/docs/tools/CLI/cli-setup/cli-reqs.md
index e96a5716ba..96c0ae0ce9 100644
--- a/docs/tools/CLI/cli-setup/cli-reqs.md
+++ b/docs/tools/CLI/cli-setup/cli-reqs.md
@@ -223,9 +223,9 @@ Mbed CLI supports a setting for each toolchain path:
 
 | Toolchain | Example binary location | Setting name | Example path |
 | --------- | --------- | ---------| --------- |
-| Arm Compiler 5 | `C:/Program Files/ARM_Compiler_5.06u5/bin/armcc` | `ARM_PATH` | `C:/Program Files/ARM_Compiler_5.06u5` |
+| Arm Compiler 5 | `C:/Program Files/ARM_Compiler_5.06u6/bin/armcc` | `ARM_PATH` | `C:/Program Files/ARM_Compiler_5.06u6` |
 | Arm Compiler 6 | `C:/Program Files/ARM/armcc6.10/bin/armclang` | `ARMC6_PATH` | `C:/Program Files/ARM/armcc6.10/bin` |
-| IAR EWARM Compiler | `C:/Program Files/IAR Systems/Embedded Workbench 7.5/arm/bin/iccarm.exe` | `IAR_PATH` | `C:/Program Files/IAR Systems/Embedded Workbench 7.5/arm`|
+| IAR EWARM Compiler | `C:/Program Files/IAR Systems/Embedded Workbench 8.2/arm/bin/iccarm.exe` | `IAR_PATH` | `C:/Program Files/IAR Systems/Embedded Workbench 8.2/arm`|
 | GCC Arm Embedded Compiler | `/usr/bin/arm-none-eabi-gcc` | `GCC_ARM_PATH` | `/usr/bin`|
 
 
diff --git a/docs/tools/toolchains/export_to_third_party.md b/docs/tools/toolchains/export_to_third_party.md
index 4b88e8522a..c13ccf0117 100644
--- a/docs/tools/toolchains/export_to_third_party.md
+++ b/docs/tools/toolchains/export_to_third_party.md
@@ -5,18 +5,18 @@ If you'd like to develop on Arm Mbed OS with a third party tool, or migrate to o
 - Keil uVision5.
 - IAR Systems.
 - Eclipse CDT ([C/C++ Development Tooling](https://www.eclipse.org/cdt/)) make (unmanaged) projects using:
-    - GNU Arm Embedded Toolchain.
-    - Arm Compiler 5.
-    - IAR Arm Compiler (versions 7.70 to 7.80.x).
-- GNU Arm Eclipse (managed [CDT](https://www.eclipse.org/cdt/) projects), using GNU Arm Embedded Toolchain.
+    - GNU Arm Embedded Toolchain 6 (6-2017-q1-update).
+    - Arm Compiler 5.06 Update 6.
+    - IAR Arm Compiler (version 8.32).
+- GNU Arm Eclipse (managed [CDT](https://www.eclipse.org/cdt/) projects), using GNU Arm Embedded Toolchain 6.
 - Make using:
-    - GNU Arm Embedded Toolchain.
-    - Arm Compiler 5.
-    - IAR Arm Compiler (versions 7.70 to 7.80.x).
+    - GNU Arm Embedded Toolchain 6 (6-2017-q1-update).
+    - Arm Compiler 5.06 Update 6.
+    - IAR Arm Compiler (version 8.32).
 - VSCode using:
-    - GNU Arm Embedded Toolchain.
-    - Arm Compiler 5.
-    - IAR Arm Compiler (versions 7.70 to 7.80.x).
+    - GNU Arm Embedded Toolchain 6 (6-2017-q1-update).
+    - Arm Compiler 5.06 Update 6.
+    - IAR Arm Compiler (version 8.32).
 - Code::Blocks.
 - Cross Core Embedded Studio.
 - e2studio.
diff --git a/docs/tools/tools_intro.md b/docs/tools/tools_intro.md
index 907e07b81b..a8491f0078 100644
--- a/docs/tools/tools_intro.md
+++ b/docs/tools/tools_intro.md
@@ -22,8 +22,8 @@ We created the Mbed command-line tool (Mbed CLI), a Python-based tool, specifica
 Mbed OS 5 can be built with various toolchains. The currently supported versions are:
 
 - [Arm compiler 5.06 update 6](https://developer.arm.com/products/software-development-tools/compilers/arm-compiler-5/downloads).
-- [GNU Arm Embedded version 6](https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads).
-- [IAR Embedded Workbench 7.8](https://www.iar.com/iar-embedded-workbench/tools-for-arm/arm-cortex-m-edition/).
+- [GNU Arm Embedded version  6 (6-2017-q1-update)](https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads).
+- [IAR Embedded Workbench 8.32](https://www.iar.com/iar-embedded-workbench/tools-for-arm/arm-cortex-m-edition/).
 
 ##### Arm Mbed Online Compiler