diff --git a/samples/arch/index.rst b/samples/arch/index.rst
new file mode 100644
index 00000000000..916f8cdf063
--- /dev/null
+++ b/samples/arch/index.rst
@@ -0,0 +1,10 @@
+.. _arch-samples:
+
+Architecture Dependent Samples
+##############################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/samples/mpu/index.rst b/samples/arch/mpu/index.rst
similarity index 100%
rename from samples/mpu/index.rst
rename to samples/arch/mpu/index.rst
diff --git a/samples/mpu/mpu_test/CMakeLists.txt b/samples/arch/mpu/mpu_test/CMakeLists.txt
similarity index 100%
rename from samples/mpu/mpu_test/CMakeLists.txt
rename to samples/arch/mpu/mpu_test/CMakeLists.txt
diff --git a/samples/mpu/mpu_test/README.rst b/samples/arch/mpu/mpu_test/README.rst
similarity index 100%
rename from samples/mpu/mpu_test/README.rst
rename to samples/arch/mpu/mpu_test/README.rst
diff --git a/samples/mpu/mpu_test/prj.conf b/samples/arch/mpu/mpu_test/prj.conf
similarity index 100%
rename from samples/mpu/mpu_test/prj.conf
rename to samples/arch/mpu/mpu_test/prj.conf
diff --git a/samples/mpu/mpu_test/prj_single.conf b/samples/arch/mpu/mpu_test/prj_single.conf
similarity index 100%
rename from samples/mpu/mpu_test/prj_single.conf
rename to samples/arch/mpu/mpu_test/prj_single.conf
diff --git a/samples/mpu/mpu_test/sample.yaml b/samples/arch/mpu/mpu_test/sample.yaml
similarity index 100%
rename from samples/mpu/mpu_test/sample.yaml
rename to samples/arch/mpu/mpu_test/sample.yaml
diff --git a/samples/mpu/mpu_test/src/main.c b/samples/arch/mpu/mpu_test/src/main.c
similarity index 100%
rename from samples/mpu/mpu_test/src/main.c
rename to samples/arch/mpu/mpu_test/src/main.c
diff --git a/samples/smp/index.rst b/samples/arch/smp/index.rst
similarity index 100%
rename from samples/smp/index.rst
rename to samples/arch/smp/index.rst
diff --git a/samples/smp/pi/CMakeLists.txt b/samples/arch/smp/pi/CMakeLists.txt
similarity index 100%
rename from samples/smp/pi/CMakeLists.txt
rename to samples/arch/smp/pi/CMakeLists.txt
diff --git a/samples/smp/pi/README.rst b/samples/arch/smp/pi/README.rst
similarity index 100%
rename from samples/smp/pi/README.rst
rename to samples/arch/smp/pi/README.rst
diff --git a/samples/smp/pi/prj.conf b/samples/arch/smp/pi/prj.conf
similarity index 100%
rename from samples/smp/pi/prj.conf
rename to samples/arch/smp/pi/prj.conf
diff --git a/samples/smp/pi/sample.yaml b/samples/arch/smp/pi/sample.yaml
similarity index 100%
rename from samples/smp/pi/sample.yaml
rename to samples/arch/smp/pi/sample.yaml
diff --git a/samples/smp/pi/src/main.c b/samples/arch/smp/pi/src/main.c
similarity index 100%
rename from samples/smp/pi/src/main.c
rename to samples/arch/smp/pi/src/main.c
diff --git a/samples/smp/pktqueue/CMakeLists.txt b/samples/arch/smp/pktqueue/CMakeLists.txt
similarity index 100%
rename from samples/smp/pktqueue/CMakeLists.txt
rename to samples/arch/smp/pktqueue/CMakeLists.txt
diff --git a/samples/smp/pktqueue/README.rst b/samples/arch/smp/pktqueue/README.rst
similarity index 100%
rename from samples/smp/pktqueue/README.rst
rename to samples/arch/smp/pktqueue/README.rst
diff --git a/samples/smp/pktqueue/prj.conf b/samples/arch/smp/pktqueue/prj.conf
similarity index 100%
rename from samples/smp/pktqueue/prj.conf
rename to samples/arch/smp/pktqueue/prj.conf
diff --git a/samples/smp/pktqueue/sample.yaml b/samples/arch/smp/pktqueue/sample.yaml
similarity index 100%
rename from samples/smp/pktqueue/sample.yaml
rename to samples/arch/smp/pktqueue/sample.yaml
diff --git a/samples/smp/pktqueue/src/main.c b/samples/arch/smp/pktqueue/src/main.c
similarity index 100%
rename from samples/smp/pktqueue/src/main.c
rename to samples/arch/smp/pktqueue/src/main.c
diff --git a/samples/smp/pktqueue/src/main.h b/samples/arch/smp/pktqueue/src/main.h
similarity index 100%
rename from samples/smp/pktqueue/src/main.h
rename to samples/arch/smp/pktqueue/src/main.h
diff --git a/samples/smp/pktqueue/src/pktqueue.c b/samples/arch/smp/pktqueue/src/pktqueue.c
similarity index 100%
rename from samples/smp/pktqueue/src/pktqueue.c
rename to samples/arch/smp/pktqueue/src/pktqueue.c
diff --git a/samples/smp/pktqueue/src/pktqueue.h b/samples/arch/smp/pktqueue/src/pktqueue.h
similarity index 100%
rename from samples/smp/pktqueue/src/pktqueue.h
rename to samples/arch/smp/pktqueue/src/pktqueue.h
diff --git a/samples/index.rst b/samples/index.rst
index b2f78824591..057367e6ee1 100644
--- a/samples/index.rst
+++ b/samples/index.rst
@@ -17,14 +17,12 @@ Samples and Demos
    sensor/*
    arch/*
    boards/*
-   mpu/*
    drivers/drivers.rst
    application_development/*
    shields/*
    portability/*
    posix/*
    kernel/*
-   smp/*
    tfm_integration/tfm_integration.rst
 
 .. comment