diff --git a/install-stage1.sh b/install-stage1.sh
index 8bdace7..06bc07b 100644
--- a/install-stage1.sh
+++ b/install-stage1.sh
@@ -186,7 +186,7 @@ if yesno; then
 
     echo -n "Formatting partitions... "
     mkfs.vfat -F32 -n "EFIBOOT" "$TARGET_PART_EFI" >> $LOGFILE 2>&1
-    mkfs.f2fs -f -l "container" "$TARGET_PART_BOOT" >> $LOGFILE 2>&1
+    mkfs.f2fs -f -l "boot" "$TARGET_PART_BOOT" >> $LOGFILE 2>&1
     echo "Setting up encryption. You will be asked for the same password twice."
     cryptsetup luksFormat --batch-mode --type luks2 --force-password "$TARGET_PART_BIG"
     DEV_MAPPER_NAME="luks-$(blkid --output value --match-tag UUID "$TARGET_PART_BIG")"
@@ -195,6 +195,7 @@ if yesno; then
         echo "Failed to open encrypted container. The entered passwords probably didn't match."
         exit 1
     fi
+    mkfs.f2fs -f -l "container" /dev/mapper/"$DEV_MAPPER_NAME" >> $LOGFILE 2>&1
     echo "done"
 
     echo -n "Mounting partitions and virtual file systems... "