diff --git a/manifest/make-manifest.toml b/manifest/make-manifest.toml
index ef8b93ab..0e712041 100644
--- a/manifest/make-manifest.toml
+++ b/manifest/make-manifest.toml
@@ -8,7 +8,7 @@ CC = "${TOOLCHAIN}-gcc"
 CXX = "${TOOLCHAIN}-g++"
 OBJCOPY = "${TOOLCHAIN}-objcopy"
 OBJDUMP = "${TOOLCHAIN}-objdump"
-GDB = "${TOOLCHAIN}-gdb-py"
+GDB = "${TOOLCHAIN}-gdb"
 SIZE = "${TOOLCHAIN}-size"
 AS = "${TOOLCHAIN}-as"
 DIR_INCLUDES = ["-I$(QUOTE)../../../ESF/mcu/inc$(QUOTE)",
@@ -46,7 +46,8 @@ HEX_TARGET_PREREQS = ["$(PROJECT_NAME).elf"]
 HEX_TARGET_CMDS = ["$(QUOTE)$(OBJCOPY)$(QUOTE) -O ihex $(HEX_FLAGS) $(QUOTE)$<$(QUOTE) $(QUOTE)$@$(QUOTE)"]
 
 [arch.arm]
-TOOLCHAIN = "${ESF_DIR}/toolchains/arm-none-eabi-toolchain/bin/arm-none-eabi"
+TOOLCHAIN = "arm-none-eabi"
+# TOOLCHAIN = "${ESF_DIR}/toolchains/arm-none-eabi-toolchain/bin/arm-none-eabi"
 CFLAGS = ["-x c", "-DDEBUG", "-Os",
        "-g3",
        "-Wall",