diff --git a/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh b/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh
index 9d28629ec..83de89ba2 100755
--- a/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh
+++ b/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh
@@ -22,9 +22,9 @@ fi
 
 # Variables.
 FS_TYPE="ext4"
-LINUX_DEV_BLOCK="/dev/mmcblk0p1"
+LINUX_DEV_BLOCK="/dev/mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\<linux\>.*,\1,g;T;p")"
 LINUX_MOUNT_POINT="/mnt/linux"
-ROOTFS_DEV_BLOCK="/dev/mmcblk0p3"
+ROOTFS_DEV_BLOCK="/dev/mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\<rootfs\>.*,\1,g;T;p")"
 ROOTFS_MOUNT_POINT="/system"
 
 # Determines whether the file system type is UBI or not.
diff --git a/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh b/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh
index 85ee8f265..c65f630c4 100755
--- a/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh
+++ b/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh
@@ -32,8 +32,8 @@ fi
 # Variables.
 BLOCK_SIZE=4096
 ROOTFS_SOURCE_ENDPOINT="/dev/rdiff_source_rootfs"
-ROOTFS_DEV_BLOCK_A="mmcblk0p3"
-ROOTFS_DEV_BLOCK_B="mmcblk0p4"
+ROOTFS_DEV_BLOCK_A="mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\<rootfs_a\>.*,\1,g;T;p")"
+ROOTFS_DEV_BLOCK_B="mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\<rootfs_b\>.*,\1,g;T;p")"
 
 # Determines whether the file system type is UBIFS or not.
 is_ubifs() {