diff --git a/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl b/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl
y-pi-64-nfs-root.tmpl
index a1e41e3399..279620b0fb 100644
--- a/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl
+++ b/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl
@@ -30,7 +30,7 @@
    (timezone "Europe/Berlin")
    (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader-chain-raspi-64)
-                (target "/boot/efi")
+                (targets (list "/boot/efi"))
                 (theme (grub-theme (resolution '(1920 . 1080))
                        (image (file-append
                                %artwork-repository
@@ -49,7 +49,10 @@
                          (device ":/export/raspberrypi/guix")
                          (options "addr=10.20.30.40,vers=4.1"))
                         %base-file-systems))
-   (swap-devices '("/run/swapfile"))
+    (swap-devices
+     (list
+      (swap-space
+       (target "/run/swapfile"))))
    (users (cons* (user-account
                   (name "pi")
                   (group "users")
diff --git a/gnu/system/examples/raspberry-pi-64.tmpl b/gnu/system/examples/raspberry-pi-64.tmpl
index 7e18f00d86..0739582cf0 100644
--- a/gnu/system/examples/raspberry-pi-64.tmpl
+++ b/gnu/system/examples/raspberry-pi-64.tmpl
@@ -29,7 +29,7 @@
    (timezone "Europe/Berlin")
    (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader-chain-raspi-64)
-                (target "/boot/efi")
+                (targets (list "/boot/efi"))
                 (theme (grub-theme (resolution '(1920 . 1080))
                        (image (file-append
                                %artwork-repository
@@ -53,7 +53,10 @@
                          (type "vfat")
                          (device (file-system-label "EFI")))
                         %base-file-systems))
-   (swap-devices '("/run/swapfile"))
+   (swap-devices
+    (list
+     (swap-space
+      (target "/run/swapfile"))))
    (users (cons* (user-account
                   (name "pi")
                   (group "users")