diff --git a/Makefile.toml b/Makefile.toml
index c37c9cb..554df8c 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -114,6 +114,9 @@ script = [
     "echo \n\n"
 ]
 
+[tasks.qemu]
+disabled = true
+
 [tasks.expand]
 env = { "TARGET_FEATURES" = "" }
 command = "cargo"
diff --git a/machine/Makefile.toml b/machine/Makefile.toml
index 594ad4e..97630db 100644
--- a/machine/Makefile.toml
+++ b/machine/Makefile.toml
@@ -1,3 +1,8 @@
 [tasks.qemu-gdb]
 disabled = true
 
+[tasks.gdb]
+disabled = true
+
+[tasks.hopper]
+disabled = true
diff --git a/nucleus/Makefile.toml b/nucleus/Makefile.toml
index 880de2e..efd857d 100644
--- a/nucleus/Makefile.toml
+++ b/nucleus/Makefile.toml
@@ -10,6 +10,7 @@ run_task = "custom-binary"
 [tasks.qemu]
 env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" }
 extend = "qemu-runner"
+disabled = false
 
 [tasks.qemu-cb]
 disabled = true