diff --git a/install.sh b/install.sh
index a5787b0..a0f0b99 100755
--- a/install.sh
+++ b/install.sh
@@ -122,26 +122,9 @@ if [[ "${ID}" == 'debian' ]]; then
 fi
 
 if [[ ! "${*}" = *--no-part* ]]; then
-	mkdosfs \
-		-F 32 \
-		-s 1 \
-		-n EFI \
-		${DISK}${PART1}
+	"${baseDir}/partition.sh" --efi
 fi
 
-mkdir \
-	-p \
-	/boot/efi
-
-printf \
-	"/dev/disk/by-uuid/$(blkid -s UUID -o value ${DISK}${PART1}) /boot/efi vfat defaults 0 0\n" | \
-	tee --append /etc/fstab &> /dev/null
-
-sleep 5
-
-mount \
-	/boot/efi
-
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
 	"${baseDir}/debian.sh" --purge-os-prober
 fi
diff --git a/partition.sh b/partition.sh
index 8f0ffe4..149e4f5 100755
--- a/partition.sh
+++ b/partition.sh
@@ -59,4 +59,25 @@ sgdisk \
 	-n3:0:0 \
 	-t3:BF00 \
 	-c3:${ID} \
-	${DISK}
+	${disk}
+
+if [[ "${*}" == *--efi* ]]; then
+	mkdosfs \
+		-F 32 \
+		-s 1 \
+		-n EFI \
+		${disk}${part1}
+
+	mkdir \
+	-p \
+	/boot/efi
+
+	printf \
+		"/dev/disk/by-uuid/$(blkid -s UUID -o value ${disk}${part1}) /boot/efi vfat defaults 0 0\n" | \
+		tee --append /etc/fstab &> /dev/null
+
+	sleep 5
+
+	mount \
+		/boot/efi
+fi