diff --git a/template/template.yaml b/template/template.yaml
index f746d52..53cf911 100644
--- a/template/template.yaml
+++ b/template/template.yaml
@@ -45,14 +45,6 @@ options:
     display_name: Add embassy framework support.
     help: esp-hal-embassy comes with no stability guarantees at this time.
 
-  - !Option
-    name: probe-rs
-    display_name: Use probe-rs to flash and monitor instead of espflash.
-    help: "espflash uses a serial connection (UART) for programming and logging.\nprobe-rs is a
-      debugger that connects to the chips over JTAG. It can be used to flash and monitor, and
-      it can also be used to interactively debug an application, or run tests on the hardware.
-      Semihosting or RTT-based technologies like defmt-rtt require probe-rs."
-
   - !Category
     name: log-options
     display_name: Logging
@@ -60,6 +52,13 @@ options:
       logs are transferred from the device to the host, and frontend determines what API you need to
       use and how the logs are encoded.
     options:
+      - !Option
+        name: probe-rs
+        display_name: Use probe-rs to flash and monitor instead of espflash.
+        help: "espflash uses a serial connection (UART) for programming and logging.\nprobe-rs is a
+          debugger that connects to the chips over JTAG. It can be used to flash and monitor, and
+          it can also be used to interactively debug an application, or run tests on the hardware.
+          Semihosting or RTT-based technologies like defmt-rtt require probe-rs."
       - !Option
         name: esp-println
         display_name: Use esp-println as the logging backend.
@@ -89,6 +88,13 @@ options:
     name: panic
     display_name: Panic handler
     options:
+      - !Option
+        name: probe-rs
+        display_name: Use probe-rs to flash and monitor instead of espflash.
+        help: "espflash uses a serial connection (UART) for programming and logging.\nprobe-rs is a
+          debugger that connects to the chips over JTAG. It can be used to flash and monitor, and
+          it can also be used to interactively debug an application, or run tests on the hardware.
+          Semihosting or RTT-based technologies like defmt-rtt require probe-rs."
       - !Option
         name: esp-backtrace
         display_name: Use esp-backtrace as the panic handler.