diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 0a8fb99b0..9a0a5e4c0 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -305,7 +305,6 @@ impl Command {
         select_textobject_around, "Select around object",
         select_textobject_inner, "Select inside object",
         dap_toggle_breakpoint, "Toggle breakpoint",
-        dap_start, "Start debug session",
         dap_run, "Begin program execution",
         dap_continue, "Continue program execution",
         dap_pause, "Pause program execution",
@@ -4491,12 +4490,6 @@ fn dap_start_impl(editor: &mut Editor, name: Option<&str>, params: Option<Vec<&s
     editor.debugger_events.push(stream);
 }
 
-fn dap_start(cx: &mut Context) {
-    // TODO: check that first config does not have templates
-    // which cannot be handled with a shortcut
-    dap_start_impl(&mut cx.editor, None, None);
-}
-
 fn dap_toggle_breakpoint(cx: &mut Context) {
     use helix_lsp::block_on;
 
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 776f02cad..02b5f25c5 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -486,7 +486,6 @@ impl Default for Keymaps {
                 "a" => code_action,
                 "'" => last_picker,
                 "d" => { "Debug"
-                    "s" => dap_start,
                     "b" => dap_toggle_breakpoint,
                     "r" => dap_run,
                     "c" => dap_continue,
diff --git a/languages.toml b/languages.toml
index 83d45e34d..9b9fb4b08 100644
--- a/languages.toml
+++ b/languages.toml
@@ -97,7 +97,7 @@ port-arg = "-p {}"
 [[language.debugger.templates]]
 name = "binary"
 request = "launch"
-args = { console = "internalConsole", program = "main" }
+args = { console = "internalConsole", program = "{0}" }
 
 [[language.debugger.templates]]
 name = "attach"
@@ -125,7 +125,7 @@ port-arg = "-p {}"
 [[language.debugger.templates]]
 name = "binary"
 request = "launch"
-args = { console = "internalConsole", program = "main" }
+args = { console = "internalConsole", program = "{0}" }
 
 [[language.debugger.templates]]
 name = "attach"
@@ -155,12 +155,12 @@ port-arg = "-l 127.0.0.1:{}"
 [[language.debugger.templates]]
 name = "source"
 request = "launch"
-args = { mode = "debug", program = "main.go" }
+args = { mode = "debug", program = "{0}" }
 
 [[language.debugger.templates]]
 name = "binary"
 request = "launch"
-args = { mode = "exec", program = "./main" }
+args = { mode = "exec", program = "{0}" }
 
 [[language.debugger.templates]]
 name = "test"