diff --git a/prepare.uefi b/prepare.uefi
index 05ab5ea..7b67f66 100644
--- a/prepare.uefi
+++ b/prepare.uefi
@@ -1,11 +1,18 @@
 #!/bin/bash
-sgdisk -og "${DRIVE}"
-# EFI System Partition erstellen
-sgdisk -n 0:0:+"${ESP}" -t 0:c12a7328-f81f-11d2-ba4b-00a0c93ec93b -c 0:"EFI System Partition" "${DRIVE}"
-#sgdisk -n 0:0:+512M -t 0:ef00 -c 0:ESP "${DRIVE}"
-# usr-Partition erstellen
-sgdisk -n 0:0:+"${USR}" -t 0:8484680c-9521-48c6-9c11-b0720656f69e -c 0:"ArchOS_0.1" "${DRIVE}"
-# usrhash-Partition erstellen
-sgdisk -n 0:0:+512M -t 0:77ff5f63-e7b6-4633-acf4-1565b864c0e6 -c 0:"ArchOS_0.1" "${DRIVE}"
-# Root-Partition erstellen
-sgdisk -n 0:0:0 -t 0:4f68bce3-e8cd-4db1-96e7-fbcaf984b709 -c 0:"ArchOS Root" "${DRIVE}"
\ No newline at end of file
+if true ; then
+  sgdisk -og "${DRIVE}"
+  # EFI System Partition erstellen
+  sgdisk -n 0:0:+"${ESP}" -t 0:c12a7328-f81f-11d2-ba4b-00a0c93ec93b -c 0:"EFI System Partition" "${DRIVE}"
+  # usr-Partition erstellen
+  sgdisk -n 0:0:+"${USR}" -t 0:8484680c-9521-48c6-9c11-b0720656f69e -c 0:"ArchOS_0.1" "${DRIVE}"
+  # usrhash-Partition erstellen
+  sgdisk -n 0:0:+512M -t 0:77ff5f63-e7b6-4633-acf4-1565b864c0e6 -c 0:"ArchOS_0.1" "${DRIVE}"
+  # Root-Partition erstellen
+  sgdisk -n 0:0:0 -t 0:4f68bce3-e8cd-4db1-96e7-fbcaf984b709 -c 0:"ArchOS Root" "${DRIVE}"
+fi
+
+if true ; then
+  mkfs.vfat -F 32 -n EFI /dev/vda1
+  mkfs.ext4 -L usr /dev/vda2
+  mkfs.ext4 -L root /dev/vda4
+fi
\ No newline at end of file