diff --git a/bakery/templates/debian-grub-efi/recipes/hello-world/recipe.toml b/bakery/templates/debian-grub-efi/recipes/hello-world/recipe.toml
index d6597dd..237dc81 100644
--- a/bakery/templates/debian-grub-efi/recipes/hello-world/recipe.toml
+++ b/bakery/templates/debian-grub-efi/recipes/hello-world/recipe.toml
@@ -1 +1,2 @@
-description = "install static webpage"
\ No newline at end of file
+description = "install static webpage"
+dependencies = ["rugpi-extra/nginx"]
\ No newline at end of file
diff --git a/bakery/templates/debian-grub-efi/rugpi-bakery.toml b/bakery/templates/debian-grub-efi/rugpi-bakery.toml
index 9848541..2a2f487 100644
--- a/bakery/templates/debian-grub-efi/rugpi-bakery.toml
+++ b/bakery/templates/debian-grub-efi/rugpi-bakery.toml
@@ -6,6 +6,7 @@ layer = "generic-amd64"
 architecture = "amd64"
 target = "generic-grub-efi"
 
+# This image has a larger size and can be directly used with QEMU.
 [images.generic-amd64-vm]
 layer = "generic-amd64"
 architecture = "amd64"
@@ -17,6 +18,7 @@ layer = "generic-arm64"
 architecture = "arm64"
 target = "generic-grub-efi"
 
+# This image has a larger size and can be directly used with QEMU.
 [images.generic-arm64-vm]
 layer = "generic-arm64"
 architecture = "arm64"
diff --git a/bakery/templates/rpi-raspios/layers/customized-pi4.toml b/bakery/templates/rpi-raspios/layers/customized-pi4.toml
new file mode 100644
index 0000000..674e409
--- /dev/null
+++ b/bakery/templates/rpi-raspios/layers/customized-pi4.toml
@@ -0,0 +1,9 @@
+parent = "customized"
+
+recipes = [
+    # Include the firmware update for Raspberry Pi 4.
+    "core/rpi-include-firmware",
+]
+
+[parameters."core/rpi-include-firmware"]
+model = "pi4"
diff --git a/bakery/templates/rpi-raspios/layers/customized.toml b/bakery/templates/rpi-raspios/layers/customized.toml
index 1f5c9b8..16a257b 100644
--- a/bakery/templates/rpi-raspios/layers/customized.toml
+++ b/bakery/templates/rpi-raspios/layers/customized.toml
@@ -6,13 +6,18 @@ parent = "core/raspios-bookworm"
 
 # Include recipes for the custom image.
 recipes = [
-    "core/raspberrypi",  # Prepares the Raspberry Pi base image for usage with Rugpi.
-    "core/set-hostname",  # Sets a static hostname (see parameters below).
-    "core/persist-root-home",  # Persists the home directory of the root user.
-    "core/ssh",  # Configures SSH.
-    "rugpi-extra/zsh",  # Installs ZSH.
-    "rugpi-extra/nginx",  # Installs Nginx.
-    "hello-world",  # Enable the `hello-world` recipe installing the static webpage.
+    # Prepares the Raspberry Pi base image for usage with Rugpi.
+    "core/raspberrypi",
+    # Sets a static hostname (see parameters below).
+    "core/set-hostname",
+    # Persists the home directory of the root user.
+    "core/persist-root-home",
+    # Configures SSH.
+    "core/ssh",
+    # Installs ZSH.
+    "rugpi-extra/zsh",
+    # Enable the `hello-world` recipe installing the static webpage.
+    "hello-world",
 ]
 
 [parameters."core/set-hostname"]
diff --git a/bakery/templates/rpi-raspios/recipes/hello-world/recipe.toml b/bakery/templates/rpi-raspios/recipes/hello-world/recipe.toml
index d6597dd..237dc81 100644
--- a/bakery/templates/rpi-raspios/recipes/hello-world/recipe.toml
+++ b/bakery/templates/rpi-raspios/recipes/hello-world/recipe.toml
@@ -1 +1,2 @@
-description = "install static webpage"
\ No newline at end of file
+description = "install static webpage"
+dependencies = ["rugpi-extra/nginx"]
\ No newline at end of file
diff --git a/bakery/templates/rpi-raspios/rugpi-bakery.toml b/bakery/templates/rpi-raspios/rugpi-bakery.toml
index 438afe3..e6323e2 100644
--- a/bakery/templates/rpi-raspios/rugpi-bakery.toml
+++ b/bakery/templates/rpi-raspios/rugpi-bakery.toml
@@ -1,24 +1,43 @@
 [repositories]
 rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.6" }
 
+# Compatible with:
+# - Raspberry Pi 5
+# - Raspberry Pi 4 (with recent firmware)
+# - Raspberry Pi CM4 (with recent firmware)
 [images.tryboot]
 layer = "customized"
-include_firmware = "none"
+architecture = "arm64"
+target = "rpi-tryboot"
 
-# A specific image including the firmware update for Raspberry Pi 4 and CM4.
-[images.pi4]
-layer = "customized"
-include_firmware = "pi4"
+# This image includes a firmware update for the Raspberry Pi 4 family.
+#
+# Compatible with:
+# - Raspberry Pi 4
+# - Raspberry Pi CM4
+[images.tryboot-pi4]
+layer = "customized-pi4"
+architecture = "arm64"
+target = "rpi-tryboot"
 
-# An image using the U-Boot boot flow for Raspberry Pi 3 and Zero 2.
-[images.u-boot]
+# This image uses the U-Boot boot flow for older Raspberry Pi models.
+#
+# Compatible with:
+# - Raspberry Pi 3
+# - Raspberry Pi CM3
+# - Raspberry Pi Zero 2 W
+[images.uboot-arm64]
 layer = "customized"
-boot_flow = "u-boot"
-include_firmware = "none"
+architecture = "arm64"
+target = "rpi-uboot"
 
-# An `armhf` image for older Raspberry Pi's using the U-Boot boot flow.
-[images.u-boot-armhf]
+# This image uses the U-Boot boot flow for older Raspberry Pi models.
+#
+# Compatible with:
+# - Raspberry Pi 2
+# - Raspberry Pi 1
+# - Raspberry Pi Zero
+[images.uboot-armhf]
 layer = "customized"
 architecture = "armhf"
-boot_flow = "u-boot"
-include_firmware = "none"
+target = "rpi-uboot"