diff --git a/.github/workflows/build-boot.yml b/.github/workflows/build-boot.yml
index bf445b41..41a2a758 100644
--- a/.github/workflows/build-boot.yml
+++ b/.github/workflows/build-boot.yml
@@ -16,11 +16,12 @@ jobs:
       fail-fast: false
       matrix:
         defconfig:
-          - fireant_boot
-          - cn9130_crb_boot
           - aarch64_qemu_boot
-          - rpi4_boot
           - bpi_r3_boot
+          - cn9130_crb_boot
+          - fireant_boot
+          - nanopi_r2s_boot
+          - rpi64_boot
     env:
       MAKEFLAGS: -j5
     steps:
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 2dea91f7..5b565b42 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -54,7 +54,7 @@ jobs:
         run: |
           case "${{ inputs.board }}" in
             raspberrypi-rpi64)
-              echo "BOOTLOADER=rpi4_boot" >> $GITHUB_ENV
+              echo "BOOTLOADER=rpi64_boot" >> $GITHUB_ENV
               echo "TARGET=aarch64" >> $GITHUB_ENV
               ;;
             bananapi-bpi-r3)
diff --git a/board/aarch64/raspberrypi-rpi64/README.md b/board/aarch64/raspberrypi-rpi64/README.md
index 24d86025..80a844bf 100644
--- a/board/aarch64/raspberrypi-rpi64/README.md
+++ b/board/aarch64/raspberrypi-rpi64/README.md
@@ -51,9 +51,9 @@ admin@example:/>
 
 ### Pre-built images
 
-Pre-built SD card images are available here: [infix-rpi4-sdcard.img][sdcard]
+Pre-built SD card images are available here: [infix-rpi64-sdcard.img][sdcard]
 
 [0]: https://www.raspberrypi.com/products/raspberry-pi-touch-display/
-[1]: https://github.com/kernelkit/infix/releases/download/latest-boot/infix-rpi4-sdcard.img
+[1]: https://github.com/kernelkit/infix/releases/download/latest-boot/infix-rpi64-sdcard.img
 [2]: https://kernelkit.org/infix/latest/container/#content-mounts
 [3]: https://kernelkit.org/infix/latest/scripting-restconf/
diff --git a/board/aarch64/raspberrypi-rpi64/genimage.cfg.in b/board/aarch64/raspberrypi-rpi64/genimage.cfg.in
index f78a2979..51e45bd2 100644
--- a/board/aarch64/raspberrypi-rpi64/genimage.cfg.in
+++ b/board/aarch64/raspberrypi-rpi64/genimage.cfg.in
@@ -29,7 +29,7 @@ image var.ext4 {
 	}
 }
 
-image #INFIX_ID##VERSION#-rpi4-sdcard.img {
+image #INFIX_ID##VERSION#-rpi64-sdcard.img {
 	hdimage {
 		partition-table-type = "hybrid"
 	}
diff --git a/configs/rpi4_boot_defconfig b/configs/rpi64_boot_defconfig
similarity index 100%
rename from configs/rpi4_boot_defconfig
rename to configs/rpi64_boot_defconfig