diff --git a/samples/arch/mpu/mpu_test/README.rst b/samples/arch/mpu/mpu_test/README.rst
index 750bdda41bc..8c0be7ad1f6 100644
--- a/samples/arch/mpu/mpu_test/README.rst
+++ b/samples/arch/mpu/mpu_test/README.rst
@@ -1,7 +1,7 @@
-.. _mpu_test:
+.. zephyr:code-sample:: mpu
+   :name: Memory Protection Unit (MPU)
 
-Memory Protection Unit (MPU) Sample
-###################################
+   Use memory protection to prevent common security issues.
 
 Overview
 ********
diff --git a/samples/arch/smp/pi/README.rst b/samples/arch/smp/pi/README.rst
index ffdd5540ecc..2db473da88f 100644
--- a/samples/arch/smp/pi/README.rst
+++ b/samples/arch/smp/pi/README.rst
@@ -1,7 +1,7 @@
-.. _smp_pi:
+.. zephyr:code-sample:: smp_pi
+   :name: SMP Pi
 
-SMP Pi
-###########
+   Calculate the first 240 digits of Pi on multiple execution units.
 
 Overview
 ********
diff --git a/samples/arch/smp/pktqueue/README.rst b/samples/arch/smp/pktqueue/README.rst
index dd2d1221382..beddc406230 100644
--- a/samples/arch/smp/pktqueue/README.rst
+++ b/samples/arch/smp/pktqueue/README.rst
@@ -1,7 +1,7 @@
-.. _smp_pktqueue:
+.. zephyr:code-sample:: smp_pktqueue
+   :name: SMP pktqueue
 
-SMP pktqueue
-############
+   Use SMP to process multiple packet headers in parallel.
 
 Overview
 ********