diff --git a/samples/hello_world/README.rst b/samples/hello_world/README.rst
index 52a25d7abe5..00218b0944e 100644
--- a/samples/hello_world/README.rst
+++ b/samples/hello_world/README.rst
@@ -17,18 +17,21 @@ Building and Running
 This project outputs 'Hello World' to the console.  It can be built and executed
 on QEMU as follows:
 
-.. code-block:: console
-
-   $ cd samples/hello_world
-   $ make run
-
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: qemu_x86
+   :goals: run
+   :compact:
 
 To build the single thread version, use the supplied configuration file for
 single thread: :file:`prj_single.conf`:
 
-.. code-block:: console
-
-   $ make CONF_FILE=prj_single.conf run
+.. zephyr-app-commands::
+   :zephyr-app: samples/hello_world
+   :board: qemu_x86
+   :conf: prj_single.conf
+   :goals: run
+   :compact:
 
 Sample Output
 =============
diff --git a/samples/philosophers/README.rst b/samples/philosophers/README.rst
index a15e4ee775c..f3b7524a8b6 100644
--- a/samples/philosophers/README.rst
+++ b/samples/philosophers/README.rst
@@ -43,10 +43,11 @@ Building and Running
 This project outputs to the console.  It can be built and executed
 on QEMU as follows:
 
-.. code-block:: console
-
-   $ cd samples/philosophers
-   $ make run
+.. zephyr-app-commands::
+   :zephyr-app: samples/philosophers
+   :board: qemu_x86
+   :goals: run
+   :compact:
 
 Sample Output
 =============
diff --git a/samples/synchronization/README.rst b/samples/synchronization/README.rst
index 5c644490e20..d0eaf4a07b5 100644
--- a/samples/synchronization/README.rst
+++ b/samples/synchronization/README.rst
@@ -18,18 +18,21 @@ Building and Running
 This project outputs to the console.  It can be built and executed
 on QEMU as follows:
 
-.. code-block:: console
-
-   $ cd samples/synchronization
-   $ make run
+.. zephyr-app-commands::
+   :zephyr-app: samples/synchronization
+   :board: qemu_x86
+   :goals: run
+   :compact:
 
 On the supported ARM MCUs the project can be built with the MPU and the Thread
 Stack Guard feature enabled:
 
-.. code-block:: console
-
-   $ cd samples/synchronization
-   $ make BOARD=v2m_beetle CONF_FILE=prj_stack_guard.conf
+.. zephyr-app-commands::
+   :zephyr-app: samples/synchronization
+   :board: v2m_beetle
+   :conf: prj_stack_guard.conf
+   :goals: build flash
+   :compact:
 
 Sample Output
 =============