diff --git a/profiles/DerGeret/Arch/setup.sh b/profiles/DerGeret/Arch/setup.sh
index ddad03ad..fd052e33 100755
--- a/profiles/DerGeret/Arch/setup.sh
+++ b/profiles/DerGeret/Arch/setup.sh
@@ -2,6 +2,7 @@
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 PARTITION_SCRIPT="$(realpath ./partition.sh)" \
+SKIP_FORMAT_EFI=1 \
 ARCH_MOUNT_ROOT="/mnt" \
 ARCH_DISK=nvme0n1 \
 ARCH_HOSTNAME="der-geret" \
diff --git a/scripts/Arch/OS/partition.sh b/scripts/Arch/OS/partition.sh
index 2f0b8b4d..2c1eb015 100755
--- a/scripts/Arch/OS/partition.sh
+++ b/scripts/Arch/OS/partition.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
+source "../../Common/Scripts/is-truthy.sh";
 source "../../Common/Scripts/choose-disk.sh";
 ARCH_DISK="${ARCH_DISK}";
+SKIP_FORMAT_EFI="${SKIP_FORMAT_EFI}";
 PARTITION_SCRIPT="${PARTITION_SCRIPT:-"./default-partition.sh"}";
 memory="$(cat /proc/meminfo | awk -F " " '/^MemTotal/ { print $2 }')";
 swapSize="$(echo "$memory" | awk '{ print int(($1 / 1024 / 1024 4) + 0.5)}')";
@@ -31,7 +33,11 @@ bootDisk="${BOOT_DISK:-"${disks[1]}"}";
 swapDisk="${SWAP_DISK:-"${disks[2]}"}";
 linuxDisk="${LINUX_DISK:-"${disks[3]}"}";
 
-mkfs.fat -F 32 "$bootDisk";
+if ! isTruthy "$SKIP_FORMAT_EFI"
+then
+    mkfs.fat -F 32 "$bootDisk";
+fi
+
 mkswap "$swapDisk";
 mkfs.ext4 -F "$linuxDisk";