diff --git a/boards.txt b/boards.txt
index 6508be1de4..8c5920f28a 100644
--- a/boards.txt
+++ b/boards.txt
@@ -878,12 +878,10 @@ Nucleo_64.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
 Nucleo_64.menu.upload_method.OpenOCD=OpenOCD STLink (SWD)
 Nucleo_64.menu.upload_method.OpenOCD.upload.protocol=stlink
-Nucleo_64.menu.upload_method.OpenOCD.upload.setup_command=transport select hla_swd;
 Nucleo_64.menu.upload_method.OpenOCD.upload.tool=openocd_upload
 
 Nucleo_64.menu.upload_method.OpenOCDDap=OpenOCD DapLink (SWD)
 Nucleo_64.menu.upload_method.OpenOCDDap.upload.protocol=cmsis-dap
-Nucleo_64.menu.upload_method.OpenOCDDap.upload.setup_command=transport select swd;
 Nucleo_64.menu.upload_method.OpenOCDDap.upload.tool=openocd_upload
 
 ################################################################################
diff --git a/platform.txt b/platform.txt
index cccd97e1ea..38ff4db9bc 100644
--- a/platform.txt
+++ b/platform.txt
@@ -244,7 +244,7 @@ tools.openocd_upload.cmd=bin/openocd
 tools.openocd_upload.cmd.windows=bin/openocd.exe
 tools.openocd_upload.upload.params.verbose=-d2
 tools.openocd_upload.upload.params.quiet=-d0
-tools.openocd_upload.upload.pattern="{path}/{cmd}" {upload.verbose} -f interface/{upload.protocol}.cfg -c "{upload.setup_command}" -f target/{openocd.target}.cfg -c "program {{build.path}/{build.project_name}.bin} verify reset; shutdown;"
+tools.openocd_upload.upload.pattern="{path}/{cmd}" {upload.verbose} -f interface/{upload.protocol}.cfg -f target/{openocd.target}.cfg -c "program {build.path}/{build.project_name}.elf verify reset exit"
 
 #
 # Debugger