diff --git a/doc/rtd/howto/run_cloud_init_locally.rst b/doc/rtd/howto/run_cloud_init_locally.rst
index 0111bc1da42..2510eadd067 100644
--- a/doc/rtd/howto/run_cloud_init_locally.rst
+++ b/doc/rtd/howto/run_cloud_init_locally.rst
@@ -70,6 +70,12 @@ Download an Ubuntu image to run:
 
     wget https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
 
+.. note::
+   This example uses emulated CPU instructions on non-x86 hosts, so it may be
+   slow. To make it faster on non-x86 architectures, one can change the image
+   type and :spelling:ignore:`qemu-system-<arch>` command name to match the
+   architecture of your host machine.
+
 Boot the image with the ISO attached
 ------------------------------------
 
@@ -78,8 +84,9 @@ Boot the cloud image with our configuration, :file:`seed.img`, to QEMU:
 .. code-block:: shell-session
 
     $ qemu-system-x86_64 -m 1024 -net nic -net user \
-        -hda jammy-server-cloudimg-amd64.img \
-        -hdb seed.img
+        -drive file=jammy-server-cloudimg-amd64.img,index=0,format=qcow2,media=disk \
+        -drive file=seed.img,index=1,media=cdrom \
+        -machine accel=kvm:tcg
 
 The now-booted image will allow for login using the password provided above.
 
diff --git a/doc/rtd/tutorial/qemu.rst b/doc/rtd/tutorial/qemu.rst
index 4c1afedd8a1..caa79cd39dd 100644
--- a/doc/rtd/tutorial/qemu.rst
+++ b/doc/rtd/tutorial/qemu.rst
@@ -80,6 +80,12 @@ server image using :command:`wget`:
 
     $ wget https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
 
+.. note::
+   This example uses emulated CPU instructions on non-x86 hosts, so it may be
+   slow. To make it faster on non-x86 architectures, one can change the image
+   type and :spelling:ignore:`qemu-system-<arch>` command name to match the
+   architecture of your host machine.
+
 Define our user data
 ====================
 
@@ -203,7 +209,6 @@ take a few moments to complete.
         -net nic                                                    \
         -net user                                                   \
         -machine accel=kvm:tcg                                      \
-        -cpu host                                                   \
         -m 512                                                      \
         -nographic                                                  \
         -hda jammy-server-cloudimg-amd64.img                        \
diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
index d371798668f..80872dcb508 100644
--- a/tools/.github-cla-signers
+++ b/tools/.github-cla-signers
@@ -42,6 +42,7 @@ citrus-it
 cjp256
 CodeBleu
 Conan-Kudo
+cpaelzer
 cvstealth
 dankenigsberg
 dankm