diff --git a/readme.txt b/readme.txt
index f1490f2f9..8ddbe4655 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,8 @@
 *****************************************************************************
 
 *** 20.3.1 ***
+- NEW: Updated debug tools to be independent from the toolchain position:
+       they now rely on the environment variable CHIBISTUDIO.
 - FIX: Sector count incorrect in STM32G07/8 EFL driver (bug #1085).
 - FIX: Sector size incorrect in STM32F413 EFL driver (bug #1084).
 - NEW: Added dynamic reconfiguration API to lwIP bindings.
diff --git a/tools/eclipse/debug/OpenOCD no interface (prompts for .cfg board configuration).launch b/tools/eclipse/debug/OpenOCD no interface (prompts for .cfg board configuration).launch
index 126965e72..edc28c071 100644
--- a/tools/eclipse/debug/OpenOCD no interface (prompts for .cfg board configuration).launch	
+++ b/tools/eclipse/debug/OpenOCD no interface (prompts for .cfg board configuration).launch	
@@ -5,5 +5,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;${file_prompt}&quot;"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;${env_var:CHIBISTUDIO}/tools/openocd/scripts&quot; -f &quot;${file_prompt}&quot;"/>
 </launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch
index d4c1268d2..4ff2b55c2 100644
--- a/tools/eclipse/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch	
+++ b/tools/eclipse/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch	
@@ -5,5 +5,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -f &quot;interface/ti-icdi.cfg&quot; -f &quot;${file_prompt}&quot;"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;${env_var:CHIBISTUDIO}/tools/openocd/scripts&quot; -f &quot;interface/ti-icdi.cfg&quot; -f &quot;${file_prompt}&quot;"/>
 </launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on STLink (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on STLink (prompts for .cfg target configuration).launch
index 1ab395a1b..133141f6a 100644
--- a/tools/eclipse/debug/OpenOCD on STLink (prompts for .cfg target configuration).launch	
+++ b/tools/eclipse/debug/OpenOCD on STLink (prompts for .cfg target configuration).launch	
@@ -5,5 +5,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;/interface/stlink.cfg&quot; -f &quot;${file_prompt}&quot;"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;${env_var:CHIBISTUDIO}/tools/openocd/scripts&quot; -f &quot;/interface/stlink.cfg&quot; -f &quot;${file_prompt}&quot;"/>
 </launchConfiguration>