diff --git a/samples/debug/gdbstub/CMakeLists.txt b/samples/subsys/debug/gdbstub/CMakeLists.txt
similarity index 100%
rename from samples/debug/gdbstub/CMakeLists.txt
rename to samples/subsys/debug/gdbstub/CMakeLists.txt
diff --git a/samples/debug/gdbstub/README.rst b/samples/subsys/debug/gdbstub/README.rst
similarity index 100%
rename from samples/debug/gdbstub/README.rst
rename to samples/subsys/debug/gdbstub/README.rst
diff --git a/samples/debug/gdbstub/prj.conf b/samples/subsys/debug/gdbstub/prj.conf
similarity index 100%
rename from samples/debug/gdbstub/prj.conf
rename to samples/subsys/debug/gdbstub/prj.conf
diff --git a/samples/debug/gdbstub/run.gdbinit b/samples/subsys/debug/gdbstub/run.gdbinit
similarity index 100%
rename from samples/debug/gdbstub/run.gdbinit
rename to samples/subsys/debug/gdbstub/run.gdbinit
diff --git a/samples/debug/gdbstub/sample.yaml b/samples/subsys/debug/gdbstub/sample.yaml
similarity index 100%
rename from samples/debug/gdbstub/sample.yaml
rename to samples/subsys/debug/gdbstub/sample.yaml
diff --git a/samples/debug/gdbstub/src/main.c b/samples/subsys/debug/gdbstub/src/main.c
similarity index 100%
rename from samples/debug/gdbstub/src/main.c
rename to samples/subsys/debug/gdbstub/src/main.c
diff --git a/samples/debug/index.rst b/samples/subsys/debug/index.rst
similarity index 100%
rename from samples/debug/index.rst
rename to samples/subsys/debug/index.rst