diff --git a/tools-image/Dockerfile b/tools-image/Dockerfile
index 09894b9f..021706f6 100644
--- a/tools-image/Dockerfile
+++ b/tools-image/Dockerfile
@@ -1,5 +1,5 @@
 # https://quay.io/repository/kairos/packages?tab=tags&tag=latest
-ARG FEDORA_VERSION=38
+ARG FEDORA_VERSION=40
 ARG LUET_VERSION=0.35.0
 ARG ENKI_VERSION=v0.0.16
 
diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh
index 58af1284..12821f5c 100755
--- a/tools-image/build-arm-image.sh
+++ b/tools-image/build-arm-image.sh
@@ -370,8 +370,6 @@ elif [ "$model" == "rpi4" ]; then
     sgdisk -n 3:0:+${recovery_size}M -c 3:recovery -t 3:8300 ${output_image}
     sgdisk -n 4:0:+${oem_size}M -c 4:oem -t 4:8300 ${output_image}
     sgdisk -n 5:0:+64M -c 5:persistent -t 5:8300 ${output_image}
-    sgdisk -g ${output_image}
-    sgdisk -m 1:2:3:4:5 ${output_image}
 else
     sgdisk -n 1:8192:+16M -c 1:EFI -t 1:0700 ${output_image}
     sgdisk -n 2:0:+${state_size}M -c 2:state -t 2:8300 ${output_image}