diff --git a/assemble_image.sh b/assemble_image.sh
index 7adb060ce8ea7e9236f2a79b4e8a957398800670..3bb1d484b603928882da45b9a76f1a46f3b426d1 100755
--- a/assemble_image.sh
+++ b/assemble_image.sh
@@ -132,6 +132,7 @@ configure_package_chooser mathe "m" "M" "Mathematics" "Mathematik"
 configure_package_chooser physik "p" "P" "Physics" "Physik"
 configure_package_chooser informatik "i" "I" "Computer Science" "Informatik"
 cp calamares-packages.conf "$ETC_CAL/modules/packages.conf"
+cp calamares-partition.conf "$ETC_CAL/modules/partition.conf"
 chown "$REGULAR_USER:$REGULAR_USER" -R "$ISO_PROFILES_REPO"
 
 create_offline_repo
diff --git a/calamares-partition.conf b/calamares-partition.conf
new file mode 100644
index 0000000000000000000000000000000000000000..937000543e5ea49c912db402039b843ecd2e1068
--- /dev/null
+++ b/calamares-partition.conf
@@ -0,0 +1,15 @@
+---
+efiSystemPartition:     "/boot/efi"
+efiSystemPartitionSize:     50M
+userSwapChoices:
+    - none      # Create no swap, use no swap
+    - small     # Up to 4GB
+    - suspend   # At least main memory size
+    - file      # To swap file instead of partition
+alwaysShowPartitionLabels: true
+# There are four options: erase, replace, alongside, manual),
+# the default is "none".
+initialPartitioningChoice: alongside
+initialSwapChoice: none
+defaultFileSystemType:  "ext4"
+availableFileSystemTypes:  ["ext4","btrfs","f2fs","xfs"]