diff --git a/Justfile b/Justfile
index 1863a2d..6e246af 100644
--- a/Justfile
+++ b/Justfile
@@ -35,6 +35,11 @@ qemu-cb:
     # Connect to it via chainofcommand to load an actual kernel
     cargo make qemu-cb
 
+# Build and run chainboot in QEMU with GDB port enabled
+qemu-cb-gdb:
+    # Connect to it via chainofcommand to load an actual kernel
+    cargo make qemu-cb-gdb
+
 # Build and write kernel to an SD Card
 device:
     cargo make sdcard
diff --git a/bin/chainboot/Makefile.toml b/bin/chainboot/Makefile.toml
index cc33c89..5070858 100644
--- a/bin/chainboot/Makefile.toml
+++ b/bin/chainboot/Makefile.toml
@@ -33,6 +33,10 @@ disabled = true
 env = { "QEMU_RUNNER_OPTS" = "${QEMU_DISASM_OPTS} -serial pty", "KERNEL_BIN" = "${CHAINBOOT_BIN}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" }
 extend = "qemu-runner"
 
+[tasks.qemu-cb-gdb]
+env = { "QEMU_RUNNER_OPTS" = "${QEMU_DISASM_OPTS} ${QEMU_GDB_OPTS} -serial pty", "KERNEL_BIN" = "${CHAINBOOT_BIN}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" }
+extend = "qemu-runner"
+
 [tasks.gdb]
 disabled = true
 
diff --git a/nucleus/Makefile.toml b/nucleus/Makefile.toml
index 6ce231e..6779125 100644
--- a/nucleus/Makefile.toml
+++ b/nucleus/Makefile.toml
@@ -18,6 +18,9 @@ disabled = true
 env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS} ${QEMU_GDB_OPTS}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" }
 extend = "qemu-runner"
 
+[tasks.qemu-cb-gdb]
+disabled = true
+
 [tasks.chainofcommand]
 disabled = true